More adjustments for FL_NOSWAP_QUR

fredlcore · Mar 22, 2024 · 5b07a38 · 5b07a38
1 parent 67f188e
commit 5b07a38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
@@ -1993,10 +1993,6 @@ void UpdateMaxDeviceList() {
   writeToEEPROM(CF_MAX_DEVADDR);
 }
 
-void print_bus_send_failed(void) {
-  printlnToDebug(PSTR("bus send failed"));  // to PC hardware serial I/F
-}
-
 void printPStr(uint_farptr_t outstr, uint16_t outstr_len) {
   for (uint16_t x=0;x<outstr_len-1;x++) {
     bigBuff[bigBuffPos] = pgm_read_byte_far(outstr+x);
@@ -5400,7 +5396,7 @@ void loop() {
                 if (((dev_fam != temp_dev_fam && dev_fam != DEV_FAM(DEV_ALL)) || (dev_var != temp_dev_var && dev_var != DEV_VAR(DEV_ALL))) && c!=CMD_UNKNOWN) {
                   printFmtToDebug(PSTR("%02X\r\n"), c);
                   if (bus->Send(TYPE_QUR, c, msg, tx_msg) != BUS_OK) {
-                    print_bus_send_failed();
+                    printlnToDebug(PSTR("bus send failed"));  // to PC hardware serial I/F
                   } else {
                     if (msg[4+(bus->getBusType()*4)]!=TYPE_ERR) {
                       // Decode the xmit telegram and send it to the PC serial interface
@@ -5541,7 +5537,7 @@ void loop() {
             }
             int8_t return_value = bus->Send(type, c, msg, tx_msg, param, param_len, true);
             if (return_value != BUS_OK) {
-              print_bus_send_failed();
+              printlnToDebug(PSTR("bus send failed"));  // to PC hardware serial I/F
             } else {
               // Decode the xmit telegram and send it to the PC serial interface
               printTelegram(tx_msg, -1);

diff --git a/BSB_LAN/include/print_telegram.h b/BSB_LAN/include/print_telegram.h
@@ -719,6 +719,9 @@ void printTelegram(byte* msg, float query_line) {
     while (1) {
       i = findLine(query_line,i,&c);
       uint16_t dev_flags = get_cmdtbl_flags(i);
+      if (dev_flags & FL_NOSWAP_QUR) {
+        c=((c & 0xFF000000) >> 8) | ((c & 0x00FF0000) << 8) | (c & 0x0000FFFF);
+      }
       if (dev_flags & FL_SPECIAL_INF) {
         c=((c & 0xFF000000) >> 8) | ((c & 0x00FF0000) << 8) | (c & 0x0000FFFF);
       }