diff --git a/src/components/Blockly/blocks/sensebox-osem.js b/src/components/Blockly/blocks/sensebox-osem.js index 996c380..6234dd1 100644 --- a/src/components/Blockly/blocks/sensebox-osem.js +++ b/src/components/Blockly/blocks/sensebox-osem.js @@ -21,6 +21,9 @@ Blockly.Blocks["sensebox_osem_connection"] = { .appendField(Blockly.Msg.senseBox_osem_connection) .appendField("SSL") .appendField(new Blockly.FieldCheckbox(ssl), "SSL"); + this.appendDummyInput() + .appendField(Blockly.Msg.senseBox_osem_restart) + .appendField(new Blockly.FieldCheckbox("TRUE"), "RESTART"); this.appendDummyInput() .setAlign(Blockly.ALIGN_LEFT) .appendField(Blockly.Msg.senseBox_osem_exposure) diff --git a/src/components/Blockly/generator/sensebox-osem.js b/src/components/Blockly/generator/sensebox-osem.js index d31ceb0..b829ad2 100644 --- a/src/components/Blockly/generator/sensebox-osem.js +++ b/src/components/Blockly/generator/sensebox-osem.js @@ -33,6 +33,7 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) { var blocks = this.getDescendants(); var type = this.getFieldValue("type"); var ssl = this.getFieldValue("SSL"); + var restart = this.getFieldValue("RESTART"); var port = 0; var count = 0; if (blocks !== undefined) { @@ -186,6 +187,12 @@ ${ } delay(1000); } + + ${ + restart === "TRUE" + ? "if (connected == false) {\n delay(5000);\n noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }" + : "" + } }`; var code = ""; @@ -271,12 +278,20 @@ ${ client.stop(); break; } + delay(1000); } num_measurements = 0; break; } } + + ${ + restart === "TRUE" + ? "if (connected == false) {\n delay(5000);\n noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }" + : "" + } + }`; code = ""; code += branch; diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index 66ef25b..63acdd0 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -35,6 +35,7 @@ Blockly.Arduino.sensebox_sensor_uv_light = function () { } if (dropdown_name === "Illuminance") { Blockly.Arduino.libraries_["library_ltr329"] = `#include `; + Blockly.Arduino.libraries_["library_wire"] = "#include "; Blockly.Arduino.codeFunctions_["read_reg"] = ` int read_reg(byte address, uint8_t reg) { diff --git a/src/components/Blockly/msg/de/sensebox-osem.js b/src/components/Blockly/msg/de/sensebox-osem.js index c363506..b79dba0 100644 --- a/src/components/Blockly/msg/de/sensebox-osem.js +++ b/src/components/Blockly/msg/de/sensebox-osem.js @@ -1,17 +1,20 @@ export const OSEM = { - /** - * openSenseMap - */ - senseBox_osem_connection_tip: "stellt eine WLAN verbindung her", - senseBox_send_to_osem_tip: "sende Messwert an", - senseBox_send_to_osem: "Sende Messwert an die openSenseMap", - senseBox_osem_connection: "Verbinde mit openSenseMap:", - senseBox_osem_host: "opensensemap.org", - senseBox_osem_host_workshop: "workshop.opensensemap.org", - senseBox_osem_exposure: "Typ", - senseBox_osem_stationary: "Stationär", - senseBox_osem_mobile: "Mobil", - senseBox_osem_access_token: "API Schlüssel", - senseBox_send_mobile_to_osem: "Sende Messwert und Standort an die openSenseMap", - senseBox_send_mobile_to_osem_tip: "Sende Messwert und Standort an die openSenseMap", -} \ No newline at end of file + /** + * openSenseMap + */ + senseBox_osem_connection_tip: "stellt eine WLAN verbindung her", + senseBox_send_to_osem_tip: "sende Messwert an", + senseBox_send_to_osem: "Sende Messwert an die openSenseMap", + senseBox_osem_connection: "Verbinde mit openSenseMap:", + senseBox_osem_host: "opensensemap.org", + senseBox_osem_host_workshop: "workshop.opensensemap.org", + senseBox_osem_exposure: "Typ", + senseBox_osem_stationary: "Stationär", + senseBox_osem_mobile: "Mobil", + senseBox_osem_access_token: "API Schlüssel", + senseBox_send_mobile_to_osem: + "Sende Messwert und Standort an die openSenseMap", + senseBox_send_mobile_to_osem_tip: + "Sende Messwert und Standort an die openSenseMap", + senseBox_osem_restart: "Bei Verbindungsverlust Gerät neustarten?", +}; diff --git a/src/components/Blockly/msg/en/sensebox-osem.js b/src/components/Blockly/msg/en/sensebox-osem.js index 8f1ce52..8c5e3a7 100644 --- a/src/components/Blockly/msg/en/sensebox-osem.js +++ b/src/components/Blockly/msg/en/sensebox-osem.js @@ -1,20 +1,20 @@ export const OSEM = { - /** - * openSenseMap - */ - - senseBox_osem_connection_tip: "connect to the openSenseMap", - senseBox_send_to_osem_tip: "sends the measurement to openSenseMap. Make shure to enter the correct BoxID and SensorID", - senseBox_send_to_osem: "Send measurement to openSenseMap", - senseBox_osem_connection: "Connect to openSenseMap", - senseBox_osem_host: "opensensemap.org", - senseBox_osem_host_workshop: "workshop.opensensemap.org", - senseBox_osem_exposure: "Type", - senseBox_osem_stationary: "Stationary", - senseBox_osem_mobile: "Mobile", - senseBox_osem_access_token: "API Key", - senseBox_send_mobile_to_osem: "Send measurement and location to openSenseMap", - senseBox_send_mobile_to_osem_tip: "Send Value and Location to openSenseMap", -} - + /** + * openSenseMap + */ + senseBox_osem_connection_tip: "connect to the openSenseMap", + senseBox_send_to_osem_tip: + "sends the measurement to openSenseMap. Make shure to enter the correct BoxID and SensorID", + senseBox_send_to_osem: "Send measurement to openSenseMap", + senseBox_osem_connection: "Connect to openSenseMap", + senseBox_osem_host: "opensensemap.org", + senseBox_osem_host_workshop: "workshop.opensensemap.org", + senseBox_osem_exposure: "Type", + senseBox_osem_stationary: "Stationary", + senseBox_osem_mobile: "Mobile", + senseBox_osem_access_token: "API Key", + senseBox_send_mobile_to_osem: "Send measurement and location to openSenseMap", + senseBox_send_mobile_to_osem_tip: "Send Value and Location to openSenseMap", + senseBox_osem_restart: "Restart device if disconnected?", +};