diff --git a/README.md b/README.md index de39019..dc78ac3 100644 --- a/README.md +++ b/README.md @@ -125,16 +125,17 @@ NEED TO FIX FOR THIS RELEASE. * show error is vbutton and no extended_device_id # Updates in 2.3.9 --> -# Updates in 2.3.9 (dev 0.1) -> Under development -* Added support for One Touch Buttons & Custom Virtual Buttons (new in Jandy Rev Yg). + +# Updates in Release 2.4.0 * WARNING Breaking change if you use dimmer (please change button_??_lightMode from 6 to 10) * Fixed bugs with particular Jandy panel versions and color lights. * Added support for more color lights, and sped up programming @@ -147,6 +148,12 @@ NEED TO FIX FOR THIS RELEASE. * Changes to aqmanager for adding more options for decoding protocols. * Support for packets changes from panels REV Yg * Support VSP by label (not pump number), REV Yg +* Added support for One Touch Buttons & Virtual Buttons. + * look at `virtual_button??_label` in aqualinkd.conf + * have to use AqualinkTouch protocol for `extended_device_id` 0x31->0x33 in aqualinkd.conf + +# Updates in Release 2.3.8 +* Release removed. Bug with light program 0. # Updates in Release 2.3.7 * Fix for Pentair VSP losing connection & bouncing SWG to 0 and back. diff --git a/release/aqualinkd-arm64 b/release/aqualinkd-arm64 index 78ee9ed..4a1e9af 100755 Binary files a/release/aqualinkd-arm64 and b/release/aqualinkd-arm64 differ diff --git a/release/aqualinkd-armhf b/release/aqualinkd-armhf index 0311c36..2985ee5 100755 Binary files a/release/aqualinkd-armhf and b/release/aqualinkd-armhf differ diff --git a/release/install.sh b/release/install.sh index 7e67881..1856d66 100755 --- a/release/install.sh +++ b/release/install.sh @@ -133,8 +133,8 @@ fi # we added Aux_V? to the button list if [ -f "$WEBLocation/config.js" ]; then # Test is if has AUX_V1 in file - if ! grep -q Aux_V1 ./config.js; then - $dateext=`date +%Y%m%d_%H_%M_%S` + if ! grep -q Aux_V1 $WEBLocation/config.js; then + dateext=`date +%Y%m%d_%H_%M_%S` echo "AqualinkD web config is old, making copy to $WEBLocation/config.js.$dateext" echo "Please make changes to new version $WEBLocation/config.js" mv $WEBLocation/config.js $WEBLocation/config.js.$dateext diff --git a/source/version.h b/source/version.h index 7affed8..e17cf67 100644 --- a/source/version.h +++ b/source/version.h @@ -2,4 +2,4 @@ #define AQUALINKD_NAME "Aqualink Daemon" #define AQUALINKD_SHORT_NAME "AqualinkD" -#define AQUALINKD_VERSION "2.3.9 (dev 0.1)" +#define AQUALINKD_VERSION "2.4.0" diff --git a/web/controller.html b/web/controller.html index 26cdff8..b032f35 100644 --- a/web/controller.html +++ b/web/controller.html @@ -2169,7 +2169,19 @@ for (var obj in data.light_program) { if (data.light_program[obj] != "") { - setTileOnText(obj.toString(),data.light_program[obj]); + var light_mode = data.light_program[obj]; + + // If aqualinkd probrammed light, need to get convert int to text index, if not value is text + try { + var light_type = document.getElementById(obj.toString()).getAttribute('lighttype') + if (light_type == 0) { + var light_mode = _light_program[light_type][parseInt(data.light_program[obj])-1]; + if (light_mode.endsWith(" - Show")) + light_mode = light_mode.slice(0, -7); + } + } catch (e) {} + + setTileOnText(obj.toString(),light_mode); } }