Version 1.3.4a

README.md

@@ -63,11 +63,12 @@ Designed to mimic AqualinkRS6 All Button keypad, and just like the keypad you ca
 * http://aqualink.ip/simple.html   <- (Simple 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.3.4
+## Update in Release 1.3.4 (a)
 * Logging changes.
 * Fix issues in programming mode.
 * Update to simulation mode.
 * Changed to serial logger.
+* PDA changes for SWG and Setpoints.
 ## Update in Release 1.3.3 (a,b,c,e,f)
 * Incremental PDA fixes / enhancements.
 * SWG bug fix

log_reader.c

@@ -1,3 +1,20 @@
+
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>

net_services.c

@@ -1014,7 +1014,7 @@ void action_domoticz_mqtt_message(struct mg_connection *nc, struct mg_mqtt_messa
   int idx = -1;
   int nvalue = -1;
   int i;
-  char svalue[DZ_SVALUE_LEN];
+  char svalue[DZ_SVALUE_LEN+1];
 
   if (parseJSONmqttrequest(msg->payload.p, msg->payload.len, &idx, &nvalue, svalue)) {
     logMessage(LOG_DEBUG, "MQTT: DZ: Received message IDX=%d nValue=%d sValue=%s\n", idx, nvalue, svalue);

pda.c

@@ -1,4 +1,20 @@
 
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
 #define _GNU_SOURCE 1 // for strcasestr & strptime
 #include <stdio.h>
 #include <stdlib.h>
@@ -171,11 +187,13 @@ void pass_pda_equiptment_status_item(char *msg)
   else if ((index = strcasestr(msg, MSG_SWG_PCT)) != NULL)
   {
     _aqualink_data->swg_percent = atoi(index + strlen(MSG_SWG_PCT));
+    if (_aqualink_data->ar_swg_status == SWG_STATUS_OFF) {_aqualink_data->ar_swg_status = SWG_STATUS_ON;}
     logMessage(LOG_DEBUG, "AquaPure = %d\n", _aqualink_data->swg_percent);
   }
   else if ((index = strcasestr(msg, MSG_SWG_PPM)) != NULL)
   {
     _aqualink_data->swg_ppm = atoi(index + strlen(MSG_SWG_PPM));
+    if (_aqualink_data->ar_swg_status == SWG_STATUS_OFF) {_aqualink_data->ar_swg_status = SWG_STATUS_ON;}
     logMessage(LOG_DEBUG, "SALT = %d\n", _aqualink_data->swg_ppm);
   }
   else if ((index = strcasestr(msg, MSG_PMP_RPM)) != NULL)
@@ -295,6 +313,10 @@ void process_pda_packet_msg_long_equipment_control(const char *msg)
     }
   }
 
+  // Force SWG off if pump is off.
+  if (_aqualink_data->aqbuttons[0].led->state == OFF )
+    _aqualink_data->ar_swg_status = SWG_STATUS_OFF;
+
   // NSF I think we need to check TEMP1 and TEMP2 and set Pool HEater and Spa heater directly, to support single device.
   if (_aqualink_data->single_device){
     if (strcasecmp(stripwhitespace(labelBuff), "TEMP1") == 0)
@@ -564,9 +586,11 @@ bool process_pda_packet(unsigned char *packet, int length)
     if (pda_m_type() == PM_EQUIPTMENT_STATUS)
     {
       if (_aqualink_data->frz_protect_state == ON)
-      {
         _aqualink_data->frz_protect_state = ENABLE;
-      }
+      
+      if (_aqualink_data->ar_swg_status == SWG_STATUS_ON) 
+        _aqualink_data->ar_swg_status = SWG_STATUS_OFF;
+      
       if (pda_m_line(PDA_LINES - 1)[0] == '\0')
       {
         for (i = 0; i < TOTAL_BUTTONS; i++)

pda_aq_programmer.c

@@ -1,3 +1,20 @@
+
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -280,7 +297,7 @@ bool goto_pda_menu(struct aqualinkdata *aq_data, pda_menu_type menu) {
       // Depending on control panel config, may get an extra menu asking to press any key.
       select_pda_menu_item(aq_data, "SET TEMP", false);
       waitForPDAMessageType(aq_data,CMD_PDA_CLEAR,10);
-      waitForPDAMessageTypesOrMenu(aq_data,CMD_PDA_HIGHLIGHT,CMD_PDA_HIGHLIGHTCHARS,15,"press ANY key",8);
+      waitForPDAMessageTypesOrMenu(aq_data,CMD_PDA_HIGHLIGHT,CMD_PDA_HIGHLIGHTCHARS,20,"press ANY key",8);
     break;
     case PM_SET_TIME:
       select_pda_menu_item(aq_data, "MENU", true);

pda_menu.c

@@ -1,4 +1,22 @@
 
+
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

pentair_messages.c

@@ -1,4 +1,20 @@
 
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
 
 #include <stdio.h>
 #include <stdlib.h>

serial_logger.c

@@ -1,4 +1,20 @@
 
+/*
+ * Copyright (c) 2017 Shaun Feakes - All rights reserved
+ *
+ * You may use redistribute and/or modify this code under the terms of
+ * the GNU General Public License version 2 as published by the 
+ * Free Software Foundation. For the terms of this license, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * You are free to use this software under the terms of the GNU General
+ * Public License, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ *  https://github.com/sfeakes/aqualinkd
+ */
+
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>

version.h

@@ -1,4 +1,4 @@
 
 
 #define AQUALINKD_NAME "Aqualink Daemon"
-#define AQUALINKD_VERSION "1.3.4"
+#define AQUALINKD_VERSION "1.3.4a"