Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ballle98/AqualinkD#93: iaqt_page_button.name should be char[] not *char[] #312

Merged
merged 2 commits into from
Jun 11, 2024
+5 −4
Merged

ballle98/AqualinkD#93: iaqt_page_button.name should be char[] not *char[] #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2af8f55
ballle98/AqualinkD#93: iaqt_page_button.name should be char[] not *ch…
ballle98 Jun 10, 2024
2f7c001
Merge branch 'master' into dev/iaqt_page_button_name
sfeakes Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iaqtouch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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|

*/
*/
5 changes: 3 additions & 2 deletions iaqtouch_aq_programmer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
*/
*/