Merge branch 'Development' of github.com:sfeakes/AqualinkD into Devel…

…opment
sfeakes · May 23, 2024 · fdd5491 · fdd5491
2 parents dd72a3c + c70f4ce
commit fdd5491
Show file tree

Hide file tree

Showing 49 changed files with 64 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Aqualinkd  
-Linux daemon to control Aqualink RS pool controllers. Provides web UI, MQTT client & HTTP API endpoints. Control your pool equiptment from any phone/tablet or computer.  Is also compatible with most Home control systems including Apple HomeKit, Samsung, Alexa, Google, etc.
+Linux daemon to control Aqualink RS pool controllers. Provides web UI, MQTT client & HTTP API endpoints. Control your pool equiptment from any phone/tablet or computer.  Is also compatible with most Home control systems including Apple HomeKit, Home Assistant, Samsung, Alexa, Google, etc.
 <br>
-Binaries are supplied for Raspberry Pi, Has bean, and can be compiled for many different SBC's. 
+Binaries are supplied for Raspberry Pi, Has bean, and can be compiled for many different SBC's, and a Docker is also abailable.
 
 ### It does not, and will never provide any layer of security. NEVER directly expose the device running this software to the outside world; only indirectly through the use of Home Automation hub's or other security measures. e.g. VPNs.
 
@@ -21,8 +21,10 @@ https://github.com/sfeakes/AqualinkD/issues
 ## Please see Wiki for installation instructions
 https://github.com/sfeakes/AqualinkD/wiki
 
+<!--
 For information on Control panel versions and upgrading the chips.<br>
 https://github.com/sfeakes/AqualinkD/wiki/Upgrading-Jandy-Aqualink-PDA-to-RS-panel
+-->
 <!--
 Here's where I started to document what I know about the Jandy RS485 protocol.<br>
 https://github.com/sfeakes/AqualinkD/wiki/Jandy-Aqualink-RS485-protocol
@@ -96,20 +98,26 @@ Designed to mimic AqualinkRS devices, used to fully configure the master control
     * about Heat vs Heater
     * Panel version
     * can't use iaquatouch panel / wireless
--->
 
-# Update in Release 2.3.5
-* Added Home Assistant integration through MQTT discover
-  * Please read the Wiki section on this [Wiki - HASSIO](https://github.com/sfeakes/AqualinkD/wiki#HASSIO)
-  * There are still some enhacments to come on this.
-* Added support for reading extended information for Jandy JXi heaters.
-* Added Color Light to iAqualinkTouch protocol.
 * Added iAqualinkTouch support for PDA only panels that can use that protocol.
   * PDA panel needs to be Rev 6.0 or newer.
   * This makes the PDA only panels quicker and less error prone.
   * Introduces color light support and VSP
   * Consider this PDA support Beta.
   * Read PDA Wiki
+-->
+
+# Call for Help.
+* The only Jandy devices I have not decoded yet are LX heater & Chemical Feeder. If you have either of these devices and are willing to post some logs, please let me know, or post in the [Discussions area](https://github.com/sfeakes/AqualinkD/discussions)
+
+# Update in Release 2.3.5
+* Added Home Assistant integration through MQTT discover
+  * Please read the Home Assistant section of the [Wiki - HASSIO](https://github.com/sfeakes/AqualinkD/wiki#HASSIO)
+  * There are still some enhacments to come on this.
+* Included Docker into main releases
+  * Please read Docker section of the  [Wiki - Docker](https://github.com/sfeakes/AqualinkD/wiki#Docker)
+* Added support for reading extended information for Jandy JXi heaters.
+* Added Color Light to iAqualinkTouch protocol.
 * Fixed issue mqtt_timed_update (1~2 min rather than between 2 & 20 min)
 
 # Update in Release 2.3.4

diff --git a/config.c b/config.c
@@ -569,7 +569,7 @@ bool setConfigValue(struct aqualinkdata *aqdata, char *param, char *value) {
     else
       _aqconfig_.read_RS485_devmask &= ~READ_RS485_JAN_JXI;
     rtn=true;
-   } else if (strncasecmp (param, "read_RS485_LX", 14) == 0) {
+   } else if (strncasecmp (param, "read_RS485_LX", 13) == 0) {
     if (text2bool(value))
       _aqconfig_.read_RS485_devmask |= READ_RS485_JAN_LX;
     else

diff --git a/release/aqualinkd b/release/aqualinkd
diff --git a/release/aqualinkd.conf b/release/aqualinkd.conf
@@ -86,6 +86,7 @@ device_id=0x0a
 # vsfPump = Pentair VS,VF,VSF pump
 # JXi = Jandy JXi heater (might also be LXi heaters)
 # LX = Jandy LX & LT heaters
+# Chem = Jandy Chemical Feeder
 #read_RS485_swg = yes
 #read_RS485_ePump = yes 
 #read_RS485_vsfPump = yes

diff --git a/web/hk/Aux_1-off.png b/web/hk/Aux_1-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_1-on.png b/web/hk/Aux_1-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_12-on.png b/web/hk/Aux_12-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_2-off.png b/web/hk/Aux_2-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_2-on.png b/web/hk/Aux_2-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_3-off.png b/web/hk/Aux_3-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_3-on.png b/web/hk/Aux_3-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_4-off.png b/web/hk/Aux_4-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_4-on.png b/web/hk/Aux_4-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_5-off.png b/web/hk/Aux_5-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_5-on.png b/web/hk/Aux_5-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_6-off.png b/web/hk/Aux_6-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_6-on.png b/web/hk/Aux_6-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_7-off.png b/web/hk/Aux_7-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_7-on.png b/web/hk/Aux_7-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_8-off.png b/web/hk/Aux_8-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_8-on.png b/web/hk/Aux_8-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B1-off.png b/web/hk/Aux_B1-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B1-on.png b/web/hk/Aux_B1-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B2-off.png b/web/hk/Aux_B2-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B2-on.png b/web/hk/Aux_B2-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B3-off.png b/web/hk/Aux_B3-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B3-on.png b/web/hk/Aux_B3-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B4-off.png b/web/hk/Aux_B4-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B4-on.png b/web/hk/Aux_B4-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B5-off.png b/web/hk/Aux_B5-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B5-on.png b/web/hk/Aux_B5-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B6-off.png b/web/hk/Aux_B6-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B6-on.png b/web/hk/Aux_B6-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B7-off.png b/web/hk/Aux_B7-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B7-on.png b/web/hk/Aux_B7-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Aux_B8-off.png b/web/hk/Aux_B8-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Aux_B8-on.png b/web/hk/Aux_B8-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Filter_Pump-off.png b/web/hk/Filter_Pump-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Filter_Pump-on.png b/web/hk/Filter_Pump-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Pool_Heater-off.png b/web/hk/Pool_Heater-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Pool_Heater-on.png b/web/hk/Pool_Heater-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/SWG_Boost-off.png b/web/hk/SWG_Boost-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/SWG_Boost-on.png b/web/hk/SWG_Boost-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Solar_Heater-off.png b/web/hk/Solar_Heater-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Solar_Heater-on.png b/web/hk/Solar_Heater-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Spa_Heater-off.png b/web/hk/Spa_Heater-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Spa_Heater-on.png b/web/hk/Spa_Heater-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png
diff --git a/web/hk/Spa_Mode-off.png b/web/hk/Spa_Mode-off.png
@@ -1 +1 @@
-switch-off.png
+./switch-off.png
diff --git a/web/hk/Spa_Mode-on.png b/web/hk/Spa_Mode-on.png
@@ -1 +1 @@
-switch-on.png
+./switch-on.png