update

README.md

@@ -67,6 +67,10 @@ Designed to mimic AqualinkRS6 All Button keypad, and just like the keypad you ca
 * http://aqualink.ip/simple.html   <- (Anothr opion if you don't like the above)
 * http://aqualink.ip/simulator.html  <- (RS8 All Button Control Panel simulator)
 #<a name="release"></a>
+## Update in Release 1.2.6c
+* Fix some merge issues
+* Added MQTT topic for delayed start on buttons.
+* Removed MQTT flash option for delayed start (never worked well anyway)
 ## Update in Release 1.2.6b
 * Added MQTT topic for full SWG status (MQTT section in see wiki)
 * Config option to turn on/of listening to extended device information.

config.c

@@ -382,9 +382,10 @@ bool setConfigValue(struct aqconfig *config_parameters, struct aqualinkdata *aqd
   } else if (strncasecmp(param, "convert_dz_temp_to_c", 20) == 0) {
     config_parameters->convert_dz_temp = text2bool(value);
     rtn=true;
+    /*
   } else if (strncasecmp(param, "flash_mqtt_buttons", 18) == 0) {
     config_parameters->flash_mqtt_buttons = text2bool(value);
-    rtn=true;
+    rtn=true;*/
   } else if (strncasecmp(param, "report_zero_spa_temp", 20) == 0) {
     config_parameters->report_zero_spa_temp = text2bool(value);
     rtn=true;
@@ -564,7 +565,7 @@ bool writeCfg (struct aqconfig *config_parameters, struct aqualinkdata *aqdata)
   fprintf(fp, "\n#** General **\n");
   fprintf(fp, "convert_mqtt_temp_to_c = %s\n", bool2text(config_parameters->convert_mqtt_temp));
   fprintf(fp, "override_freeze_protect = %s\n", bool2text(config_parameters->override_freeze_protect));        
-  fprintf(fp, "flash_mqtt_buttons = %s\n", bool2text(config_parameters->flash_mqtt_buttons)); 
+  //fprintf(fp, "flash_mqtt_buttons = %s\n", bool2text(config_parameters->flash_mqtt_buttons)); 
   fprintf(fp, "report_zero_spa_temp = %s\n", bool2text(config_parameters->report_zero_spa_temp));
   fprintf(fp, "report_zero_pool_temp = %s\n", bool2text(config_parameters->report_zero_pool_temp));
 

config.h

@@ -52,7 +52,7 @@ struct aqconfig
   bool pda_mode;
   bool convert_mqtt_temp;
   bool convert_dz_temp;
-  bool flash_mqtt_buttons;
+  //bool flash_mqtt_buttons;
   bool report_zero_spa_temp;
   bool report_zero_pool_temp;
   bool read_all_devices;

net_services.c

@@ -491,6 +491,7 @@ void mqtt_broadcast_aqualinkstate(struct mg_connection *nc)
 
   // Loop over LED's and send any changes.
   for (i=0; i < TOTAL_BUTTONS; i++) {
+    /*
    if ( _aqualink_data->aqbuttons[i].led->state == FLASH && _aqualink_config->flash_mqtt_buttons == true ) {
       // Simply send on or off depending on if current second is odd or even.
       // will send too many off and on messages as we get hit multiple times a second, but most effecient way to handle this
@@ -499,7 +500,7 @@ void mqtt_broadcast_aqualinkstate(struct mg_connection *nc)
       now = time(NULL);
       send_mqtt_state_msg(nc, _aqualink_data->aqbuttons[i].name, (now % 2)?OFF:ON);
       logMessage(LOG_DEBUG, "Flash button : %s %s\n",_aqualink_data->aqbuttons[i].name,(now % 2)?"off":"on");
-    } else if (_last_mqtt_aqualinkdata.aqualinkleds[i].state != _aqualink_data->aqbuttons[i].led->state) {
+    } else */if (_last_mqtt_aqualinkdata.aqualinkleds[i].state != _aqualink_data->aqbuttons[i].led->state) {
       _last_mqtt_aqualinkdata.aqualinkleds[i].state = _aqualink_data->aqbuttons[i].led->state;
       if (_aqualink_data->aqbuttons[i].code == KEY_POOL_HTR || _aqualink_data->aqbuttons[i].code == KEY_SPA_HTR) {
         send_mqtt_heater_state_msg(nc, _aqualink_data->aqbuttons[i].name, _aqualink_data->aqbuttons[i].led->state);

release/aqualinkd.conf

@@ -35,15 +35,6 @@ override_freeze_protect = no
 convert_mqtt_temp_to_c = yes 
 convert_dz_temp_to_c = yes
 
-# Flash MQTT button on/off like control panel does in cool down mode.
-flash_mqtt_buttons = no
-
-# default is to not report changes to pool temp when the filter pump is off or in spa mode
-# enable below to report 0 as the pool temp when the filter pump is off or when in spa mode.
-# This is for MQTT cnnections only, WEB socket and WEB API always report TEMP_UNKNOWN (-999) allowing the consumer to
-# decide how to report.
-report_zero_pool_temp = no
-
 # default is to use pool water temp as spa water temp when spa is off (and there for not able to report water temp)
 # enable below to report 0 as the spa temp when spa is off.
 # This is for MQTT cnnections only, WEB socket and WEB API always report TEMP_UNKNOWN (-999) allowing the consumer to

version.h

@@ -1,4 +1,4 @@
 
 
 #define AQUALINKD_NAME "Aqualink Daemon"
-#define AQUALINKD_VERSION "1.2.6b"
+#define AQUALINKD_VERSION "1.2.6c"