Merge pull request #312 from ballle98/dev/iaqt_page_button_name

ballle98/AqualinkD#93: iaqt_page_button.name should be char[] not *char[]
pull/319/head
sfeakes 2024-06-11 09:05:09 -05:00 committed by GitHub
commit 7cd5846864
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions

View File

@ -5,7 +5,7 @@
#define IAQT_MSGLEN 21
struct iaqt_page_button {
char *name[IAQT_MSGLEN];
char name[IAQT_MSGLEN];
unsigned char type; // 0x01 box, 0x08 icon wirlpool, 0x0b icon heater, 0x01 icon (main page), 0x07 light
unsigned char state;
unsigned char keycode;
@ -1698,4 +1698,4 @@ Jandy To 0x60 of type Probe | HEX: 0x10|0x02|0x60|0x00|0x72|0x10|0x03|
Jandy To 0x31 of type Unknown | HEX: 0x10|0x02|0x31|0x30|0x73|0x10|0x03|
Jandy From 0x31 of type Ack | HEX: 0x10|0x02|0x00|0x01|0x00|0x00|0x13|0x10|0x03|
*/
*/

View File

@ -938,7 +938,8 @@ void *get_aqualink_iaqtouch_setpoints( void *ptr )
button = iaqtFindButtonByLabel("Degrees");
if (button != NULL) {
if (rsm_strmatch(*button->name, "Degrees F") == 0) {
LOG(IAQT_LOG,LOG_NOTICE, "Temperature units are '%s'\n",button->name);
if (button->name[8] == 'C') {
LOG(IAQT_LOG,LOG_NOTICE, "Temperature unit message is '%s' set to degC\n",button->name);
aq_data->temp_units = CELSIUS;
} else {
@ -1430,4 +1431,4 @@ void *set_aqualink_iaqtouch_time( void *ptr )
// Debug: iAQ Touch: To 0x33 of type iAq pMes | HEX: 0x10|0x02|0x33|0x25|0x02|0x41|0x4d|0x00|0xfa|0x10|0x03|
//LOG(IAQT_LOG,LOG_DEBUG "Setting time to %d/%d/%d %d:%d\n", result->tm_mon + 1, result->tm_mday, result->tm_year + 1900, result->tm_hour + 1, result->tm_min);
*/
*/