schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix osem block code generator

Browse Source
This commit is contained in:
Mario Pesch 2022-01-31 16:07:32 +01:00
parent 2cc4d9e84d
commit a5059f9369
1 changed files with 75 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/Blockly/generator/sensebox-osem.js
View File

@ -44,8 +44,6 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
} }
var num_sensors = count; var num_sensors = count;
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.setupCode_["initBearSSL"] =
"ArduinoBearSSL.onGetTime(getTime);";
Blockly.Arduino.definitions_["num_sensors"] = Blockly.Arduino.definitions_["num_sensors"] =
"static const uint8_t NUM_SENSORS = " + num_sensors + ";"; "static const uint8_t NUM_SENSORS = " + num_sensors + ";";
Blockly.Arduino.definitions_["SenseBoxID"] = Blockly.Arduino.definitions_["SenseBoxID"] =
@ -53,22 +51,6 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
Blockly.Arduino.definitions_["host"] = Blockly.Arduino.definitions_["host"] =
'const char server [] PROGMEM ="ingress.opensensemap.org";'; 'const char server [] PROGMEM ="ingress.opensensemap.org";';
if (wifi === true) { if (wifi === true) {
if (ssl === "TRUE") {
Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;";
port = 443;
} else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient client;";
port = 80;
}
} else if (ethernet === true) {
if (ssl === "TRUE") {
Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;";
port = 443;
} else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;";
port = 80;
}
if (ssl === "TRUE") { if (ssl === "TRUE") {
Blockly.Arduino.libraries_["library_bearSSL"] = Blockly.Arduino.libraries_["library_bearSSL"] =
"#include <ArduinoBearSSL.h>"; "#include <ArduinoBearSSL.h>";
@ -80,12 +62,26 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
Blockly.Arduino.functionNames_["getTime"] = `unsigned long getTime() { Blockly.Arduino.functionNames_["getTime"] = `unsigned long getTime() {
return WiFi.getTime(); return WiFi.getTime();
}`; }`;
Blockly.Arduino.setupCode_["initBearSSL"] =
"ArduinoBearSSL.onGetTime(getTime);";
port = 443; port = 443;
} else if (ssl === "FALSE") { } else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient client;"; Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient client;";
port = 80; port = 80;
} }
} else if (ethernet === true) {
if (ssl === "TRUE") {
Blockly.Arduino.libraries_["library_bearSSL"] =
"#include <ArduinoBearSSL.h>";
Blockly.Arduino.libraries_["library_arduinoECC08"] =
"#include <ArduinoECCX08.h>";
Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;";
port = 443;
} else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;";
port = 80;
}
}
Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement { Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
const char *sensorId; const char *sensorId;
float value; float value;
@ -254,5 +250,4 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
");\n"; ");\n";
} }
return code; return code;
}
}; };