diff --git a/firmware/data/bottom.js b/firmware/data/bottom.js index 16efd45..22bc96f 100644 --- a/firmware/data/bottom.js +++ b/firmware/data/bottom.js @@ -392,10 +392,10 @@ for (var i = 0; i < tcdata.length; i++) { var row = document.getElementById("hour" + (i+1)).parentNode; row.cells[0].childNodes[0].value = tcdata[i].hour; row.cells[1].childNodes[0].value = tcdata[i].min; -row.cells[2].childNodes[0].value = parseInt(tcdata[i].ch1 * 100 / 255); -row.cells[3].childNodes[0].value = parseInt(tcdata[i].ch2 * 100 / 255); -row.cells[4].childNodes[0].value = parseInt(tcdata[i].ch3 * 100 / 255); -row.cells[5].childNodes[0].value = parseInt(tcdata[i].ch4 * 100 / 255); +row.cells[2].childNodes[0].value = parseInt(Math.round(tcdata[i].ch1 * 100 / 255)); +row.cells[3].childNodes[0].value = parseInt(Math.round(tcdata[i].ch2 * 100 / 255)); +row.cells[4].childNodes[0].value = parseInt(Math.round(tcdata[i].ch3 * 100 / 255)); +row.cells[5].childNodes[0].value = parseInt(Math.round(tcdata[i].ch4 * 100 / 255)); } loadTCGraphData(); }); diff --git a/firmware/data/index_template_bottom.html b/firmware/data/index_template_bottom.html index 241e1ee..f401ad3 100644 --- a/firmware/data/index_template_bottom.html +++ b/firmware/data/index_template_bottom.html @@ -9,11 +9,11 @@ diff --git a/firmware/data/index_template_middle.html b/firmware/data/index_template_middle.html index 6155028..c81a265 100644 --- a/firmware/data/index_template_middle.html +++ b/firmware/data/index_template_middle.html @@ -1,7 +1,7 @@
-
+
-
+
-
+
diff --git a/firmware/data/index_template_top.html b/firmware/data/index_template_top.html index 7f237d0..66e10a9 100644 --- a/firmware/data/index_template_top.html +++ b/firmware/data/index_template_top.html @@ -47,4 +47,4 @@
-
+ diff --git a/firmware/data/style.css b/firmware/data/style.css index e39a471..9788312 100644 --- a/firmware/data/style.css +++ b/firmware/data/style.css @@ -40,4 +40,7 @@ cursor: pointer; } .pure-button:hover { background-color: #333; +} +.top-align { +vertical-align: top; } \ No newline at end of file diff --git a/firmware/html/bottom.js b/firmware/html/bottom.js index cdc7998..84a11cd 100644 --- a/firmware/html/bottom.js +++ b/firmware/html/bottom.js @@ -486,10 +486,10 @@ function fillTableFromJson() { var row = document.getElementById("hour" + (i+1)).parentNode; row.cells[0].childNodes[0].value = tcdata[i].hour; row.cells[1].childNodes[0].value = tcdata[i].min; - row.cells[2].childNodes[0].value = parseInt(tcdata[i].ch1 * 100 / 255); - row.cells[3].childNodes[0].value = parseInt(tcdata[i].ch2 * 100 / 255); - row.cells[4].childNodes[0].value = parseInt(tcdata[i].ch3 * 100 / 255); - row.cells[5].childNodes[0].value = parseInt(tcdata[i].ch4 * 100 / 255); + row.cells[2].childNodes[0].value = parseInt(Math.round(tcdata[i].ch1 * 100 / 255)); + row.cells[3].childNodes[0].value = parseInt(Math.round(tcdata[i].ch2 * 100 / 255)); + row.cells[4].childNodes[0].value = parseInt(Math.round(tcdata[i].ch3 * 100 / 255)); + row.cells[5].childNodes[0].value = parseInt(Math.round(tcdata[i].ch4 * 100 / 255)); } loadTCGraphData(); diff --git a/firmware/html/index_template_bottom.html b/firmware/html/index_template_bottom.html index 3a14eee..37d78fd 100644 --- a/firmware/html/index_template_bottom.html +++ b/firmware/html/index_template_bottom.html @@ -9,11 +9,11 @@ diff --git a/firmware/html/index_template_middle.html b/firmware/html/index_template_middle.html index 2b948ab..4b5e267 100644 --- a/firmware/html/index_template_middle.html +++ b/firmware/html/index_template_middle.html @@ -1,7 +1,7 @@
-
+
-
+
-
+
diff --git a/firmware/html/index_template_top.html b/firmware/html/index_template_top.html index 3ac1cf8..5d4956f 100644 --- a/firmware/html/index_template_top.html +++ b/firmware/html/index_template_top.html @@ -47,5 +47,5 @@
-
+ diff --git a/firmware/html/style.css b/firmware/html/style.css index e39a471..9788312 100644 --- a/firmware/html/style.css +++ b/firmware/html/style.css @@ -40,4 +40,7 @@ cursor: pointer; } .pure-button:hover { background-color: #333; +} +.top-align { +vertical-align: top; } \ No newline at end of file diff --git a/pic/schematics.png b/pic/schematics.png new file mode 100644 index 0000000..f03a73b Binary files /dev/null and b/pic/schematics.png differ