Change effect of FL_SPECIAL_INF

fredlcore · May 30, 2024 · c8f61ae · c8f61ae
1 parent fed672c
commit c8f61ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
@@ -3517,14 +3517,14 @@ int set(int line      // the ProgNr of the heater parameter
         param[1]=(t >> 8);
         param[2]= t & 0xff;
       } else { // INF message type
-        if ((get_cmdtbl_flags(i) & FL_SPECIAL_INF) == FL_SPECIAL_INF) {  // Case for outside temperature
-          param[0]=0;
-          param[1]=(t >> 8);
-          param[2]= t & 0xff;
-        } else {  // Case for room temperature
+        if ((cmdtbl[i].flags & FL_SPECIAL_INF)) {   // Case for room temperature
           param[0]=(t >> 8);
           param[1]= t & 0xff;
           param[2]=0x00;
+        } else {                // Case for outside temperature
+          param[0]=0;
+          param[1]=(t >> 8);
+          param[2]= t & 0xff;
         }
       }
       param_len=3;

diff --git a/BSB_LAN/BSB_LAN_custom_defs.h.default b/BSB_LAN/BSB_LAN_custom_defs.h.default
@@ -11878,12 +11878,12 @@ PROGMEM_LATE const cmd_t cmdtbl[]={
 
 // Take your pick whether you assign 10000 (your choice) or 10109 (as in other sources) to this telegram
 // dc 86 00 0e 02 3d 2d 02 15 05 76 00 b0 e0   Note the command code! The command table must match it.
-{0x2D3D0215,  VT_TEMP,          10000, STR10000, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY, DEV_ALL}, // Raumtemperatur 1 (kann als INF geschickt werden)
+{0x2D3D0215,  VT_TEMP,          10000, STR10000, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY+FL_SPECIAL_INF, DEV_ALL}, // Raumtemperatur 1 (kann als INF geschickt werden)
 {0x2D3D021C,  VT_TEMP,          10000, STR10000, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY, DEV_059_ALL}, // Raumtemperatur 1 (kann als INF geschickt werden)
-{0x2E3E0215,  VT_TEMP,          10001, STR10001, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY, DEV_ALL}, // Raumtemperatur 2 (kann als INF geschickt werden) / some systems (e.g. RVS21.827D/127) seem to be sensitive to the second byte being 3E in this case instead of the usual 3D.
-{0x2F3F0215,  VT_TEMP,          10002, STR10002, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY, DEV_ALL}, // Raumtemperatur 3/P (kann als INF geschickt werden)
-{0x0500021F,  VT_TEMP,          10003, STR8700,  0,                    NULL,         DEFAULT_FLAG+FL_SPECIAL_INF, DEV_ALL}, // Außentemperatur wie von Funkempfänger übermittelt
-{0x053D0521,  VT_TEMP,          10004, STR8700,  0,                    NULL,         DEFAULT_FLAG+FL_SPECIAL_INF, DEV_ALL}, // Außentemperatur wie von Funkempfänger übermittelt
+{0x2E3E0215,  VT_TEMP,          10001, STR10001, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY+FL_SPECIAL_INF, DEV_ALL}, // Raumtemperatur 2 (kann als INF geschickt werden) / some systems (e.g. RVS21.827D/127) seem to be sensitive to the second byte being 3E in this case instead of the usual 3D.
+{0x2F3F0215,  VT_TEMP,          10002, STR10002, 0,                    NULL,         DEFAULT_FLAG+FL_WONLY+FL_SPECIAL_INF, DEV_ALL}, // Raumtemperatur 3/P (kann als INF geschickt werden)
+{0x0500021F,  VT_TEMP,          10003, STR8700,  0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Außentemperatur wie von Funkempfänger übermittelt
+{0x053D0521,  VT_TEMP,          10004, STR8700,  0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Außentemperatur wie von Funkempfänger übermittelt
 
 {0x05000BDF,  VT_UNKNOWN,       10050, STR10200, 0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Captured from Brötje IDA
 {0x11000C12,  VT_UNKNOWN,       10053, STR10200, 0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Captured from Brötje IDA