Merge branch 'master' of https://github.com/fredlcore/BSB-LAN into de…

…v/update_2_10
fredlcore · Dec 9, 2024 · c9b44ec · c9b44ec
2 parents a56ea52 + 1efe6bf
commit c9b44ec
Show file tree

Hide file tree

Showing 14 changed files with 10,449 additions and 17,351 deletions.
diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
@@ -5300,6 +5300,9 @@ void loop() {
           if (debug_mode) {
             uint8_t destAddr = bus->getBusDest();
             uint8_t tempDestAddr = destAddr;
+            uint8_t save_my_dev_fam = my_dev_fam;
+            uint8_t save_my_dev_var = my_dev_var;
+            uint32_t save_my_dev_serial = my_dev_serial;
             uint8_t type = strtol(&p[2],NULL,16);
             uint32_t c = (uint32_t)strtoul(&p[5],NULL,16);
             uint8_t param[MAX_PARAM_LEN] = { 0 };
@@ -5343,6 +5346,9 @@ void loop() {
             writelnToWebClient();
             if (destAddr != tempDestAddr) {
               return_to_default_destination(destAddr);
+              my_dev_fam = save_my_dev_fam;
+              my_dev_var = save_my_dev_var;
+              my_dev_serial = save_my_dev_serial;
             }
           } else {
             printToWebClient("Activate debug mode in configuration in order to use /Y command!<BR>\r\n");

diff --git a/BSB_LAN/bsb-version.h b/BSB_LAN/bsb-version.h
@@ -1,4 +1,4 @@
 #define MAJOR "4"
 #define MINOR "2"
-#define PATCH "37"
-#define COMPILETIME "20241207010916"
+#define PATCH "38"
+#define COMPILETIME "20241207024203"
diff --git a/BSB_LAN/custom_functions/Emulation_of_Room_Unit/BSB_LAN_custom.h b/BSB_LAN/custom_functions/Emulation_of_Room_Unit/BSB_LAN_custom.h
@@ -28,9 +28,19 @@ if (custom_timer > custom_timer_compare+300000) {    // every five minutes
       float value = 0;
       for (uint8_t j = 0; j < 5; j++) {
         if (rgte_sensorid[i][j].number != 0) {
-          if(rgte_sensorid[i][j].dest_addr != -1) set_temp_destination(rgte_sensorid[i][j].dest_addr);
+          uint8_t save_my_dev_fam = my_dev_fam;
+          uint8_t save_my_dev_var = my_dev_var;
+          uint32_t save_my_dev_serial = my_dev_serial;
+          if(rgte_sensorid[i][j].dest_addr != -1) {
+            set_temp_destination(rgte_sensorid[i][j].dest_addr);
+          } 
           query(rgte_sensorid[i][j].number);
-          if(rgte_sensorid[i][j].dest_addr != -1) return_to_default_destination(dest_address);
+          if(rgte_sensorid[i][j].dest_addr != -1) {
+            return_to_default_destination(dest_address);
+            my_dev_fam = save_my_dev_fam;
+            my_dev_var = save_my_dev_var;
+            my_dev_serial = save_my_dev_serial;
+          }
           if (decodedTelegram.type == VT_TEMP && decodedTelegram.error == 0) {
             z++;
             value += atof(decodedTelegram.value);