Version 2.6.7

README.md

@@ -126,6 +126,10 @@ NEED TO FIX FOR THIS RELEASE.
 * Try an auto-update
 * Update Mongoose
 -->
+# Updates in 2.6.7 (May 23 2025)
+* Fixed bug with iaqualink protocol when no virtual buttons configured.
+* Updated RS timing debug messages.
+
 # Updates in 2.6.6 (May 23 2025)
 * Fixed some HTTP response codes.
 * Added checks for protocols vs panel revision.

source/iaqualink.c

@@ -489,7 +489,11 @@ bool process_iAqualinkStatusPacket(unsigned char *packet, int length, struct aqu
       int byteType = packet[5 + i];
       LOG(IAQL_LOG, LOG_INFO, "%-15.*s = %s | index %d type=(%0.2d 0x%02hhx) status=0x%02hhx start=%d length=%d\n", length, &packet[start + 2], (status == 0x00 ? "Off" : "On "), i, byteType, byteType, status, start, length);
       // Check against virtual onetouch buttons.
+
+      // NSF This needs to check strlingth, ie "Spa Mode" vs "Spa"
+     if ( aq_data->virtual_button_start > 0 ) {
       for (int bi=aq_data->virtual_button_start ; bi < aq_data->total_buttons ; bi++) {
+        //LOG(IAQL_LOG, LOG_INFO, "Check %s against %s\n",(char *)&packet[start + 2], aq_data->aqbuttons[bi].label);
         if (rsm_strcmp((char *)&packet[start + 2], aq_data->aqbuttons[bi].label) == 0) {
           //LOG(IAQL_LOG, LOG_INFO, "Status for %s is %s\n",aq_data->aqbuttons[bi].label,(status == 0x00 ? "Off" : "On "));
           // == means doesn;t match, RS 1=on 0=off / LED enum 1=off 0=on
@@ -501,6 +505,7 @@ bool process_iAqualinkStatusPacket(unsigned char *packet, int length, struct aqu
         }
       }
       start = start + packet[start + 1] + 2;
+     }
     }
   }
   else if (packet[PKT_CMD] == CMD_IAQ_AUX_STATUS)

source/json_messages.c

@@ -829,14 +829,16 @@ printf("Pump Type %d\n",aqdata->pumps[i].pumpType);
 
 
   length += sprintf(buffer+length, ",\"alternate_modes\":{" );
-  for (i=aqdata->virtual_button_start; i < aqdata->total_buttons; i++) 
-  {
-    if (isVBUTTON_ALTLABEL(aqdata->aqbuttons[i].special_mask)) {
-       length += sprintf(buffer+length, "\"%s\": \"%s\",",aqdata->aqbuttons[i].name, ((vbutton_detail *)aqdata->aqbuttons[i].special_mask_ptr)->in_alt_mode?JSON_ON:JSON_OFF );
+  if (aqdata->virtual_button_start > 0) {
+    for (i=aqdata->virtual_button_start; i < aqdata->total_buttons; i++) 
+    {
+      if (isVBUTTON_ALTLABEL(aqdata->aqbuttons[i].special_mask)) {
+        length += sprintf(buffer+length, "\"%s\": \"%s\",",aqdata->aqbuttons[i].name, ((vbutton_detail *)aqdata->aqbuttons[i].special_mask_ptr)->in_alt_mode?JSON_ON:JSON_OFF );
+      }
     }
+    if (buffer[length-1] == ',')
+      length--;
   }
-  if (buffer[length-1] == ',')
-    length--;
   length += sprintf(buffer+length, "}");
 
 

source/utils.c

@@ -45,6 +45,7 @@
 #include "utils.h"
 #include "rs_msg_utils.h"
 #include "aq_serial.h"
+#include "aqualink.h"
 
 #define DEFAULT_LOG_FILE "/tmp/aqualinkd-inline.log"
 //#define MAXCFGLINE 265
@@ -109,15 +110,15 @@ int getSystemLogLevel()
 int getLogLevel(logmask_t from)
 {
 
-  // RSSD_LOG should default to INFO unless the mask is explicitly set.
-  // IE Even if DEBUG is set, (Note ignored for the moment)
-
-  //if ( from == RSSD_LOG && ((_logforcemask & from) == from ) && _log_level < LOG_DEBUG_SERIAL)
-  if ( (from == RSSD_LOG || from == SLOG_LOG) && ((_logforcemask & from) == from ) && _log_level < LOG_DEBUG_SERIAL)
+  if ( (from == RSSD_LOG || from == SLOG_LOG) && isMASK_SET(_logforcemask, from) && _log_level < LOG_DEBUG_SERIAL) {
     return LOG_DEBUG_SERIAL;
-  else if ( ((_logforcemask & from) == from ) && _log_level < LOG_DEBUG_SERIAL)
+  } else if ( isMASK_SET(_logforcemask, from) && _log_level < LOG_DEBUG_SERIAL) {
     return LOG_DEBUG;
-  
+  } else if (from == RSTM_LOG && _log_level < LOG_DEBUG_SERIAL && !isMASK_SET(_logforcemask, from)) {
+    // RSTM_LOG (RS serial timings) should only print if debug_serial or explicitly set in the forcelogmask.
+    return LOG_NOTICE;
+ }
+
   return _log_level;
 }
 
@@ -593,8 +594,9 @@ void LOG(const logmask_t from, const int msg_level, const char * format, ...)
     return;
   }
   */
-  if ( msg_level > getLogLevel(from))
+  if ( msg_level > getLogLevel(from)) {
     return;
+  }
 
   char buffer[LOGBUFFER];
   va_list args;

source/version.h

@@ -4,4 +4,4 @@
 #define AQUALINKD_SHORT_NAME "AqualinkD"
 
 // Use Magor . Minor . Patch
-#define AQUALINKD_VERSION "2.6.6"
+#define AQUALINKD_VERSION "2.6.7"