pull/101/merge
sfeakes 2019-10-23 13:58:17 -05:00
parent c1fa2b3340
commit 098b97247c
4 changed files with 7 additions and 4 deletions

View File

@ -66,7 +66,7 @@ Designed to mimic AqualinkRS6 All Button keypad and (like the keypad) is used to
* http://aqualink.ip/simple.html <- (Simple opion if you don't like the above)
* http://aqualink.ip/simulator.html <- (RS8 All Button Control Panel simulator)
#<a name="release"></a>
# Update in Release 1.3.9a
# Update in Release 1.3.9b
* Small fixes for Jandy protocol.
* Fixed some debug messages.
# Update in Release 1.3.9

View File

@ -107,9 +107,12 @@ unsigned char pop_aq_cmd(struct aqualinkdata *aq_data)
// Only send commands on status messages
// Are we in programming mode
if (aq_data->active_thread.thread_id != 0) {
if ( (_pgm_command == KEY_MENU && aq_data->last_packet_type == CMD_STATUS) ||
/*if ( (_pgm_command == KEY_MENU && aq_data->last_packet_type == CMD_STATUS) ||
// Need to not the key_menu below
( _pgm_command != NUL && (aq_data->last_packet_type == CMD_STATUS || aq_data->last_packet_type == CMD_MSG_LONG) )) {
( _pgm_command != NUL && (aq_data->last_packet_type == CMD_STATUS || aq_data->last_packet_type == CMD_MSG_LONG) )) {*/
if ( (_pgm_command != NUL && (aq_data->last_packet_type == CMD_STATUS)) ||
// Boost pool has to send commands to msg long
(aq_data->active_thread.ptype == AQ_SET_BOOST && (aq_data->last_packet_type == CMD_STATUS || aq_data->last_packet_type == CMD_MSG_LONG)) ) {
cmd = _pgm_command;
_pgm_command = NUL;
logMessage(LOG_DEBUG, "RS SEND cmd '0x%02hhx' (programming)\n", cmd);

Binary file not shown.

View File

@ -1,4 +1,4 @@
#define AQUALINKD_NAME "Aqualink Daemon"
#define AQUALINKD_VERSION "1.3.9a"
#define AQUALINKD_VERSION "1.3.9b"