From b05b3017e1b809fdc690bf2a89c9ca4a84e75bd5 Mon Sep 17 00:00:00 2001 From: Mario Pesch Date: Wed, 14 Dec 2022 13:59:31 +0100 Subject: [PATCH] remove duplicate variable --- .../Blockly/generator/sensebox-sensors.js | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js index da46ec3..21b5bb2 100644 --- a/src/components/Blockly/generator/sensebox-sensors.js +++ b/src/components/Blockly/generator/sensebox-sensors.js @@ -434,7 +434,8 @@ if (airSensor.begin() == false) while (1) ; }`; - Blockly.Arduino.setupCode_["scd30_staleData"] = "airSensor.useStaleData(true);"; + Blockly.Arduino.setupCode_["scd30_staleData"] = + "airSensor.useStaleData(true);"; var code = ""; switch (dropdown) { case "temperature": @@ -694,24 +695,27 @@ Blockly.Arduino.sensebox_sensor_dps310 = function () { return [code, Blockly.Arduino.ORDER_ATOMIC]; }; - /** * Sensirion SPS30 Fine Particlar Matter * */ - Blockly.Arduino.sensebox_sensor_sps30 = function () { +Blockly.Arduino.sensebox_sensor_sps30 = function () { var dropdown_name = this.getFieldValue("value"); Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include "; Blockly.Arduino.libraries_[ "sps30" ] = `#include // http://librarymanager/All#`; - Blockly.Arduino.variables_["sps30_measurement"] = "struct sps30_measurement m;"; - Blockly.Arduino.variables_["sps30_auto_clean_days"] = "uint32_t auto_clean_days = 4;"; - Blockly.Arduino.variables_["sps30_ret"] = "int16_t ret;"; - Blockly.Arduino.variables_["sps30_interval_intervalsps"] = "const long intervalsps = 1000;"; - Blockly.Arduino.variables_["sps30_time_startsps"] = "unsigned long time_startsps = 0;"; - Blockly.Arduino.variables_["sps30_time_actualsps"] = "unsigned long time_actualsps = 0;"; + Blockly.Arduino.variables_["sps30_measurement"] = + "struct sps30_measurement m;"; + Blockly.Arduino.variables_["sps30_auto_clean_days"] = + "uint32_t auto_clean_days = 4;"; + Blockly.Arduino.variables_["sps30_interval_intervalsps"] = + "const long intervalsps = 1000;"; + Blockly.Arduino.variables_["sps30_time_startsps"] = + "unsigned long time_startsps = 0;"; + Blockly.Arduino.variables_["sps30_time_actualsps"] = + "unsigned long time_actualsps = 0;"; Blockly.Arduino.codeFunctions_["sps30_getData"] = ` void getSPS30Data(){ @@ -731,8 +735,10 @@ do { `; Blockly.Arduino.setupCode_["sps30_begin"] = "sensirion_i2c_init();"; - Blockly.Arduino.setupCode_["sps30_setFanCleaningInterval"] = "sps30_set_fan_auto_cleaning_interval_days(auto_clean_days);" - Blockly.Arduino.setupCode_["sps30_startMeasurement"] = "sps30_start_measurement();"; + Blockly.Arduino.setupCode_["sps30_setFanCleaningInterval"] = + "sps30_set_fan_auto_cleaning_interval_days(auto_clean_days);"; + Blockly.Arduino.setupCode_["sps30_startMeasurement"] = + "sps30_start_measurement();"; Blockly.Arduino.loopCodeOnce_["getSPS30Data();"] = ` time_startsps = millis(); if (time_startsps > time_actualsps + intervalsps) { @@ -741,4 +747,4 @@ if (time_startsps > time_actualsps + intervalsps) { }`; var code = `m.mc_${dropdown_name}`; return [code, Blockly.Arduino.ORDER_ATOMIC]; -}; \ No newline at end of file +};