From dbc7fdc7ab7442faf94ae45e8fb893aa9e89b811 Mon Sep 17 00:00:00 2001 From: Bjoern Luig Date: Sun, 28 Aug 2022 16:25:52 +0200 Subject: [PATCH 1/5] added rainsensor --- .../Blockly/blocks/sensebox-sensors.js | 33 +++++++++++++++++++ .../Blockly/generator/sensebox-sensors.js | 17 ++++++++++ .../Blockly/msg/de/sensebox-sensors.js | 19 +++++++++-- src/components/Blockly/toolbox/Toolbox.js | 2 ++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/components/Blockly/blocks/sensebox-sensors.js b/src/components/Blockly/blocks/sensebox-sensors.js index 145a5e18..ff6a1d1a 100644 --- a/src/components/Blockly/blocks/sensebox-sensors.js +++ b/src/components/Blockly/blocks/sensebox-sensors.js @@ -514,6 +514,39 @@ Blockly.Blocks["sensebox_soundsensor_dfrobot"] = { }, }; + + +/** + * rainsensor hydreon rg-15 + */ +Blockly.Blocks["sensebox_rainsensor_hydreon_rg15"] = { + init: function () { + var dropdownOptionsPorts = [ + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial1, "Serial1"], + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial2, "Serial2"], + ]; + var dropdownOptionsValues = [ + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_totalAcc, "getTotalAccumulation"], + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_rainInt, "getRainfallIntensity"], + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_eventAcc, "getEventAccumulation"], + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_acc, "getAccumulation"], + ]; + this.setColour(getColour().sensebox); + this.appendDummyInput() + .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15); + this.appendDummyInput() + .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_port) + .appendField(new Blockly.FieldDropdown(dropdownOptionsPorts), "SERIAL"); + this.appendDummyInput() + .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_value) + .appendField(new Blockly.FieldDropdown(dropdownOptionsValues), "VALUE"); + this.setOutput(true, Types.DECIMAL.typeName); + this.setTooltip(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_tooltip); + this.setHelpUrl(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_helpurl); + }, +}; + + /** * Infineon DPS310 Pressure Sensor * diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index f0d62dd1..634b1616 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -654,6 +654,23 @@ float getSoundValue(){ return [code, Blockly.Arduino.ORDER_ATOMIC]; }; +/** + * rainsensor hydreon rg-15 + */ + +Blockly.Arduino.sensebox_rainsensor_hydreon_rg15 = function () { + var port = this.getFieldValue("SERIAL"); + var value = this.getFieldValue("VALUE"); + Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include "; + Blockly.Arduino.libraries_["library_rainsensor_rg15"] = "#include "; + Blockly.Arduino.definitions_["def_rainsensor_rg15"] = "HYDREON rainsensor_" + port + "(" + port + ");"; + Blockly.Arduino.setupCode_["setup_rainsensor_rg15"] = "rainsensor_" + port + ".begin();"; + Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15"] = "rainsensor_" + port + ".readAllData();" + + var code = "rainsensor_" + port + "." + value + "();"; + return [code, Blockly.Arduino.ORDER_ATOMIC]; +}; + /** * Infineon DPS310 Pressure Sensor * diff --git a/src/components/Blockly/msg/de/sensebox-sensors.js b/src/components/Blockly/msg/de/sensebox-sensors.js index 64d0baaa..278895b9 100644 --- a/src/components/Blockly/msg/de/sensebox-sensors.js +++ b/src/components/Blockly/msg/de/sensebox-sensors.js @@ -132,10 +132,25 @@ Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegebe "Schließe den Sensor an einen der 3 **digital/analog Ports** an. Der Sensor gibt dir den Messwert in dB mit einer Nachkommastelle", senseBox_soundsensor_dfrobot_helpurl: "https://docs.sensebox.de/hardware/sensoren-lautstaerke/", + /* - * BME680 - */ + * rainsensor hydreon rg-15 + */ + sensebox_rainsensor_hydreon_rg15: "Regensensor (RG-15)", + sensebox_rainsensor_hydreon_rg15_port: "Serieller Port:", + sensebox_rainsensor_hydreon_rg15_serial1: "Serial1", + sensebox_rainsensor_hydreon_rg15_serial2: "Serial2", + sensebox_rainsensor_hydreon_rg15_value: "Messwert:", + sensebox_rainsensor_hydreon_rg15_totalAcc: "gesamter Niederschlag in mm", + sensebox_rainsensor_hydreon_rg15_rainInt: "Niederschlagsintensität in mm/h", + sensebox_rainsensor_hydreon_rg15_eventAcc: "Niederschlag pro Event in mm", + sensebox_rainsensor_hydreon_rg15_acc: "Niederschlag seit letzter Messung in mm", + sensebox_rainsensor_hydreon_rg15_tooltip: "Regensensor (RG-15) an einen der Seriellen Ports anschließen.", + sensebox_rainsensor_hydreon_rg15_helpurl: "TODO", + /* + * BME680 + */ senseBox_bme680: "Umweltsensor (BME680)", senseBox_bme_iaq: "Innenraumluftqualität (IAQ)", senseBox_bme_iaq_accuracy: "Kalibrierungswert", diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index 275af4d0..712371d9 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -76,6 +76,8 @@ class Toolbox extends React.Component { {/* */} + + From 32372bc222957d9bc972c4202311691425131c52 Mon Sep 17 00:00:00 2001 From: Bjoern Date: Fri, 28 Oct 2022 01:37:16 +0200 Subject: [PATCH 2/5] finished english language and testing of compiling --- src/components/Blockly/blocks/sensebox-sensors.js | 1 + .../Blockly/generator/sensebox-sensors.js | 2 +- src/components/Blockly/msg/de/sensebox-sensors.js | 2 +- src/components/Blockly/msg/en/sensebox-sensors.js | 15 +++++++++++++++ src/components/Blockly/toolbox/Toolbox.js | 1 - 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/components/Blockly/blocks/sensebox-sensors.js b/src/components/Blockly/blocks/sensebox-sensors.js index ff6a1d1a..eee2de91 100644 --- a/src/components/Blockly/blocks/sensebox-sensors.js +++ b/src/components/Blockly/blocks/sensebox-sensors.js @@ -519,6 +519,7 @@ Blockly.Blocks["sensebox_soundsensor_dfrobot"] = { /** * rainsensor hydreon rg-15 */ + Blockly.Blocks["sensebox_rainsensor_hydreon_rg15"] = { init: function () { var dropdownOptionsPorts = [ diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index 634b1616..bb03396e 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -667,7 +667,7 @@ Blockly.Arduino.sensebox_rainsensor_hydreon_rg15 = function () { Blockly.Arduino.setupCode_["setup_rainsensor_rg15"] = "rainsensor_" + port + ".begin();"; Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15"] = "rainsensor_" + port + ".readAllData();" - var code = "rainsensor_" + port + "." + value + "();"; + var code = "rainsensor_" + port + "." + value + "()"; return [code, Blockly.Arduino.ORDER_ATOMIC]; }; diff --git a/src/components/Blockly/msg/de/sensebox-sensors.js b/src/components/Blockly/msg/de/sensebox-sensors.js index 278895b9..955a17db 100644 --- a/src/components/Blockly/msg/de/sensebox-sensors.js +++ b/src/components/Blockly/msg/de/sensebox-sensors.js @@ -146,7 +146,7 @@ Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegebe sensebox_rainsensor_hydreon_rg15_eventAcc: "Niederschlag pro Event in mm", sensebox_rainsensor_hydreon_rg15_acc: "Niederschlag seit letzter Messung in mm", sensebox_rainsensor_hydreon_rg15_tooltip: "Regensensor (RG-15) an einen der Seriellen Ports anschließen.", - sensebox_rainsensor_hydreon_rg15_helpurl: "TODO", + sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/", /* * BME680 diff --git a/src/components/Blockly/msg/en/sensebox-sensors.js b/src/components/Blockly/msg/en/sensebox-sensors.js index 94f698ac..b4bfa84c 100644 --- a/src/components/Blockly/msg/en/sensebox-sensors.js +++ b/src/components/Blockly/msg/en/sensebox-sensors.js @@ -134,6 +134,21 @@ If the max distance is reached the a value of **O** will be returned`, senseBox_soundsensor_dfrobot_helpurl: "https://en.docs.sensebox.de/hardware/sensoren-lautstaerke/", + /* + * rainsensor hydreon rg-15 + */ + sensebox_rainsensor_hydreon_rg15: "Rainsensor (RG-15)", + sensebox_rainsensor_hydreon_rg15_port: "Serial Port:", + sensebox_rainsensor_hydreon_rg15_serial1: "Serial1", + sensebox_rainsensor_hydreon_rg15_serial2: "Serial2", + sensebox_rainsensor_hydreon_rg15_value: "value:", + sensebox_rainsensor_hydreon_rg15_totalAcc: "total Accumulation in mm", + sensebox_rainsensor_hydreon_rg15_rainInt: "Rainfall Intensity in mm/h", + sensebox_rainsensor_hydreon_rg15_eventAcc: "Accumulation per Event in mm", + sensebox_rainsensor_hydreon_rg15_acc: "Accumulation since last loop in mm", + sensebox_rainsensor_hydreon_rg15_tooltip: "Connect Rainsensor (RG-15) to one of the Serial ports.", + sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/", + /* * BME680 */ diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index 712371d9..423cd065 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -76,7 +76,6 @@ class Toolbox extends React.Component { {/* */} - From 9c33bc4c0d09b9dafa0bfa7b055864dbc974bcbf Mon Sep 17 00:00:00 2001 From: Bjoern Luig Date: Wed, 16 Nov 2022 14:18:27 +0100 Subject: [PATCH 3/5] small bugfix to use multiple sensors --- src/components/Blockly/generator/sensebox-sensors.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index bb03396e..379940d6 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -663,9 +663,9 @@ Blockly.Arduino.sensebox_rainsensor_hydreon_rg15 = function () { var value = this.getFieldValue("VALUE"); Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include "; Blockly.Arduino.libraries_["library_rainsensor_rg15"] = "#include "; - Blockly.Arduino.definitions_["def_rainsensor_rg15"] = "HYDREON rainsensor_" + port + "(" + port + ");"; - Blockly.Arduino.setupCode_["setup_rainsensor_rg15"] = "rainsensor_" + port + ".begin();"; - Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15"] = "rainsensor_" + port + ".readAllData();" + Blockly.Arduino.definitions_["def_rainsensor_rg15_" + port] = "HYDREON rainsensor_" + port + "(" + port + ");"; + Blockly.Arduino.setupCode_["setup_rainsensor_rg15_" + port] = "rainsensor_" + port + ".begin();"; + Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15_" + port] = "rainsensor_" + port + ".readAllData();" var code = "rainsensor_" + port + "." + value + "()"; return [code, Blockly.Arduino.ORDER_ATOMIC]; From 0388e5c6274bc6e4e85698e54922bcb997f9c80c Mon Sep 17 00:00:00 2001 From: Bjoern Luig Date: Fri, 9 Jun 2023 11:03:28 +0200 Subject: [PATCH 4/5] change order of phenomenons --- src/components/Blockly/blocks/sensebox-sensors.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Blockly/blocks/sensebox-sensors.js b/src/components/Blockly/blocks/sensebox-sensors.js index eee2de91..1a54e39c 100644 --- a/src/components/Blockly/blocks/sensebox-sensors.js +++ b/src/components/Blockly/blocks/sensebox-sensors.js @@ -527,10 +527,10 @@ Blockly.Blocks["sensebox_rainsensor_hydreon_rg15"] = { [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial2, "Serial2"], ]; var dropdownOptionsValues = [ + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_acc, "getAccumulation"], [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_totalAcc, "getTotalAccumulation"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_rainInt, "getRainfallIntensity"], [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_eventAcc, "getEventAccumulation"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_acc, "getAccumulation"], + [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_rainInt, "getRainfallIntensity"], ]; this.setColour(getColour().sensebox); this.appendDummyInput() From d0f2e1ea6db462bdbc985397a7c988d92783fc70 Mon Sep 17 00:00:00 2001 From: BjoernLuig Date: Fri, 7 Feb 2025 14:48:02 +0100 Subject: [PATCH 5/5] change to new library --- .../Blockly/blocks/sensebox-sensors.js | 35 +++++------- .../Blockly/generator/sensebox-sensors.js | 41 ++++++++------ .../Blockly/msg/de/sensebox-sensors.js | 55 ++++++++++--------- .../Blockly/msg/en/sensebox-sensors.js | 27 ++++----- src/components/Blockly/toolbox/ToolboxMcu.js | 1 + 5 files changed, 82 insertions(+), 77 deletions(-) diff --git a/src/components/Blockly/blocks/sensebox-sensors.js b/src/components/Blockly/blocks/sensebox-sensors.js index 9955b842..a8439b4f 100644 --- a/src/components/Blockly/blocks/sensebox-sensors.js +++ b/src/components/Blockly/blocks/sensebox-sensors.js @@ -603,40 +603,35 @@ Blockly.Blocks["sensebox_soundsensor_dfrobot"] = { }, }; - - /** - * rainsensor hydreon rg-15 + * rg15 rainsensor */ -Blockly.Blocks["sensebox_rainsensor_hydreon_rg15"] = { +Blockly.Blocks["sensebox_rg15_rainsensor"] = { init: function () { - var dropdownOptionsPorts = [ - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial1, "Serial1"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_serial2, "Serial2"], - ]; var dropdownOptionsValues = [ - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_acc, "getAccumulation"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_totalAcc, "getTotalAccumulation"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_eventAcc, "getEventAccumulation"], - [Blockly.Msg.sensebox_rainsensor_hydreon_rg15_rainInt, "getRainfallIntensity"], + [Blockly.Msg.sensebox_rg15_rainsensor_acc, "getAccumulation"], + [Blockly.Msg.sensebox_rg15_rainsensor_totalAcc, "getTotalAccumulation"], + [Blockly.Msg.sensebox_rg15_rainsensor_eventAcc, "getEventAccumulation"], + [Blockly.Msg.sensebox_rg15_rainsensor_rainInt, "getRainfallIntensity"], ]; this.setColour(getColour().sensebox); + this.appendDummyInput().appendField(Blockly.Msg.sensebox_rg15_rainsensor); this.appendDummyInput() - .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15); - this.appendDummyInput() - .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_port) - .appendField(new Blockly.FieldDropdown(dropdownOptionsPorts), "SERIAL"); + .appendField(Blockly.Msg.sensebox_rg15_rainsensor_port) + .appendField( + new Blockly.FieldDropdown(selectedBoard().serialSensors), + "SERIAL", + ); this.appendDummyInput() - .appendField(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_value) + .appendField(Blockly.Msg.sensebox_rg15_rainsensor_value) .appendField(new Blockly.FieldDropdown(dropdownOptionsValues), "VALUE"); this.setOutput(true, Types.DECIMAL.typeName); - this.setTooltip(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_tooltip); - this.setHelpUrl(Blockly.Msg.sensebox_rainsensor_hydreon_rg15_helpurl); + this.setTooltip(Blockly.Msg.sensebox_rg15_rainsensor_tooltip); + this.setHelpUrl(Blockly.Msg.sensebox_rg15_rainsensor_helpurl); }, }; - /** * Infineon DPS310 Pressure Sensor * diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index bee68279..f235caf5 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -272,13 +272,13 @@ Blockly.Generator.Arduino.forBlock["sensebox_sensor_bme680_bsec"] = digitalWrite(LED_BUILTIN, LOW); delay(100); }`; - //Setup Code - Blockly.Generator.Arduino.preSetupCode_["Wire.begin"] = "Wire.begin();"; - Blockly.Generator.Arduino.setupCode_["iaqSensor.begin"] = - "iaqSensor.begin(BME68X_I2C_ADDR_LOW, Wire);"; - Blockly.Generator.Arduino.setupCode_["checkIaqSensorStatus"] = - "checkIaqSensorStatus();"; - Blockly.Generator.Arduino.setupCode_["bsec_sensorlist"] = ` + //Setup Code + Blockly.Generator.Arduino.preSetupCode_["Wire.begin"] = "Wire.begin();"; + Blockly.Generator.Arduino.setupCode_["iaqSensor.begin"] = + "iaqSensor.begin(BME68X_I2C_ADDR_LOW, Wire);"; + Blockly.Generator.Arduino.setupCode_["checkIaqSensorStatus"] = + "checkIaqSensorStatus();"; + Blockly.Generator.Arduino.setupCode_["bsec_sensorlist"] = ` bsec_virtual_sensor_t sensorList[13] = { BSEC_OUTPUT_IAQ, BSEC_OUTPUT_STATIC_IAQ, @@ -381,7 +381,8 @@ Blockly.Generator.Arduino.forBlock["sensebox_tof_imager"] = function () { `; Blockly.Generator.Arduino.preSetupCode_["Wire.begin"] = "Wire.begin();"; - Blockly.Generator.Arduino.preSetupCode_["vl53l8cx_clock_address"] = `sensor_vl53l8cx.set_i2c_address(0x51); // need to change address, because default address is shared with other sensor`; + Blockly.Generator.Arduino.preSetupCode_["vl53l8cx_clock_address"] = + `sensor_vl53l8cx.set_i2c_address(0x51); // need to change address, because default address is shared with other sensor`; Blockly.Generator.Arduino.setupCode_["setup_vl53l8cx"] = ` Wire.setClock(1000000); // vl53l8cx can operate at 1MHz @@ -917,20 +918,24 @@ Blockly.Generator.Arduino.forBlock["sensebox_soundsensor_dfrobot"] = }; /** - * rainsensor hydreon rg-15 + * rg15 rainsensor */ -Blockly.Arduino.sensebox_rainsensor_hydreon_rg15 = function () { +Blockly.Generator.Arduino.forBlock["sensebox_rg15_rainsensor"] = function () { var port = this.getFieldValue("SERIAL"); var value = this.getFieldValue("VALUE"); - Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include "; - Blockly.Arduino.libraries_["library_rainsensor_rg15"] = "#include "; - Blockly.Arduino.definitions_["def_rainsensor_rg15_" + port] = "HYDREON rainsensor_" + port + "(" + port + ");"; - Blockly.Arduino.setupCode_["setup_rainsensor_rg15_" + port] = "rainsensor_" + port + ".begin();"; - Blockly.Arduino.loopCodeOnce_["loop_rainsensor_rg15_" + port] = "rainsensor_" + port + ".readAllData();" - - var code = "rainsensor_" + port + "." + value + "()"; - return [code, Blockly.Arduino.ORDER_ATOMIC]; + Blockly.Generator.Arduino.libraries_["library_senseBoxIO"] = + "#include "; + Blockly.Generator.Arduino.libraries_["library_rg15"] = "#include "; + Blockly.Generator.Arduino.definitions_["def_rg15_rainsensor_" + port] = + "RG15 rg15_" + port + "(" + port + ");"; + Blockly.Generator.Arduino.setupCode_["setup_rg15_rainsensor_" + port] = + "rg15_" + port + ".begin();"; + Blockly.Generator.Arduino.loopCodeOnce_["loop_rg15_rainsensor_" + port] = + "rg15_" + port + ".poll();"; + + var code = "rg15_" + port + "." + value + "()"; + return [code, Blockly.Generator.Arduino.ORDER_ATOMIC]; }; /** diff --git a/src/components/Blockly/msg/de/sensebox-sensors.js b/src/components/Blockly/msg/de/sensebox-sensors.js index c3b34bb1..501b21d3 100644 --- a/src/components/Blockly/msg/de/sensebox-sensors.js +++ b/src/components/Blockly/msg/de/sensebox-sensors.js @@ -24,7 +24,8 @@ export const SENSORS = { senseBox_sensor_dps310: "Luftdruck-/Temperatursensor (DPS310)", senseBox_sensor_dps310_tooltip: "Schließe den Sensor an einen der **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in hPa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.", - senseBox_sensor_dps310_helpurl: "https://docs.sensebox.de/docs/hardware/sensors/luftdruck-temperatur", + senseBox_sensor_dps310_helpurl: + "https://docs.sensebox.de/docs/hardware/sensors/luftdruck-temperatur", /** * Mikro @@ -116,7 +117,8 @@ Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegebe **Beachte:** Das GPS Modul benöigt beim ersten Verwenden relativ lange (ca. 5-10 Minuten) bis es deinen Standort gefunden hat! `, - senseBox_gps_helpurl: "https://docs.sensebox.de/docs/hardware/accessoires/gps/", + senseBox_gps_helpurl: + "https://docs.sensebox.de/docs/hardware/accessoires/gps/", /** * Windspeed @@ -134,23 +136,22 @@ Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegebe "https://docs.sensebox.de/hardware/sensoren-lautstaerke/", /* - * rainsensor hydreon rg-15 - */ - sensebox_rainsensor_hydreon_rg15: "Regensensor (RG-15)", - sensebox_rainsensor_hydreon_rg15_port: "Serieller Port:", - sensebox_rainsensor_hydreon_rg15_serial1: "Serial1", - sensebox_rainsensor_hydreon_rg15_serial2: "Serial2", - sensebox_rainsensor_hydreon_rg15_value: "Messwert:", - sensebox_rainsensor_hydreon_rg15_totalAcc: "gesamter Niederschlag in mm", - sensebox_rainsensor_hydreon_rg15_rainInt: "Niederschlagsintensität in mm/h", - sensebox_rainsensor_hydreon_rg15_eventAcc: "Niederschlag pro Event in mm", - sensebox_rainsensor_hydreon_rg15_acc: "Niederschlag seit letzter Messung in mm", - sensebox_rainsensor_hydreon_rg15_tooltip: "Regensensor (RG-15) an einen der Seriellen Ports anschließen.", - sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/", + * rg15 rainsensor + */ + sensebox_rg15_rainsensor: "Regensensor (RG-15)", + sensebox_rg15_rainsensor_port: "Serieller Port:", + sensebox_rg15_rainsensor_value: "Messwert:", + sensebox_rg15_rainsensor_totalAcc: "gesamter Niederschlag in mm", + sensebox_rg15_rainsensor_rainInt: "Niederschlagsintensität in mm/h", + sensebox_rg15_rainsensor_eventAcc: "Niederschlag pro Event in mm", + sensebox_rg15_rainsensor_acc: "Niederschlag seit letzter Messung in mm", + sensebox_rg15_rainsensor_tooltip: + "Regensensor (RG-15) an einen der Seriellen Ports anschließen.", + sensebox_rg15_rainsensor_helpurl: "https://rainsensors.com/products/rg-15/", /* - * BME680 - */ + * BME680 + */ senseBox_bme680: "Umweltsensor (BME680)", senseBox_bme_iaq: "Innenraumluftqualität (IAQ)", senseBox_bme_iaq_accuracy: "Kalibrierungswert", @@ -239,16 +240,17 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver senseBox_esp32_photodiode: "Lichtintensität", senseBox_esp32_photodiode_tooltip: "Die Photodiode misst Lichtintensität. Der ausgegebene Wert ist eine **Ganzzahl** zwischen 0 und 4095. Je höher der Wert, desto heller ist die Umgebung.", - senseBox_esp32_photodiode_helpurl:"https://docs.sensebox.de/docs/hardware/sensors/photodiode", - - /** - * MPU6050 */ - senseBox_mpu6050_tooltip: "Der MPU6050 ist ein Beschleunigungs- und Gyroskopsensor. Schließe den Sensor an einen der I2C Anschlüsse an. Der Sensor gibt dir die Beschleunigung in m/s² und die Winkelgeschwindigkeit in °/s zurück.", - senseBox_mpu6050_helpurl:"https://docs.sensebox.de/docs/hardware/sensors/mpu6050/", - + senseBox_esp32_photodiode_helpurl: + "https://docs.sensebox.de/docs/hardware/sensors/photodiode", + /** + * MPU6050 */ + senseBox_mpu6050_tooltip: + "Der MPU6050 ist ein Beschleunigungs- und Gyroskopsensor. Schließe den Sensor an einen der I2C Anschlüsse an. Der Sensor gibt dir die Beschleunigung in m/s² und die Winkelgeschwindigkeit in °/s zurück.", + senseBox_mpu6050_helpurl: + "https://docs.sensebox.de/docs/hardware/sensors/mpu6050/", - /** + /** * ToF Imager * */ @@ -259,5 +261,6 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver sensebox_distance_bitmap: "8x8 Distanzen als Bitmap (für LED-Matrix)", sensebox_tof_imager_max_distance: "Maximal messbare Distanz ", sensebox_tof_imager_max_distance_unit: "cm", - sensebox_tof_imager_helpurl: "https://docs.sensebox.de/docs/hardware/sensors/tof", + sensebox_tof_imager_helpurl: + "https://docs.sensebox.de/docs/hardware/sensors/tof", }; diff --git a/src/components/Blockly/msg/en/sensebox-sensors.js b/src/components/Blockly/msg/en/sensebox-sensors.js index 755bc1bc..0e2a20e8 100644 --- a/src/components/Blockly/msg/en/sensebox-sensors.js +++ b/src/components/Blockly/msg/en/sensebox-sensors.js @@ -135,19 +135,20 @@ If the max distance is reached the a value of **O** will be returned`, "https://en.docs.sensebox.de/hardware/sensoren-lautstaerke/", /* - * rainsensor hydreon rg-15 - */ - sensebox_rainsensor_hydreon_rg15: "Rainsensor (RG-15)", - sensebox_rainsensor_hydreon_rg15_port: "Serial Port:", - sensebox_rainsensor_hydreon_rg15_serial1: "Serial1", - sensebox_rainsensor_hydreon_rg15_serial2: "Serial2", - sensebox_rainsensor_hydreon_rg15_value: "value:", - sensebox_rainsensor_hydreon_rg15_totalAcc: "total Accumulation in mm", - sensebox_rainsensor_hydreon_rg15_rainInt: "Rainfall Intensity in mm/h", - sensebox_rainsensor_hydreon_rg15_eventAcc: "Accumulation per Event in mm", - sensebox_rainsensor_hydreon_rg15_acc: "Accumulation since last loop in mm", - sensebox_rainsensor_hydreon_rg15_tooltip: "Connect Rainsensor (RG-15) to one of the Serial ports.", - sensebox_rainsensor_hydreon_rg15_helpurl: "https://rainsensors.com/products/rg-15/", + * rg15 rainsensor + */ + sensebox_rg15_rainsensor: "Rainsensor (RG-15)", + sensebox_rg15_rainsensor_port: "Serial Port:", + sensebox_rg15_rainsensor_serial1: "Serial1", + sensebox_rg15_rainsensor_serial2: "Serial2", + sensebox_rg15_rainsensor_value: "value:", + sensebox_rg15_rainsensor_totalAcc: "total Accumulation in mm", + sensebox_rg15_rainsensor_rainInt: "Rainfall Intensity in mm/h", + sensebox_rg15_rainsensor_eventAcc: "Accumulation per Event in mm", + sensebox_rg15_rainsensor_acc: "Accumulation since last loop in mm", + sensebox_rg15_rainsensor_tooltip: + "Connect Rainsensor (RG-15) to one of the Serial ports.", + sensebox_rg15_rainsensor_helpurl: "https://rainsensors.com/products/rg-15/", /* * BME680 diff --git a/src/components/Blockly/toolbox/ToolboxMcu.js b/src/components/Blockly/toolbox/ToolboxMcu.js index 9475e0f6..897f6c0e 100644 --- a/src/components/Blockly/toolbox/ToolboxMcu.js +++ b/src/components/Blockly/toolbox/ToolboxMcu.js @@ -24,6 +24,7 @@ export const ToolboxMcu = () => { + {/* */}