diff --git a/README.md b/README.md index b4a7b32..d84dca5 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,14 @@ linux daemon to control Aqualink RS pool controllers. Provides web UI, MQTT clie ### It does not, and will never provide any layer of security. NEVER directly expose the device running this software to the outside world, only indirectly through the use of Home Automation hub's or other securty measures, e.g. VPNs. + +## Donation +If you like this project, you can buy me a cup of coffee :) +
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](SEGN9UNS38TXJ) + ## Builtin WEB Interface(s). -### Curren web UI, (soon to be deprecated) - + ### New WEB interface * The layout & functionality are a from Appple HomeKit interface, only this works in any browser or mobile device. @@ -14,9 +19,10 @@ linux daemon to control Aqualink RS pool controllers. Provides web UI, MQTT clie * Support live background imags (ie poll camera for still image every X seconds) * Like the old UI, if you load the web page in a mobile device browser, then save to desktop an app will be created for you. ### Other web Interface options -Simple :- (Just another option if you don't default)
+Simple :- (Another option if you don't default)
- +### Curren web UI, (soon to be deprecated) + Simulator :- (Designed to mimic AqualinkRS6 All Button keypad)
@@ -26,11 +32,13 @@ Simulator :- (Designed to mimic AqualinkRS6 All Button keypad)
* Full support for homekit scenes, so can make a "Spa scene" to turn spa on, set spa heater particular temperature, turn spa blower on, etc etc) ## All Web interfaces. -* http://aqualink.ip/ <- (Default, soon to be deprecated, too much hard coding) -* http://aqualink.ip/hk <- (New, soon to be defaut) +* http://aqualink.ip/ <- (New UI) +* http://aqualink.ip/old <- (If you prefer the old UI, this is not maintained) * http://aqualink.ip/simple.html <- (Anothr opion if you don't like the above) * http://aqualink.ip/simulator.html <- (RS8 All Button Control Panel simulator) ## Updates is Release 1.0e +* Web UI out of Beta +* MQTT fix setpoints * Simulator is now more stable. * updates to serial logger * UI updates @@ -84,14 +92,15 @@ Manual install for init-d systems -## New WEB interface (in beta) -* Doesn't work in MS Edge or MS Exploder browsers. (Firefox, Chrome, Safari & mobile versions of each) all seem to be fine. -* use http://aqualink.ip.address/hk/ to access new UI +## New WEB interface(s) +* Doesn't work in MS Edge or MS Exploder browsers. (Firefox, Chrome, Safari & mobile versions of each) all seem to be fine, use the old or simple.html interface if using those browsers. +* use http://aqualink.ip.address/ to access new UI * look in `/web/hk` hopefully customizing icon and background images are self explanatory. * icons should be around 50x50 pixles and in PNG format, background any size in JPG or just delete the file if you want solid color. -* edit `/web/hk/index.html` there are two arrays that can be modified - * `ignore_devices` just lis any device you don;t want to see in there. +* edit `/web/config.js` there are two arrays that can be modified + * `devices` List any device you want to see in there (commanent out the ones you don't), the odrer of that list will be the display order of devices. * `light_program` If you have a programable light (and it's configured in `aqualinkd.conf`), then list the light modes here. + * Plenty of colors to change if you like. @@ -285,3 +294,12 @@ In meteohub create a new weatherstation plug-in, plug-in path is the path to the ## Non Commercial Project All non commercial projects can be run using our open source code under GPLv2 licensing. As long as your project remains in this category there is no charge. See License.md for more details. + + + + +# Donation +If you like this project, you can buy me a cup of coffee :) +
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](SEGN9UNS38TXJ) + diff --git a/aqualinkd.c b/aqualinkd.c index 3990108..5f23de5 100644 --- a/aqualinkd.c +++ b/aqualinkd.c @@ -833,43 +833,7 @@ void main_loop() { delayAckCnt++; } } - /* - // Wrap the mess just for sanity, the pre-process will clean it up. - if (! _aqualink_data.simulate_panel ) { - send_ack(rs_fd, pop_aq_cmd(&_aqualink_data)); - } else { // We are in simlator mode, ack get's complicated now. - // NSF Need to come back and clean this mess up at some point. - // Logic. if we are in programming mode or have a command to send, send a normal ack. - // If we last message is waiting for an input "SELECT xxxxx", then sent a pause ack - // pause ack strarts with around 12 ACK_SCREEN_BUSY_DISPLAY acks, then 50 ACK_SCREEN_BUSY acks - // if we send a command (ie keypress), the whole count needs to end and go back to sending normal ack. - // In code below, it jumps to sending ACK_SCREEN_BUSY, which still seems to work ok. - if ( _aqualink_data.active_thread.thread_id != 0 || - strncasecmp(_aqualink_data.last_display_message, "SELECT", 6) != 0 || - get_aq_cmd_length() > 0 || - delayAckCnt > 62) - { - send_ack(rs_fd, pop_aq_cmd(&_aqualink_data)); - if (delayAckCnt > 0) - delayAckCnt = 12; - else - delayAckCnt = 0; - } else { - logMessage(LOG_NOTICE, "Sending display busy due to Simulator mode \n"); - - if (delayAckCnt < 12) - send_extended_ack(rs_fd, ACK_SCREEN_BUSY_DISPLAY, pop_aq_cmd(&_aqualink_data)); - else if (delayAckCnt < 62) - send_extended_ack(rs_fd, ACK_SCREEN_BUSY, pop_aq_cmd(&_aqualink_data)); - else { - send_ack(rs_fd, pop_aq_cmd(&_aqualink_data)); - delayAckCnt = 62; - } - delayAckCnt++; - } - } - */ // Process the packet. This includes deriving general status, and identifying // warnings and errors. If something changed, notify any listeners if (process_packet(packet_buffer, packet_length) != false) { diff --git a/release/aqualinkd b/release/aqualinkd index 5a4c656..48d7c48 100755 Binary files a/release/aqualinkd and b/release/aqualinkd differ diff --git a/web/aqualinkd-new.png b/web/aqualinkd-new.png new file mode 100644 index 0000000..9ffcfd0 Binary files /dev/null and b/web/aqualinkd-new.png differ diff --git a/web/config.js b/web/config.js index d64e9da..35e9ade 100644 --- a/web/config.js +++ b/web/config.js @@ -52,7 +52,7 @@ */ // Background image, delete or leave blank for solid color //var background_url = "http://192.168.144.224/snap.jpeg"; - var background_url='background.jpg'; + var background_url='hk/background.jpg'; //var background_url=''; // Reload background image every X seconds.(useful if camera snapshot) // 0 means only load once when page loads. diff --git a/web/controller.html b/web/controller.html index 9bfbf29..9b4aaf9 100644 --- a/web/controller.html +++ b/web/controller.html @@ -1,196 +1,1212 @@ - + + - - Feakes Inc, Aqualink RS control daemon - - - - - - - - - - - + + AqualinkD + + + + + + + + + + - + -
- -
-
-
Aqualink RS8
-
Air Temp:
-
000 F
-
-
-
-
-
-
-
-
-
-
-
00:00 PM 00/00/00 DDD
-
+ +
+ +
+ - -
-
-
Pool:
-
000 F
-
-
-
-
-
-
Filter Pump
-
-
-
-
-
-
Heater
-
-
-
000 F
-
-
+
-
-
-
-
Set
-
-
-
Spa:
-
000 F
-
-
-
-
-
-
Spa Mode
-
- -
-
-
-
-
Aux 3
-
-
-
-
-
-
Heater
-
-
-
000 F
-
-
+
-
-
-
-
Set
-
- -
- -
- + + + + + + + + + + +
+ +
+ + + + + + + + +
+
+
+
+ + + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + +
+
+ + +
+ - - - -
-
Freeze Protection:
-
000 F
-
-
+
-
-
-
-
Set
-
-
-
Accessories:
-
-
-
-
-
-
Aux 1
-
-
-
-
-
-
Aux 2
-
-
-
-
-
-
Aux 4
-
-
-
-
-
-
Aux 5
-
- -
-
+ +
+ +
+
- - - -
- - - +
+ + diff --git a/web/hk/index.html b/web/hk/index.html index d702f2a..561d59c 100644 --- a/web/hk/index.html +++ b/web/hk/index.html @@ -684,7 +684,7 @@ if (status == 'flash') { tile.classList.add("flash"); tile.classList.remove("on"); - text = "On delay"; + text = "Delay"; } else { tile.classList.add("on"); tile.classList.remove("flash"); diff --git a/web/old/controller.html b/web/old/controller.html new file mode 100644 index 0000000..9bfbf29 --- /dev/null +++ b/web/old/controller.html @@ -0,0 +1,196 @@ + + + + + Feakes Inc, Aqualink RS control daemon + + + + + + + + + + + + + + + +
+ +
+
+
Aqualink RS8
+
Air Temp:
+
000 F
+
+
+
+
+
+
+
+
+
+
+
00:00 PM 00/00/00 DDD
+
+
+ +
+
+
Pool:
+
000 F
+
+
+
+
+
+
Filter Pump
+
+
+
+
+
+
Heater
+
+
+
000 F
+
+
+
+
-
+
+
Set
+
+
+
Spa:
+
000 F
+
+
+
+
+
+
Spa Mode
+
+ +
+
+
+
+
Aux 3
+
+
+
+
+
+
Heater
+
+
+
000 F
+
+
+
+
-
+
+
Set
+
+ +
+ +
+ +
+
+ +
+
Freeze Protection:
+
000 F
+
+
+
+
-
+
+
Set
+
+
+
Accessories:
+
+
+
+
+
+
Aux 1
+
+
+
+
+
+
Aux 2
+
+
+
+
+
+
Aux 4
+
+
+
+
+
+
Aux 5
+
+ +
+
+
+ + + +
+ + + + + diff --git a/web/css/small_ff.css b/web/old/css/small_ff.css similarity index 100% rename from web/css/small_ff.css rename to web/old/css/small_ff.css diff --git a/web/images/battery_blank.png b/web/old/images/battery_blank.png similarity index 100% rename from web/images/battery_blank.png rename to web/old/images/battery_blank.png diff --git a/web/images/battery_low.png b/web/old/images/battery_low.png similarity index 100% rename from web/images/battery_low.png rename to web/old/images/battery_low.png diff --git a/web/images/battery_ok.png b/web/old/images/battery_ok.png similarity index 100% rename from web/images/battery_ok.png rename to web/old/images/battery_ok.png diff --git a/web/images/led_enabled.png b/web/old/images/led_enabled.png similarity index 100% rename from web/images/led_enabled.png rename to web/old/images/led_enabled.png diff --git a/web/images/led_off.png b/web/old/images/led_off.png similarity index 100% rename from web/images/led_off.png rename to web/old/images/led_off.png diff --git a/web/images/led_on.png b/web/old/images/led_on.png similarity index 100% rename from web/images/led_on.png rename to web/old/images/led_on.png diff --git a/web/images/net_green.png b/web/old/images/net_green.png similarity index 100% rename from web/images/net_green.png rename to web/old/images/net_green.png diff --git a/web/images/net_off.png b/web/old/images/net_off.png similarity index 100% rename from web/images/net_off.png rename to web/old/images/net_off.png diff --git a/web/images/net_red.png b/web/old/images/net_red.png similarity index 100% rename from web/images/net_red.png rename to web/old/images/net_red.png diff --git a/web/images/net_yellow.png b/web/old/images/net_yellow.png similarity index 100% rename from web/images/net_yellow.png rename to web/old/images/net_yellow.png diff --git a/web/old/index.html b/web/old/index.html new file mode 120000 index 0000000..3204260 --- /dev/null +++ b/web/old/index.html @@ -0,0 +1 @@ +controller.html \ No newline at end of file diff --git a/web/js/aqualink.js b/web/old/js/aqualink.js similarity index 100% rename from web/js/aqualink.js rename to web/old/js/aqualink.js