Adjustments for RVD130 QAA type

fredlcore · May 13, 2024 · 801e9a1 · 801e9a1
1 parent e384b67
commit 801e9a1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/BSB_LAN/BSB_LAN_config.h.default b/BSB_LAN/BSB_LAN_config.h.default
@@ -111,7 +111,7 @@ byte dest_address = 0x00;
 // PPS:
 // - set 'pps_write' to "1" to enable writing to heater - only use this if there is no other room controller (such as QAA50/QAA70) active.
 bool pps_write = 0;
-byte QAA_TYPE = 0x53;  // 0x53 = QAA70, 0x52 = QAA50, 0x5A = QAA10, 0x37 = QAA95, 0x66 = BMU, 0xEA = MCBA/REA70/DC225, 0xEB = RVD130
+byte QAA_TYPE = 0x53;  // 0x53 = QAA70, 0x52 = QAA50, 0x5A = QAA10, 0x37 = QAA95, 0x66 = BMU, 0xEA = MCBA/REA70/DC225, 0x43 = RVD130
 // Setting bus pins
 byte bus_pins[2] = {0,0}; //First value - RX pin, second value - TX pin. 0,0 - auto select (19,18 for Due, 16,17 for NodeMCU, 36,17 for Olimex EVB, 36,5 for Olimex POE and 68,69 for Mega).
 

diff --git a/BSB_LAN/BSB_LAN_defs.h b/BSB_LAN/BSB_LAN_defs.h
@@ -1140,8 +1140,8 @@ const char ENUM15046[] = {
 "\x5a " ENUM15046_5a_TEXT "\0"
 "\x37 " ENUM15046_37_TEXT "\0"
 "\x66 " ENUM15046_66_TEXT "\0"
-"\xea " ENUM15046_ea_TEXT "\0"        // Use unused value 0xEA for MCBA/DC225 type
-"\xeb " ENUM15046_eb_TEXT             // Use unused value 0xEB for RVD130 (which increments high nibble for each magic byte)
+"\x43 " ENUM15046_43_TEXT "\0"        // Use unused value 0x43 (0x53 from QAA70 minus 0x10) for RVD130 (which increments high nibble for each magic byte)
+"\xea " ENUM15046_ea_TEXT             // Use unused value 0xEA for MCBA/DC225 type
 };
 
 #include "BSB_LAN_custom_defs.h"

diff --git a/BSB_LAN/include/pps_handling.h b/BSB_LAN/include/pps_handling.h
@@ -1,7 +1,7 @@
 // PPS-Bus handling
 uint16_t pps_bus_handling(byte *msg) {
   uint16_t log_now = 0;
-  if ((((msg[0] & 0x0F) == 0x07 && QAA_TYPE == 0xEB) || msg[0] == 0x17) && pps_write == 1) { // Send client data upon PPS RTS telegram (0x17). For RVD130 heaters (which increase the high nibble of magic bytes), send if lower nibble is 0x07. Handling it generally this way led to problems with RVA53 or LGM11 heaters which use high nibble apparently to communicate with other devices on the bus. TODO: Test if changed PPS device unit on QAA70 also affects this.
+  if ((((msg[0] & 0x0F) == 0x07 && QAA_TYPE == 0x43) || msg[0] == 0x17) && pps_write == 1) { // Send client data upon PPS RTS telegram (0x17). For RVD130 heaters (which increase the high nibble of magic bytes), send if lower nibble is 0x07. Handling it generally this way led to problems with RVA53 or LGM11 heaters which use high nibble apparently to communicate with other devices on the bus. TODO: Test if changed PPS device unit on QAA70 also affects this.
     byte tx_msg[] = {0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
     byte rx_msg[10] = { 0 };
     switch (msg_cycle) {
@@ -268,7 +268,7 @@ uint16_t pps_bus_handling(byte *msg) {
 
   } else {    // parse heating system data
 
-    if (((msg[0] & 0x0F) == 0x0E && QAA_TYPE == 0xEB) || msg[0] == 0x1E) {   // Heater requests information from the QAA (i.e. BSB-LAN) with telegram type 0x1E (or lower nibble 0x0E for RVD130)
+    if (((msg[0] & 0x0F) == 0x0E && QAA_TYPE == 0x43) || msg[0] == 0x1E) {   // Heater requests information from the QAA (i.e. BSB-LAN) with telegram type 0x1E (or lower nibble 0x0E for RVD130)
       saved_msg_cycle = msg_cycle;
       switch (msg[1]) {
         case 0x08: msg_cycle = 9; break;

diff --git a/BSB_LAN/localization/LANG_C.h b/BSB_LAN/localization/LANG_C.h
@@ -3397,7 +3397,7 @@
 #define ENUM15046_37_TEXT "ENUM15046_37_TEXT"
 #define ENUM15046_66_TEXT "ENUM15046_66_TEXT"
 #define ENUM15046_ea_TEXT "ENUM15046_ea_TEXT"
-#define ENUM15046_eb_TEXT "ENUM15046_eb_TEXT"
+#define ENUM15046_43_TEXT "ENUM15046_43_TEXT"
 #define ENUM_ERROR_00_TEXT "ENUM_ERROR_00_TEXT"
 #define ENUM_ERROR_0a_TEXT "ENUM_ERROR_0a_TEXT"
 #define ENUM_ERROR_14_TEXT "ENUM_ERROR_14_TEXT"

diff --git a/BSB_LAN/localization/LANG_DE.h b/BSB_LAN/localization/LANG_DE.h
@@ -3397,7 +3397,7 @@
 #define ENUM15046_37_TEXT "QAA 95"
 #define ENUM15046_66_TEXT "BMU"
 #define ENUM15046_ea_TEXT "DC225/MCBA/REA70"
-#define ENUM15046_eb_TEXT "RVD130"
+#define ENUM15046_43_TEXT "RVD130"
 #define ENUM_ERROR_00_TEXT "kein Fehler"
 #define ENUM_ERROR_0a_TEXT "Außentemperatur Fühlerfehler"
 #define ENUM_ERROR_14_TEXT "Kesseltemperatur 1 Fühlerfehler"