Version 2.2.2a

Makefile

@@ -108,10 +108,7 @@ LOGR = ./release/log_reader
 PLAY = ./release/aqualinkd-player
 DEBG = ./release/aqualinkd-debug
 
-#aqualinkd:    $(MAIN)
+all:    $(MAIN)
-#	$(info $(MAIN) has been compiled)
-
-all:	$(MAIN)
 	$(info $(MAIN) has been compiled)
 
 # debug, Just change compile flags and call MAIN
@@ -131,6 +128,15 @@ $(SLOG): $(SL_OBJS)
 	$(CC) $(CFLAGS) $(INCLUDES) -o $(SLOG) $(SL_OBJS) 
 
 
+#.PHONY: clean_slog_o
+#clean_slog_o:
+#	$(RM) $(SL_OBJS)
+#
+#.PHONY: test
+#test:	$(SLOG)
+#test:	clean_slog_o
+#test:	$(MAIN)
+
 # Shouldn't need to use any of these options unless you're developing.
 
 aqdebug: $(DEBG)

net_services.c

@@ -1468,7 +1468,7 @@ bool _start_net_services(struct mg_mgr *mgr, struct aqualinkdata *aqdata) {
   LOG(NET_LOG,LOG_NOTICE, "Starting web server on port %s\n", _aqconfig_.socket_port);
   nc = mg_bind(mgr, _aqconfig_.socket_port, ev_handler);
   if (nc == NULL) {
-    LOG(NET_LOG,LOG_ERR, "Failed to create listener\n");
+    LOG(NET_LOG,LOG_ERR, "Failed to create listener on port %s\n",_aqconfig_.socket_port);
     return false;
   }
 
@@ -1512,7 +1512,14 @@ void *net_services_thread( void *ptr )
   struct aqualinkdata *aqdata = (struct aqualinkdata *) ptr;
   struct mg_mgr mgr;
 
-  _start_net_services(&mgr, aqdata);
+  if (!_start_net_services(&mgr, aqdata)) {
+    //LOG(NET_LOG,LOG_ERR, "Failed to start network services\n");
+    // Not the best way to do this (have thread exit process), but forks for the moment.
+    _keepNetServicesRunning = false;
+    LOG(AQUA_LOG,LOG_ERR, "Can not start webserver on port %s.\n", _aqconfig_.socket_port);
+    exit(EXIT_FAILURE);
+    goto f_end;
+  }
 
   while (_keepNetServicesRunning == true)
   {
@@ -1527,6 +1534,7 @@ void *net_services_thread( void *ptr )
     }
   }
 
+f_end:
   LOG(NET_LOG,LOG_NOTICE, "Stopping network services thread\n");
   mg_mgr_free(&mgr);
 

release/aqualinkd.conf

@@ -46,12 +46,12 @@ panel_type = RS-8 Combo
 #panel_type = RS-8 Only
 #
 # If serial_logger doesn't give you a type string in the format above, you can use the next options to set the specifics.
-# (Number of supported accessories / buttons)
+# 
-# panel_type_size = (6, 8, 10, 12, 14 or 16)
+# panel_type_size = (6, 8, 10, 12, 14 or 16)  (Number of supported accessories / buttons)
-# panel_type_combo = (yes or no) (combo panels support BOTH pool & spa)
+# panel_type_combo = (yes or no)              (combo panels support BOTH pool & spa)
-# panel_type_dual = (yes or no) (dual circuit panel)
+# panel_type_dual = (yes or no)               (dual circuit panel)
-# panel_type_pda = (yes or no)  (PDA panel. only set this if you have to. Panel ONLY supports the PDA protocol)
+# panel_type_pda = (yes or no)                (PDA panel. only set this if you have to. Panel ONLY supports the PDA protocol)
-# panel_type_rs = (yes or no)   (RS panel. Panel Supports all protocols)
+# panel_type_rs = (yes or no)                 (RS panel. Panel Supports all protocols)
 
 
 # The ID of the Aqualink terminal device. Devices probed by RS8 master are:
@@ -174,7 +174,7 @@ light_programming_initial_off=12
 
 
 # Use/find labels from Control Panel, these will overwrite the button_xx_label below, 
-# it dows NOT work in PDA mode.
+# it noes NOT work in PDA mode, and it also considerable slows down AqualinkD startup process.
 use_panel_aux_labels=no
 
 # These are all the button labels / options / pump and light configurations you want to use.
@@ -186,8 +186,10 @@ use_panel_aux_labels=no
 # button_??_pumpIndex=1        <Pump index Jandy panel is configured to use>
 # button_??_lightMode=4        <Color light mode>
 #
-# If using PDA mode, The Labels below are of the utmost importance, the labels MUST match the labels in the "EQUIPTMENT ON/OFF" menu of the PDA device.
+# In most cases the label is just what you want to see in web UI/MQTT/API. ie you don't need to use Jandy's labeling. There are 2 exaeptions to the labeling listed below
-# RS 16 Panels have no protocol bit representation for AUXB5 to AUXB8, only text, so as with PDA Those labels MUST match the control panel
+# 1) If using PDA mode, The Labels below are of the utmost importance, the labels MUST exactly match the labels in the "EQUIPTMENT ON/OFF" menu of the PDA device.
+# 2) RS 16 Panels have no protocol bit representation for AUXB5 to AUXB8, only text, so as with PDA Those labels MUST match the control panel.
+# Use NONE for label if you don't have anything connected to that circuit and don't want to see the button in the UI.
 #
 # Below is an example of how different Panels map into the buttons.
 #
@@ -227,7 +229,7 @@ use_panel_aux_labels=no
 # If you have assigned this pump an index number in your Aqualink control panel, (Between 1 & 4), put it here for VSP, RPM, Primp information to be captured.
 #
 
-# Labels for standard butons RS-8 Combo panel used as example.
+# Below are settings for standard buttons on RS-8 Combo panel used as example.
 button_01_label=Filter Pump
 
 button_02_label=Spa Mode

version.h

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

web/controller.html

@@ -620,6 +620,9 @@
       image.onload = function() {
         document.getElementById("body_wrap").style.backgroundImage = "url('" + this.src + "')";
       };
+      image.onerror = function() {
+        image.src = "hk/background.jpg"; // Use default if image fails.
+      };
       if (typeof background_reload !== 'undefined' && background_reload > 0) {
         image.src = background_url + '?' + new Date().getTime();
         setTimeout(load_background, (background_reload * 1000));