pull/360/head^2
sfeakes 2024-09-01 18:47:21 -05:00
parent dba4f553b7
commit d945d438d7
6 changed files with 14 additions and 9 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -373,7 +373,7 @@ bool goto_iaqt_page(const unsigned char pageID, struct aqualinkdata *aq_data) {
if (pageID == IAQ_PAGE_DEVICES) {
send_aqt_cmd(KEY_IAQTCH_HOMEP_KEY08);
unsigned char page = waitfor_iaqt_nextPage(aq_data);
if (page != IAQ_PAGE_DEVICES && page == IAQ_PAGE_DEVICES_REV_Yg) {
if (page != IAQ_PAGE_DEVICES && page != IAQ_PAGE_DEVICES_REV_Yg) {
LOG(IAQT_LOG, LOG_ERR, "IAQ Touch did not find Device page\n");
return false;
}

View File

@ -232,8 +232,15 @@ bool process_rssadapter_packet(unsigned char *packet, int length, struct aqualin
//LOG(RSSA_LOG,LOG_DEBUG, " Received message\n");
//debuglogPacket(RSSA_LOG, packet, length, true);
if ( (cnt % 20 == 0) || cnt == 10 ) {
//if (!(cnt % 20) || cnt == 10 ) {
DEBUG_GET_STATE(aq_data, 5); // 4 = AUX 3
}
if (cnt == 0 || cnt >= 250) {
LOG(RSSA_LOG,LOG_INFO, "Queue device update requests\n");
if (cnt == 0) {
// The below inturn calls get_aqualink_rssadapter_setpoints()
// But do it here as it's the first init, cnt=0 will only happen once
@ -306,13 +313,11 @@ bool process_rssadapter_packet(unsigned char *packet, int length, struct aqualin
rtn = true;
} else if (packet[4] == 0x03) {
// These are device status messages
/*
for(int i=0; i < aq_data->total_buttons; i++) {
if ( devID(i) == ) {
}
//aq_data->aqbuttons[i].led->state;
}*/
LOG(RSSA_LOG,LOG_DEBUG,"AUX?? 0x%02hhx state is 0x%02hhx '%s' %s\n",
packet[7],
packet[6],
aq_data->aqbuttons[(packet[7] - (unsigned char)0x13)].label,
packet[6]==0x00?"off":"on");
#ifdef AQ_RS16
if (packet[7] == RS_SA_AUX12) {
LOG(RSSA_LOG,LOG_INFO,"AUX12 %d\n", packet[6]);

View File

@ -2,4 +2,4 @@
#define AQUALINKD_NAME "Aqualink Daemon"
#define AQUALINKD_SHORT_NAME "AqualinkD"
#define AQUALINKD_VERSION "2.3.8 (dev 0.4)"
#define AQUALINKD_VERSION "2.3.8 (dev 0.5)"