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

start replacing mcu lib

Browse Source
This commit is contained in:
Mario Pesch 2021-11-24 13:08:42 +01:00
parent 1ac11ea796
commit 8acc89b99e
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,8 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
var num_sensors = count; var num_sensors = count;
Blockly.Arduino.libraries_["library_senseBoxMCU"] = Blockly.Arduino.libraries_["library_senseBoxMCU"] =
'#include "SenseBoxMCU.h"'; '#include "SenseBoxMCU.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"] =
@ -43,7 +45,16 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
Blockly.Arduino.definitions_["host"] = Blockly.Arduino.definitions_["host"] =
"const char server [] PROGMEM =" + host + ";"; "const char server [] PROGMEM =" + host + ";";
if (ssl === "TRUE") { if (ssl === "TRUE") {
Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;"; Blockly.Arduino.libraries_["library_bearSSL"] =
"#include <ArduinoBearSSL.h>";
Blockly.Arduino.libraries_["library_arduinoECC08"] =
"#include <ArduinoECCX08.h>";
Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient wifiClient;";
Blockly.Arduino.definitions_["BearSSLClient"] =
"BearSSLClient client(wifiClient);";
Blockly.Ardu.Arduino.functionNames_["getTime"] = `unsigned long getTime() {
return WiFi.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;";
@ -121,6 +132,7 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
} }
} }
}`; }`;
var code = ""; var code = "";
code += branch; code += branch;
code += "submitValues();\n"; code += "submitValues();\n";

49
src/components/Blockly/generator/sensebox-web.js
View File

@ -1,25 +1,38 @@
import Blockly from 'blockly'; import Blockly from "blockly";
/* Wifi connection and openSenseMap Blocks*/ /* Wifi connection and openSenseMap Blocks*/
Blockly.Arduino.sensebox_wifi = function (block) { Blockly.Arduino.sensebox_wifi = function (block) {
var pw = this.getFieldValue('Password'); var pw = this.getFieldValue("Password");
var ssid = this.getFieldValue('SSID'); var ssid = this.getFieldValue("SSID");
Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();'; Blockly.Arduino.libraries_["library_WiFi"] = "#include <WiFi101.h>";
if (pw === "") { Blockly.Arduino.variables_["ssid"] = `char ssid[] = ${ssid};`;
Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '");\ndelay(1000);'; Blockly.Arduino.variables_["pass"] = `char pass[] = ${pw};`;
} else Blockly.Arduino.variables_["wifi_Status"] = "int status = WL_IDLE_STATUS;";
Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '","' + pw + '");\ndelay(1000);'; if (pw === "") {
var code = ''; Blockly.Arduino.setupCode_["sensebox_network"] =
return code; 'b->connectToWifi("' + ssid + '");\ndelay(1000);';
} else
Blockly.Arduino.setupCode_["sensebox_network"] = `
if (WiFi.status() == WL_NO_SHIELD) {
while (true);
}
while (status != WL_CONNECTED) {
status = WiFi.begin(ssid, pass);
delay(5000);
}
`;
var code = "";
return code;
}; };
Blockly.Arduino.sensebox_startap = function (block) { Blockly.Arduino.sensebox_startap = function (block) {
var ssid = this.getFieldValue('SSID'); var ssid = this.getFieldValue("SSID");
Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();'; '#include "SenseBoxMCU.h"';
Blockly.Arduino.setupCode_['sensebox_network'] = 'b->startAP("' + ssid + '");' Blockly.Arduino.definitions_["define_network"] = "Bee* b = new Bee();";
var code = ''; Blockly.Arduino.setupCode_["sensebox_network"] =
return code; 'b->startAP("' + ssid + '");';
var code = "";
return code;
}; };