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

V2.0.1

pull/116/head
shaun feakes 2020-06-07 09:13:12 -05:00
parent 50c48ef6b1
commit 85274f0098
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -47,6 +47,11 @@ https://github.com/sfeakes/AqualinkD/wiki/Jandy-Aqualink-RS485-protocol
<li>Supports live background images (ie: poll camera for still image every X seconds).</li> <li>Supports live background images (ie: poll camera for still image every X seconds).</li>
</ul> </ul>
</td></tr> </td></tr>
<tr><td colspan="2">
In web browser/tablet
<ul>
<img src="extras/web_ui2.png?raw=true" width="700">
</td></tr>
</table> </table>
### Simulator ### Simulator
@ -67,7 +72,7 @@ Designed to mimic AqualinkRS6 All Button keypad and (like the keypad) is used to
* http://aqualink.ip/simulator.html <- (RS8 All Button Control Panel simulator) * http://aqualink.ip/simulator.html <- (RS8 All Button Control Panel simulator)
* http://aqualink.ip/debug.html <- (Turn on/off debug/serial debug & download logs) * http://aqualink.ip/debug.html <- (Turn on/off debug/serial debug & download logs)
#<a name="release"></a> #<a name="release"></a>
# Update in Release 2.0.0b # Update in Release 2.0.1
* Big update, lots of core changes, <b>please read wiki section https://github.com/sfeakes/AqualinkD/wiki#Version_2</b> * Big update, lots of core changes, <b>please read wiki section https://github.com/sfeakes/AqualinkD/wiki#Version_2</b>
* Full Variable Speed Pump support. (Can read,set & change RPM,GPM) * Full Variable Speed Pump support. (Can read,set & change RPM,GPM)
* Full support for all Colored Lights (even if Jandy Control Panel doesn't support them) * Full support for all Colored Lights (even if Jandy Control Panel doesn't support them)

4
aqualinkd.c
View File

@ -1165,7 +1165,7 @@ void main_loop()
blank_read = 0; blank_read = 0;
changed = false; changed = false;
if (packet_length > 0 && packet_buffer[PKT_DEST] == _aqconfig_.device_id) if (packet_length > 0 && packet_buffer[PKT_DEST] == _aqconfig_.device_id && getProtocolType(packet_buffer) == JANDY)
{ {
if (getLogLevel() >= LOG_DEBUG) if (getLogLevel() >= LOG_DEBUG)
logMessage(LOG_DEBUG, "RS received packet of type %s length %d\n", get_packet_type(packet_buffer, packet_length), packet_length); logMessage(LOG_DEBUG, "RS received packet of type %s length %d\n", get_packet_type(packet_buffer, packet_length), packet_length);
@ -1179,7 +1179,7 @@ void main_loop()
caculate_ack_packet(rs_fd, packet_buffer); caculate_ack_packet(rs_fd, packet_buffer);
} }
else if (packet_length > 0 && onetouch_enabled() && packet_buffer[PKT_DEST] == _aqconfig_.onetouch_device_id) { else if (packet_length > 0 && onetouch_enabled() && packet_buffer[PKT_DEST] == _aqconfig_.onetouch_device_id && getProtocolType(packet_buffer) == JANDY) {
//if (getLogLevel() >= LOG_DEBUG) //if (getLogLevel() >= LOG_DEBUG)
// logMessage(LOG_DEBUG, "RS received ONETOUCH packet of type %s length %d\n", get_packet_type(packet_buffer, packet_length), packet_length); // logMessage(LOG_DEBUG, "RS received ONETOUCH packet of type %s length %d\n", get_packet_type(packet_buffer, packet_length), packet_length);
changed = process_onetouch_packet(packet_buffer, packet_length, &_aqualink_data); changed = process_onetouch_packet(packet_buffer, packet_length, &_aqualink_data);

BIN
extras/web_ui2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
release/aqualinkd
View File

Binary file not shown.

2
version.h
View File

@ -1,4 +1,4 @@
#define AQUALINKD_NAME "Aqualink Daemon" #define AQUALINKD_NAME "Aqualink Daemon"
#define AQUALINKD_VERSION "2.0.0b" #define AQUALINKD_VERSION "2.0.1"