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

update

pull/42/head
sfeakes 2018-08-16 14:54:58 -05:00
parent afa70c2510
commit f9f00efd14
6 changed files with 1482 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aq_serial.c
View File

@ -412,9 +412,10 @@ int get_packet(int fd, unsigned char* packet)
return 0;
} else if (bytesRead < 0 && errno == EAGAIN) {
// If we are in the middle of reading a packet, keep going
if (retry > 10)
if (retry > 20) {
logMessage(LOG_WARNING, "Serial read timeout\n");
return 0;
}
retry++;
delay(10);
} else if (bytesRead == 1) {

BIN
release/aqualinkd
View File

Binary file not shown.

BIN
release/serial_logger
View File

Binary file not shown.

16
serial_logger.c
View File

@ -11,7 +11,7 @@
#include "utils.h"
#define SLOG_MAX 80
#define PACKET_MAX 200
#define PACKET_MAX 600
/*
typedef enum used {
@ -36,6 +36,14 @@ void intHandler(int dummy) {
logMessage(LOG_NOTICE, "Stopping!");
}
void advance_cursor() {
static int pos=0;
char cursor[4]={'/','-','\\','|'};
printf("%c\b", cursor[pos]);
fflush(stdout);
pos = (pos+1) % 4;
}
bool canUse(unsigned char ID) {
int i;
for (i = 0; i < strlen((char *)_goodID); i++) {
@ -135,7 +143,9 @@ int main(int argc, char *argv[]) {
signal(SIGINT, intHandler);
signal(SIGTERM, intHandler);
logMessage(LOG_NOTICE, "Logging serial information, please wait!\n");
logMessage(LOG_NOTICE, "Logging serial information!\n");
if (logLevel < LOG_DEBUG)
printf("Please wait.");
while (_keepRunning == true) {
if (rs_fd < 0) {
@ -189,6 +199,8 @@ int main(int argc, char *argv[]) {
if (logPackets != 0 && received_packets >= logPackets) {
_keepRunning = false;
}
if (logLevel < LOG_DEBUG)
advance_cursor();
}
logMessage(LOG_DEBUG, "\n");

276
web/controller.html
View File

@ -13,6 +13,7 @@
<script src='config.js'></script>
<style>
:root {
--fonts: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
--tile-width: 100px;
--tile_icon-height: 35px;
--tile_name-height: 32px;
@ -28,28 +29,29 @@
--tile_grid-gap: 20px;
--tile_name-lineheight: 1.4;
*/
/* These get overiden from config.js, don't edit */
--body_background: rgb(235, 235, 235);
--body_text: black;
--options_pane_background: rgb(245, 245, 245);
--options_pane_bordercolor: rgb(124, 124, 124);
--options_slider_ball: 30;
--options_slider_highlight: #2196F3;
--options_slider_lowlight: #d3d3d3;
--options_slider_height: 20px;
--head_background: rgb(43, 106, 143);
--head_text: #fff;
--error_background: rgb(143, 43, 43);
--tile_background: rgb(220, 220, 220);
--tile_text: rgb(110, 110, 110);
--tile_on_background: #fff;
--tile_on_text: #000;
--tile_status_text: rgb(87, 87, 87);
--options_radio_ball: 20px;
--options_radio_highlight: #2196F3;
--options_radio_lowlight: #d3d3d3;
}
div {
-webkit-touch-callout: none;
-webkit-user-select: none;
@ -58,15 +60,20 @@
-ms-user-select: none;
user-select: none;
}
div::-moz-selection {
background: transparent;
}
div::selection {
background: transparent;
}
html {} body {
html {}
body {
background-color: var(--body_background);
font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
font-family: var(--fonts);
font-weight: 600;
font-size: 14px;
color: var(--body_text);
@ -78,6 +85,7 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.body_wrap {
position: absolute;
width: 100%;
@ -89,18 +97,21 @@
background-size: cover;
height: 100%;
}
.opaque {
top: 0px;
left: 0px;
filter: alpha(opacity=60);
opacity: 0.6;
}
.vopaque {
top: 0px;
left: 0px;
filter: alpha(opacity=40);
opacity: 0.4;
}
.options_pane {
background-color: var(--options_pane_background);
border: 2px solid var(--options_pane_bordercolor);
@ -110,10 +121,10 @@
width: 345px;
/*height:245px;*/
}
.options {
top: 10px;
/*left: 10px;*/
position: fixed;
display: flex;
justify-content: center;
@ -123,6 +134,7 @@
height: 100%;
*/
}
/*
.show {
top: 0px;
@ -134,37 +146,38 @@
display: grid;
/*grid-template-columns: repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));
grid-auto-rows: 1fr, repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));*/
grid-template-columns: repeat(auto-fit, minmax(var(--tile-width), auto));
grid-auto-rows: 1fr, repeat(auto-fit, minmax(var(--tile-width), auto));
grid-gap: var(--tile_grid-gap);
padding: 0 !important;
margin: 10px !important;
}
.head {
/*background-color: rgb(124, 124, 124);*/
background-color: var(--head_background);
color: var(--head_text);
border-radius: 5px;
padding: 5px;
grid-column: 1 / -1;
}
.error {
background-color: var(--error_background) !important;
}
.hide {
display: none;
filter: alpha(opacity=0);
opacity: 0.0;
}
.tile {
background-color: var(--tile_background);
color: var(--tile_text);
border-radius: 10px;
padding: 0px;
/*font-size: 100%;*/
box-sizing: border-box;
padding: 5px;
height: var(--tile-width);
@ -172,35 +185,61 @@
filter: alpha(opacity=90);
opacity: 0.9;
}
.on {
background-color: var(--tile_on_background);
color: var(--tile_on_text);
filter: alpha(opacity=100);
opacity: 1.0;
}
.flash {
color: var(--tile_on_text);
filter: alpha(opacity=100);
opacity: 0.9;
-webkit-animation-name: tile-flash; /* Safari 4.0 - 8.0 */
-webkit-animation-duration: 2s; /* Safari 4.0 - 8.0 */
-webkit-animation-name: tile-flash;
/* Safari 4.0 - 8.0 */
-webkit-animation-duration: 2s;
/* Safari 4.0 - 8.0 */
animation-name: tile-flash;
animation-duration: 2s;
animation-iteration-count: infinite;
}
/* Safari 4.0 - 8.0 */
@-webkit-keyframes tile-flash {
0% {background-color: var(--tile_on_background); opacity: 1.0;}
50% {background-color: var(--tile_background); opacity: 0.9;}
100% {background-color: var(--tile_on_background); opacity: 1.0;}
0% {
background-color: var(--tile_on_background);
opacity: 1.0;
}
50% {
background-color: var(--tile_background);
opacity: 0.9;
}
100% {
background-color: var(--tile_on_background);
opacity: 1.0;
}
}
/* Standard syntax */
@keyframes tile-flash {
0% {background-color: var(--tile_on_background); opacity: 1.0;}
50% {background-color: var(--tile_background); opacity: 0.9;}
100% {background-color: var(--tile_on_background); opacity: 1.0;}
0% {
background-color: var(--tile_on_background);
opacity: 1.0;
}
50% {
background-color: var(--tile_background);
opacity: 0.9;
}
100% {
background-color: var(--tile_on_background);
opacity: 1.0;
}
}
/*
.off {
background-color: #ccc;
@ -214,22 +253,23 @@
margin: 0 auto;
/*background-color: red;*/
}
.tile_name {
height: var(--tile_name-height);
/*background-color: green;*/
line-height: var(--tile_name-lineheight);
}
.tile_status {
color: var(--tile_status_text);
height: var(--tile_status-height);
/*background-color: blue;*/
}
.tile_icon_value {
border-radius: calc(var(--tile_icon-height) / 2);
font-weight: 600;
/*border-radius: 27px;*/
height: var(--tile_icon-height);
min-width: var(--tile_icon-height);
text-align: center;
@ -238,22 +278,27 @@
filter: alpha(opacity=100);
opacity: 1.0;
}
.heat {
background-color: rgb(255, 123, 0);
color: rgb(255, 255, 255);
}
.cool {
background-color: rgb(4, 159, 248);
color: rgb(255, 255, 255);
}
.enabled {
background-color: rgb(78, 196, 0);
color: rgb(255, 255, 255);
}
.disabled {
background-color: rgb(110, 110, 110);
color: rgb(220, 220, 220);
}
/* All for options panel */
.option_switch {
@ -262,9 +307,11 @@
width: 60px;
height: 34px
}
.option_switch input {
display: none;
}
.option_switch_slide {
position: absolute;
cursor: pointer;
@ -277,6 +324,7 @@
transition: .4s;
border-radius: 34px;
}
.option_switch_slide:before {
position: absolute;
content: "";
@ -289,17 +337,21 @@
transition: .4s;
border-radius: 50%;
}
input:checked+.option_switch_slide {
background-color: var(--options_slider_highlight);
}
input:focus+.option_switch_slide {
box-shadow: 0 0 1px var(--options_slider_highlight);
}
input:checked+.option_switch_slide:before {
-webkit-transform: translateX(26px);
-ms-transform: translateX(26px);
transform: translateX(26px);
}
.option_slider {
-webkit-appearance: none;
width: 300px;
@ -310,6 +362,7 @@
transition: opacity .2s;
border-radius: var(--options_slider_height);
}
.option_slider::-webkit-slider-thumb {
-webkit-appearance: none;
appearance: none;
@ -319,6 +372,7 @@
cursor: pointer;
border-radius: calc(var(--options_slider_ball)*1px);
}
.option_slider::-moz-range-thumb {
width: calc(var(--options_slider_ball)*1px);
height: calc(var(--options_slider_ball)*1px);
@ -326,45 +380,110 @@
cursor: pointer;
border-radius: var(--options_slider_height);
}
.options_title {
/*background-color: rgb(124, 124, 124);
color: #fff;
font-weight: 200;*/
font-size: 18px;
overflow: hidden;
}
.options_selector {
font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
font-family: var(--fonts);
font-weight: 600;
font-size: 16px;
}
.options_button {
font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
font-family: var(--fonts);
font-weight: 600;
font-size: 16px;
}
.option_text {
font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
font-family: var(--fonts);
font-weight: 600;
font-size: 16px;
}
.option_radiocontainer {
padding: 0.2em 0;
/*font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;*/
font-weight: 500;
font-size: 14px;
}
/* hide the "real" radios visually */
.radio input {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px;
}
/* style the "fake" radios */
.option_radio-value {
background-color: var(--options_radio_lowlight);
background-repeat: no-repeat;
background-position: center;
background-size: 95% auto;
border-radius: 50%;
display: inline-block;
height: var(--options_radio_ball);
width: var(--options_radio_ball);
margin-right: 0.2em;
margin-left: 0.5em;
position: relative;
vertical-align: -0.3em;
/* Beautify
border: 0.0625em solid #bbb;
box-shadow: inset 0 0.0625em 0 0.0625em rgba(0,0,0,0.075);*/
}
input:checked+.option_radio-value {
background-color: var(--options_radio_highlight);
/* Beautify
border-color: #169a9a;
box-shadow: 0 0.0625em 0 0.0625em rgba(0,0,0,0.075);*/
}
/*
.timedate {
font-size: 10px;
}
}*/
</style>
<script type='text/javascript'>
var _lightProgramDropdown = false;
var _pressEvent;
var _ignoreMouseEvent = false;
var _temperature_units;
var _aqualink_data;
var _landscape = false;
var _displayNames = [];
//init();
function init() {
setSizeSpecifics();
populateLightProgram();
document.getElementById('thermostat_options').classList.remove("hide");
document.getElementById('swg_options').classList.remove("hide");
document.getElementById('pswitch_options').classList.remove("hide");
setColors();
load_background();
showTileOptions(false);
startWebsockets();
resetBackgroundSize();
}
function populateLightProgram() {
if (_lightProgramDropdown) {
option = document.getElementById('pswitch_option_list');
try {
fLen = light_program.length;
@ -375,16 +494,23 @@
option.appendChild(opt);
}
} catch (e) {}
document.getElementById('thermostat_options').classList.remove("hide");
document.getElementById('swg_options').classList.remove("hide");
document.getElementById('pswitch_options').classList.remove("hide");
setColors();
load_background();
showTileOptions(false);
startWebsockets();
resetBackgroundSize();
} else {
var tbody = document.getElementById('pswitch_table').getElementsByTagName('tbody')[0];
var html1 = '';
var html2 = '';
fLen = light_program.length;
for (i = 0; i < fLen; i++) {
if (light_program[i].endsWith(" - Show"))
html2 = html2 + "<div class='option_radiocontainer'><label><span class='radio'><input type='radio' name='light_program' value='" + (i+1) + "' onchange='updatePwsitchOptions(this);'><span class='option_radio-value' aria-hidden='true'></span></span>" + light_program[i].substr(0, (light_program[i].length - 7)) + "</label></div>";
else
html1 = html1 + "<div class='option_radiocontainer'><label><span class='radio'><input type='radio' name='light_program' value='" + (i+1) + "' onchange='updatePwsitchOptions(this);'><span class='option_radio-value' aria-hidden='true'></span></span>" + light_program[i] + "</label></div>";
}
row = tbody.deleteRow(2);
row = tbody.insertRow(2);
row.innerHTML = "<td align='center'>Solid Color</td><td align='center'>Light Show</td>";
row = tbody.insertRow(3);
row.innerHTML = "<td align='left' valign='top'>" + html1 + "</td><td align='left' valign='top'>" + html2 + "</td>";
}
}
function setProp(name) {
@ -424,12 +550,10 @@
document.documentElement.style.setProperty('--tile_grid-gap', '20px');
document.documentElement.style.setProperty('--tile_name-lineheight', '1.4');
}
if (w > h)
_landscape = true;
else
_landscape = false;
setOrientation(_landscape);
/*
Future change element sizes here if needed
@ -469,7 +593,6 @@
image.onload = function() {
document.getElementById("body_wrap").style.backgroundImage = "url('" + this.src + "')";
};
if (typeof background_reload !== 'undefined' && background_reload > 0) {
image.src = background_url + '?' + new Date().getTime();
setTimeout(load_background, (background_reload * 1000));
@ -477,22 +600,18 @@
image.src = background_url;
}
}
// If the grid continer is larger than the page container, increase page so background looks nice
// also reduce size if needed on page rotate.
function resetBackgroundSize() {
if (typeof background_url === 'undefined' || background_url === undefined)
return;
try {
//inside = document.getElementById('wrapper');
outside = document.getElementById('body_wrap');
insideH = parseInt(window.getComputedStyle(document.getElementById('wrapper')).height);
outsideH = parseInt(window.getComputedStyle(outside).height);
var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
if (insideH > outsideH || outsideH > h) {
//outside.style.height = ((insideH > h)?(insideH + 40)+'px':(h + 40)+'px');
outside.style.height = ((insideH > h) ? (insideH + 40) + 'px' : h + 'px');
@ -610,10 +729,15 @@
}
function setTileState(id, state) {
try {
if (state == (document.getElementById(id).getAttribute('status') == 'off')) {
send_command(id);
console.log("Switch state "+id+" to "+(state)?"on":"off");
} else {
console.log("state "+id+" to "+(state)?"on":"off")
}
setTileOn(id, ((state) ? "on" : "off"));
} catch(exception) {}
}
function setThermostatSetpoint(id, sp_value) {
@ -629,7 +753,6 @@
if (value == undefined || value.startsWith("-999") || value.startsWith(" "))
value = '--';
else {
try {
if ((type = document.getElementById(id).getAttribute('type')) != null) {
if (type == 'temperature' || type == 'setpoint_thermo' || type == 'setpoint_freeze')
@ -667,7 +790,6 @@
}
function setTileOn(id, status) {
//function setTileOn(id, status, text) {
var tile;
var text;
@ -704,7 +826,6 @@
text = 'Turn on ' + tile.getAttribute('setpoint') + "&deg;";
//else
// text = "On";
}
//document.getElementById(id + '_status').innerHTML = "On";
} else {
@ -770,24 +891,23 @@
var wrapH = document.getElementById('wrapper').clientHeight + 'px';
if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_thermo') {
active_option = document.getElementById('thermostat_options');
document.getElementById('thermostat_options').style.height = wrapH;
//document.getElementById('thermostat_options').style.display = 'flex';
document.getElementById('swg_options').style.display = 'none';
document.getElementById('pswitch_options').style.display = 'none';
} else if (id != null && document.getElementById(id).getAttribute('type') == 'switch_program') {
active_option = document.getElementById('pswitch_options');
document.getElementById('pswitch_options').style.height = wrapH;
document.getElementById('thermostat_options').style.display = 'none';
document.getElementById('swg_options').style.display = 'none';
//document.getElementById('pswitch_options').style.display = 'flex';
} else /*if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_swg')*/ {
active_option = document.getElementById('swg_options');
document.getElementById('swg_options').style.height = wrapH;
document.getElementById('thermostat_options').style.display = 'none';
//document.getElementById('swg_options').style.display = 'flex';
document.getElementById('pswitch_options').style.display = 'none';
}
active_option.style.display = 'flex';
optionH = window.getComputedStyle(active_option, null).getPropertyValue("height");
if (optionH <= wrapH)
active_option.style.height = wrapH;
console.log("Option:"+optionH+" wrapH:"+wrapH);
document.getElementById('wrapper').classList.add("opaque");
} else {
// Fake onclick to close and save any values if open
@ -881,7 +1001,6 @@
//setTileOn(id, ((oswitch.checked)?"on":"off"), null);
}
}
var cTime;
try {
cTime = performance.now();
@ -898,11 +1017,26 @@
document.getElementById("body_wrap").removeEventListener("click", clickHandler);
state = oswitch.checked;
if (type == 'switch_program') {
var mode=false;
if (_lightProgramDropdown) {
if (pswitch.selectedIndex > 0) {
//alert("send "+pswitch.selectedIndex);
send_light_mode(pswitch.selectedIndex);
} else if (state == (tile.getAttribute('status') == 'off')) // Only bother with this if we didn;t set the light mode.
mode=true;
}
} else {
var radio = document.getElementsByName("light_program");
for (x = 0; x < radio.length; x++) {
if (radio[x].checked == true) {
send_light_mode(radio[x].value);
mode=true;
break;
}
}
}
if (mode == false) {
// if (state == (tile.getAttribute('status') == 'off')) // Only bother with this if we didn;t set the light mode.
setTileState(id, state);
}
} else {
value = slider.value;
if (state == (tile.getAttribute('status') == 'off'))
@ -922,7 +1056,6 @@
_aqualink_data = data;
var el = document.getElementById("datetime");
el.innerHTML = data.time.toLowerCase().replace(" ", "&nbsp;") + ((_landscape) ? "&nbsp;" : "<br>") + data.date.toLowerCase().replace(" ", "&nbsp;");
if (document.getElementById("name").innerHTML == "AqualinkD") {
if (data.status != "Ready") {
document.getElementById("message").innerHTML = formatSatus(data.status);
@ -930,7 +1063,6 @@
document.getElementById("message").innerHTML = '';
}
}
// Hard code value updated as I can't be bothered to update source.
// should come back and re-do these values.
// The ID's should ultimatly come from json
@ -951,19 +1083,16 @@
try {
pa = devices.indexOf(a.id);
pb = devices.indexOf(b.id);
if (pa > pb)
return 1;
else if (pa < pb)
return -1;
} catch (e) {}
return 0;
}
function check_devices(data) {
_temperature_units = data['temp_units'];
data['devices'].sort(deviceSort);
for (var obj in data['devices']) {
if (document.getElementById(data['devices'][obj].id) == null) {
@ -1062,6 +1191,7 @@
}
function send_light_mode(value) {
console.log("Set light mode "+value);
var mode = {};
mode.parameter = 'POOL_LIGHT_MODE';
mode.value = value;
@ -1086,8 +1216,25 @@
message.innerHTML = "AqualinkD : " + _aqualink_data.aqualinkd_version + " | AqualinkRS : " + _aqualink_data.version;
}
source.innerHTML = "Version(s)";
setTimeout(function() {
source.innerHTML = "AqualinkD";
}, 5000);
}
setTimeout(function(){ source.innerHTML = "AqualinkD"; }, 5000);
function updatePwsitchOptions(source) {
if (source.type == 'radio') {
document.getElementById('pswitch_option_switch_text_value').innerHTML = light_program[source.value-1];
document.getElementById('pswitch_option_switch').checked = true;
} else if (source.type == 'checkbox') {
//console.log(source);
if (document.getElementById('pswitch_option_switch').checked == false) {
var radio = document.getElementsByName("light_program");
for (x = 0; x < radio.length; x++) {
radio[x].checked = false
}
document.getElementById('pswitch_option_switch_text_value').innerHTML = 'Off';
}
}
}
</script>
</head>
@ -1175,7 +1322,7 @@
</div>
<div id='pswitch_options' class='options hide'>
<div id='pswitch_options_pane' class='options_pane' onclick='event.stopPropagation();'>
<table border='0' cellpadding='10px' width="100%">
<table id='pswitch_table' border='0' cellpadding='10px' width="100%">
<tr class='options_title'>
<th colspan='2'><span id="pswitch_option_title"></span>
</th>
@ -1185,11 +1332,12 @@
</td>
<td align='left' width='50%'>
<label class="option_switch">
<input type="checkbox" id='pswitch_option_switch'>
<input type="checkbox" id='pswitch_option_switch' onchange='updatePwsitchOptions(this);'>
<span class="option_switch_slide"></span>
</label>
</td>
</tr>
<tr>
<td colspan='2' align='center'>
<select id='pswitch_option_list' class='options_selector'>
@ -1197,6 +1345,7 @@
</select>
</td>
</tr>
<tr>
<td colspan='2' align='center'>
<input type="button" value="close" id='pswitch_options_close' class='options_button'>
@ -1209,4 +1358,3 @@
</body>
</html>

1212
web/controller.old.html Normal file
View File

File diff suppressed because it is too large Load Diff