sfeakes
/
AqualinkD
mirror of https://github.com/sfeakes/AqualinkD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

2.6.5 update

pull/428/head v2.6.5
sfeakes 2025-05-10 11:02:24 -05:00
parent 95f9d7c20c
commit fa5ea8e85c
8 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -126,6 +126,9 @@ NEED TO FIX FOR THIS RELEASE.
* Try an auto-update * Try an auto-update
* Update Mongoose * Update Mongoose
--> -->
# Updates in 2.6.5
* Changes to virtual buttons.
# Updates in 2.6.4 # Updates in 2.6.4
* Fix docker crash where journal not configured correctly. * Fix docker crash where journal not configured correctly.
* Updates to config editor. * Updates to config editor.

BIN
release/aqualinkd-arm64
View File

Binary file not shown.

BIN
release/aqualinkd-armhf
View File

Binary file not shown.

4
source/aq_panel.c
View File

@ -599,7 +599,7 @@ void setPanelByName(struct aqualinkdata *aqdata, const char *str)
} }
aqkey *addVirtualButton(struct aqualinkdata *aqdata, char *label, int vindex) { aqkey *addVirtualButton(struct aqualinkdata *aqdata, char *label, int vindex) {
if (aqdata->total_buttons + 1 >= TOTAL_BUTTONS) { if (aqdata->total_buttons /*+ 1*/ >= TOTAL_BUTTONS) {
return NULL; return NULL;
} }
@ -616,7 +616,7 @@ aqkey *addVirtualButton(struct aqualinkdata *aqdata, char *label, int vindex) {
} else { } else {
index = aqdata->total_buttons - aqdata->virtual_button_start + 1; index = aqdata->total_buttons - aqdata->virtual_button_start + 1;
} }
printf("TOTAL=%d VSTART=%d INDEXNAME=%d\n",aqdata->total_buttons,aqdata->virtual_button_start,index); //printf("TOTAL=%d VSTART=%d INDEXNAME=%d\n",aqdata->total_buttons,aqdata->virtual_button_start,index);
} }

2
source/aq_panel.h
View File

@ -129,7 +129,7 @@ int PANEL_SIZE();
// If we need to increase virtual buttons, then increase below. // If we need to increase virtual buttons, then increase below.
#define VIRTUAL_BUTTONS 5 // This is the only parameter to change if we need more virtual buttons. #define VIRTUAL_BUTTONS 8 // This is the only parameter to change if we need more virtual buttons.
#define TOTAL_BUTTONS 20+VIRTUAL_BUTTONS // Biggest jandy panel is 20 buttons (RS16) #define TOTAL_BUTTONS 20+VIRTUAL_BUTTONS // Biggest jandy panel is 20 buttons (RS16)

4
source/config.c
View File

@ -1210,7 +1210,7 @@ if (strlen(cleanwhitespace(value)) <= 0) {
if (button != NULL) { if (button != NULL) {
setVirtualButtonLabel(button, label); setVirtualButtonLabel(button, label);
} else { } else {
LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1); LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons);
} }
} else if (strncasecmp(param + 17, "_altLabel", 9) == 0) { } else if (strncasecmp(param + 17, "_altLabel", 9) == 0) {
char *label = cleanalloc(value); char *label = cleanalloc(value);
@ -1218,7 +1218,7 @@ if (strlen(cleanwhitespace(value)) <= 0) {
if (button != NULL) { if (button != NULL) {
setVirtualButtonAltLabel(button, label); setVirtualButtonAltLabel(button, label);
} else { } else {
LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1); LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons);
} }
} else if (strncasecmp(param + 17, "_pump", 5) == 0) { } else if (strncasecmp(param + 17, "_pump", 5) == 0) {
aqkey *vbutton = getVirtualButton(aqdata, num); aqkey *vbutton = getVirtualButton(aqdata, num);

2
source/version.h
View File

@ -4,4 +4,4 @@
#define AQUALINKD_SHORT_NAME "AqualinkD" #define AQUALINKD_SHORT_NAME "AqualinkD"
// Use Magor . Minor . Patch // Use Magor . Minor . Patch
#define AQUALINKD_VERSION "2.6.4" #define AQUALINKD_VERSION "2.6.5"

4
web/aqmanager.html
View File

@ -118,7 +118,8 @@
input[type=submit], input[type=submit],
input[type=reset] { input[type=reset] {
/*background-color: rgb(165, 165, 165);*/ /*background-color: rgb(165, 165, 165);*/
background-color: #4CAAD9; /*background-color: #4CAAD9;*/
background-color: #9b9b9b;
border: none; border: none;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
padding: 2px 2px; padding: 2px 2px;
@ -226,6 +227,7 @@
.toggle-checkbox:checked+.toggle-switch { .toggle-checkbox:checked+.toggle-switch {
/*background: #56c080;*/ /*background: #56c080;*/
background: #4CAAD9; background: #4CAAD9;
/*background: #8e8e8e;*/
} }
.toggle-checkbox:checked+.toggle-switch:before { .toggle-checkbox:checked+.toggle-switch:before {