v2.6.1

Author: sfeakes

README.md

@@ -81,9 +81,8 @@ Designed to mimic AqualinkRS devices, used to fully configure the master control
 * http://aqualink.ip/aquapda_sim.html  <- (PDA simulator)
 #<a name="release"></a>
 # ToDo (future release)
-* Update AqualinkD Management console to manage configuration
 * Create iAqualink Touch Simulator
-* Probably decoded enough protocols for AuqlinkD to self configure.
+* AuqlinkD to self configure. (Done for ID's, need to do for Panel type/size)
 
 
 <!--
@@ -106,37 +105,23 @@ Designed to mimic AqualinkRS devices, used to fully configure the master control
 
 <!-- 
 NEED TO FIX FOR THIS RELEASE.
-***** FIX NET_SERVICES.C   action_uri()   spa and spa_mode get confused. check EVERY strncmp
-* DONE MQTT filter_pump/percent/set, maybe add max/min to pump config. / print protocol on startup
-* DONE Pump by name and not ID. clean up code
-* DONE look at using 0x00 for no exit on serial errors / startup
-* DONE look at virtual button support
-*   vbuton will need the PDA on iAQT protocol working.
-* DONE change dimmer to % from steps. (will make HASIO & Homekit easier)
-* add config for homekit_f (panel in F homekin in C), F to F or C to C is fine.
-* deprecate (hide and default to yes) extended_device_id_programming
-* Move following to main and not config.c - show error is vbutton and no extended_device_id, vbutton w/ pump can be onetouch.
 * check panel version reported against config.
-# Updates in 2.4.1
-
-# DONE install.sh change spa_mode to spa in config.js
-# DONE change hassio.c to use rpm speed/percent
-# pickup speed faster on iaqualinktouch after change
-
+* pickup speed faster on iaqualinktouch after change
 * with iaqualink2 no need to poll iaqtouch devices as frequently
 * update documentation on how vbutton / vpump / pump_max & min / enable_iauqalink2
 * check rs serial adapter is active if light color mode 11 is used.
 
-
 * Check SWG messages like "#1 TruClear", see log in this post https://github.com/sfeakes/AqualinkD/discussions/388
 
-* Finish off heat pump / chiller.  Probably use a thermostat for both with heat going to heater SP can cool to chiller SP
-
-* Hide passwords (bitmask)
-* Startup config validity checks
-* remove "extended_programming", or hide it.
+* Heat Pump / Chiller for OneTouch
 -->
 
+# Updates in 2.6.1
+* Added External Sensors to Web UI & HomeKit.
+* Added Heat Pump / Chiller Thermostat to Web UI & HomeKit.
+* Fixed some bugs in Configuration Editor.
+* Link device/virtual/onetouch button with SWG BOOST. (Allows you to set VSP RPM when in Boost mode)
+
 # Updates in 2.6.0
 * Added configuration editor in aqmanager.  [Wiki - AQManager](https://github.com/sfeakes/AqualinkD/wiki#AQManager)
 * Can now self-configure on startup. set `device_id=0xFF`
@@ -458,7 +443,10 @@ https://github.com/sfeakes/AqualinkD/wiki
 #
 
 # Aqualink Versions tested
-This was designed for Jandy Aqualink RS, so should work with AqualinkRS and iAqualink Combo control panels. It will work with Aqualink PDA/AquaPalm and NON Combo iAqualink; but with limitations.
+This was designed for Jandy Aqualink RS, so does work with AqualinkRS and iAqualink Combo control panels. It will work with Aqualink PDA/AquaPalm; but with limitations.
+
+AqualinkD is known to work with Panel Versions from Rev H to the Latest Rev Yg
+<!--
 Below are verified versions, but should work with any AqualinkRS :-
 
 
@@ -476,7 +464,7 @@ Below are verified versions, but should work with any AqualinkRS :-
 
 If you have tested a version not listed here, please let me know by opening an issue.
 #
-
+-->
 # License
 ## Non Commercial Project
 All non commercial projects can be run using our open source code under GPLv2 licensing. As long as your project remains in this category there is no charge.

docker/buildx.sh

@@ -59,6 +59,7 @@ fi
 
 # Login first Run as root not with sudo on my build machine.
 # cat ~/.docker.token | docker login --username sfeakes --password-stdin
+# any errors clean build env `docker buildx prune``
 
 echo "Building Docker container for $IMAGE using branch $VERSION"
 docker buildx build --platform=linux/amd64,linux/arm64 \

release/aqualinkd-arm64

@@ -119,6 +119,10 @@ enable_scheduler = yes
 #event_check_pumpon_hour = 6
 #event_check_pumpoff_hour = 24
 
+# This last one will link a button to SWG boost mode. When in boost mode, you usually have a problem that warrants running the pump faster.
+# So you can assign a virtual/one touch button to a particular pump RMP, and then turn it on with this option. (it will also turn it off when boost is finished)
+#event_booston_check_device = Fast Pump
+
 # Set the RS485 adapter into low latency mode (of supported)
 ftdi_low_latency=YES
 

release/aqualinkd-armhf

@@ -515,9 +515,11 @@ void _processMessage(char *message, struct aqualinkdata *aq_data, bool reset)
     // A master firmware revision message.
     strcpy(aq_data->version, msg);
     rsm_get_revision(aq_data->revision, aq_data->version, strlen(aq_data->version));
+    setPanelInformationFromPanelMsg(aq_data, msg, PANEL_CPU | PANEL_REV, ALLBUTTON);
+    //setBoardCPURevision(aq_data, aq_data->version, strlen(aq_data->version), ALLB_LOG);
     //_gotREV = true;
-    LOG(ALLB_LOG,LOG_NOTICE, "Control Panel version %s\n", aq_data->version);
-    LOG(ALLB_LOG,LOG_NOTICE, "Control Panel revision %s\n", aq_data->revision);
+    LOG(ALLB_LOG,LOG_DEBUG, "Control Panel version %s\n", aq_data->version);
+    LOG(ALLB_LOG,LOG_DEBUG, "Control Panel revision %s\n", aq_data->revision);
     if (_initWithRS == false)
     {
       //LOG(ALLBUTTON,LOG_NOTICE, "Standard protocol initialization complete\n");
@@ -580,6 +582,11 @@ void _processMessage(char *message, struct aqualinkdata *aq_data, bool reset)
   else if ( (strncasecmp(msg, "BOOST POOL", 10) == 0) && (strcasestr(msg, "REMAINING") != NULL) ) {
     // Ignore messages if in programming mode.  We get one of these turning off for some strange reason.
     if (in_programming_mode(aq_data) == false) {
+
+      if (aq_data->boost == false || boostInLastLoop == false) {
+        event_happened_set_device_state(AQS_BOOST_ON, aq_data);
+      }
+
       snprintf(aq_data->boost_msg, 6, "%s", &msg[11]);
       aq_data->boost_duration = rsm_HHMM2min(aq_data->boost_msg);
       aq_data->boost = true;