update HTML/JS sources

vitotai · Apr 18, 2024 · a37150f · a37150f
1 parent 922d921
commit a37150f
Show file tree

Hide file tree

Showing 66 changed files with 74 additions and 58 deletions.
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm b/htmljs/dist/chinese/BPLLogViewer.htm
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm.gz b/htmljs/dist/chinese/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/chinese/config.htm b/htmljs/dist/chinese/config.htm
diff --git a/htmljs/dist/chinese/config.htm.gz b/htmljs/dist/chinese/config.htm.gz
diff --git a/htmljs/dist/chinese/control.htm b/htmljs/dist/chinese/control.htm
diff --git a/htmljs/dist/chinese/control.htm.gz b/htmljs/dist/chinese/control.htm.gz
diff --git a/htmljs/dist/chinese/index.htm b/htmljs/dist/chinese/index.htm
diff --git a/htmljs/dist/chinese/index.htm.gz b/htmljs/dist/chinese/index.htm.gz
diff --git a/htmljs/dist/english/BPLLogViewer.htm b/htmljs/dist/english/BPLLogViewer.htm
diff --git a/htmljs/dist/english/BPLLogViewer.htm.gz b/htmljs/dist/english/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/english/config.htm b/htmljs/dist/english/config.htm
diff --git a/htmljs/dist/english/config.htm.gz b/htmljs/dist/english/config.htm.gz
diff --git a/htmljs/dist/english/control.htm b/htmljs/dist/english/control.htm
diff --git a/htmljs/dist/english/control.htm.gz b/htmljs/dist/english/control.htm.gz
diff --git a/htmljs/dist/english/index.htm b/htmljs/dist/english/index.htm
diff --git a/htmljs/dist/english/index.htm.gz b/htmljs/dist/english/index.htm.gz
diff --git a/htmljs/dist/italian/BPLLogViewer.htm b/htmljs/dist/italian/BPLLogViewer.htm
diff --git a/htmljs/dist/italian/BPLLogViewer.htm.gz b/htmljs/dist/italian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/italian/config.htm b/htmljs/dist/italian/config.htm
diff --git a/htmljs/dist/italian/config.htm.gz b/htmljs/dist/italian/config.htm.gz
diff --git a/htmljs/dist/italian/control.htm b/htmljs/dist/italian/control.htm
diff --git a/htmljs/dist/italian/control.htm.gz b/htmljs/dist/italian/control.htm.gz
diff --git a/htmljs/dist/italian/index.htm b/htmljs/dist/italian/index.htm
diff --git a/htmljs/dist/italian/index.htm.gz b/htmljs/dist/italian/index.htm.gz
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm b/htmljs/dist/norwegian/BPLLogViewer.htm
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm.gz b/htmljs/dist/norwegian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/norwegian/config.htm b/htmljs/dist/norwegian/config.htm
diff --git a/htmljs/dist/norwegian/config.htm.gz b/htmljs/dist/norwegian/config.htm.gz
diff --git a/htmljs/dist/norwegian/control.htm b/htmljs/dist/norwegian/control.htm
diff --git a/htmljs/dist/norwegian/control.htm.gz b/htmljs/dist/norwegian/control.htm.gz
diff --git a/htmljs/dist/norwegian/control_s.htm b/htmljs/dist/norwegian/control_s.htm
diff --git a/htmljs/dist/norwegian/control_s.htm.gz b/htmljs/dist/norwegian/control_s.htm.gz
diff --git a/htmljs/dist/norwegian/index.htm b/htmljs/dist/norwegian/index.htm
diff --git a/htmljs/dist/norwegian/index.htm.gz b/htmljs/dist/norwegian/index.htm.gz
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm b/htmljs/dist/portuguese-br/BPLLogViewer.htm
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz b/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/portuguese-br/config.htm b/htmljs/dist/portuguese-br/config.htm
diff --git a/htmljs/dist/portuguese-br/config.htm.gz b/htmljs/dist/portuguese-br/config.htm.gz
diff --git a/htmljs/dist/portuguese-br/control.htm b/htmljs/dist/portuguese-br/control.htm
diff --git a/htmljs/dist/portuguese-br/control.htm.gz b/htmljs/dist/portuguese-br/control.htm.gz
diff --git a/htmljs/dist/portuguese-br/control_s.htm b/htmljs/dist/portuguese-br/control_s.htm
diff --git a/htmljs/dist/portuguese-br/control_s.htm.gz b/htmljs/dist/portuguese-br/control_s.htm.gz
diff --git a/htmljs/dist/portuguese-br/index.htm b/htmljs/dist/portuguese-br/index.htm
diff --git a/htmljs/dist/portuguese-br/index.htm.gz b/htmljs/dist/portuguese-br/index.htm.gz
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm b/htmljs/dist/slovak/BPLLogViewer.htm
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm.gz b/htmljs/dist/slovak/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/slovak/config.htm b/htmljs/dist/slovak/config.htm
diff --git a/htmljs/dist/slovak/config.htm.gz b/htmljs/dist/slovak/config.htm.gz
diff --git a/htmljs/dist/slovak/control.htm b/htmljs/dist/slovak/control.htm
diff --git a/htmljs/dist/slovak/control.htm.gz b/htmljs/dist/slovak/control.htm.gz
diff --git a/htmljs/dist/slovak/control_s.htm b/htmljs/dist/slovak/control_s.htm
diff --git a/htmljs/dist/slovak/control_s.htm.gz b/htmljs/dist/slovak/control_s.htm.gz
diff --git a/htmljs/dist/slovak/index.htm b/htmljs/dist/slovak/index.htm
diff --git a/htmljs/dist/slovak/index.htm.gz b/htmljs/dist/slovak/index.htm.gz
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm b/htmljs/dist/spanish/BPLLogViewer.htm
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm.gz b/htmljs/dist/spanish/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/spanish/config.htm b/htmljs/dist/spanish/config.htm
diff --git a/htmljs/dist/spanish/config.htm.gz b/htmljs/dist/spanish/config.htm.gz
diff --git a/htmljs/dist/spanish/control.htm b/htmljs/dist/spanish/control.htm
diff --git a/htmljs/dist/spanish/control.htm.gz b/htmljs/dist/spanish/control.htm.gz
diff --git a/htmljs/dist/spanish/index.htm b/htmljs/dist/spanish/index.htm
diff --git a/htmljs/dist/spanish/index.htm.gz b/htmljs/dist/spanish/index.htm.gz
diff --git a/htmljs/src/js/chart-edit.js b/htmljs/src/js/chart-edit.js
@@ -8,7 +8,7 @@ BrewChart.prototype.calInfo=function(){
     cdata[idx++]=0xF3;
     cdata[idx++]=points.length;
     for(var i=0;i<points.length;i++){
-        var raw =Math.round((t.devType == 2)? points[i][0]*10000:points[i][0]*100);
+        var raw =Math.round((t.devType == 2)? points[i][0]*1000:points[i][0]*10);
         var gravity =Math.round(t.plato? points[i][1]*100:points[i][1]*10000);
         cdata[idx++]= (raw >> 8) & 0xFF;
         cdata[idx++]= raw & 0xFF;
@@ -245,4 +245,4 @@ BrewChart.prototype.addCalibration=function(time,sg){
             }          
         }
     }
-};
+};
diff --git a/htmljs/src/lcd.html b/htmljs/src/lcd.html
@@ -91,6 +91,42 @@
     }
 </style>
 <script>
+
+var StateText = [
+        "Idling for ",
+        "Temp. control OFF",
+        "Door open",
+        "Heating for ",
+        "Cooling for ",
+        "Wait to Cool ",
+        "Wait to Heat ",
+        "Waiting for peak",
+        "Cool time left ",
+        "Heat time left ",
+        "Unknown status!"
+    ];
+
+    function genStateText(state, duration) {
+        if (state == 1 || state == 2 || state == 10 || state == 7) return StateText[state];
+
+        var timestr = "";
+        var mm = Math.floor(duration / 60);
+        var hh = Math.floor(mm / 60);
+        var ss = duration % 60;
+        mm = mm - hh * 60;
+
+        function zeropad(n){
+            return n>9? ""+n:"0"+n;
+        }
+
+        if (hh > 0) {
+            timestr = "{HH}h{MM}m{SS}".replace("{SS}", zeropad(ss)).replace("{MM}", zeropad(mm)).replace("{HH}", zeropad(hh));
+        } else{
+            // short
+            timestr = "{MM}m{SS}".replace("{SS}", zeropad(ss)).replace("{MM}", zeropad(mm));
+        }
+        return StateText[state].replace("{time}", timestr);
+    }    
     var roomOfridge = false;
 
     function simLcd(info) {
@@ -216,4 +252,4 @@
     </div>
 </body>
 
-</html>
+</html>
diff --git a/htmljs/src/logging.tmpl.html b/htmljs/src/logging.tmpl.html
@@ -57,33 +57,13 @@ <h6 class="inline-header">
                     </div>
                     <div layout horizontal cross-center>
                         <h6 class="inline-header">
-                            <%= log_calibrate_ispindel %>
+                            <%= log_record_raw %>
                         </h6>
                         <div>
                             <input type="checkbox" id="calispindel" name="cbpl" class="switch-input" checked="checked">
                             <label for="calispindel" class="switch-label" style="min-width: 0;"></label>
                         </div>
                     </div>
-                    <div layout horizontal cross-center>
-                        <h6 class="inline-header">
-                            <%= log_tilt_in_water %>
-                        </h6>
-                        <input type=text id=tiltinw size=6>
-                    </div>
-                    <div layout horizontal cross-center class=tiltwatercorrect>
-                        <h6 class="inline-header">
-                            <%= log_hydrometer_reading %>
-                        </h6>
-                        <input type=text id=hydrometer size=6 value="1.0">
-                    </div>
-                    <div layout horizontal cross-center class=tiltwatercorrect>
-                        <h6 class="inline-header">
-                            <%= log_or_water_at %>
-                        </h6><input type=text id=watertemp size=4>&deg;
-                        <%= log_calibrated %> <input type=text id=caltemp size=4>&deg;
-                            <select id=tempunit><option value=C>C</option><option value=F>F</option></select>
-
-                    </div>
                 </div>
 
                 <div id=logstopinput style="display:none">
@@ -716,4 +696,4 @@ <h6 class="inline-header">
 
 </body>
 
-</html>
+</html>
diff --git a/platformio.ini b/platformio.ini
@@ -10,8 +10,8 @@
 
 [platformio]
 #sonoff OTA no longer supported, classic interface no longer supported
-#default_envs = esp32, esp32-oled, esp8266, esp8266-oled, esp8266-tw, esp8266-spanish, esp8266-portuguese-br, esp8266-slovak, esp8266-ispindel, esp8266-it, esp8266-norwegian, thorrax, sonoff, sonoff-esp8285, d1pro, sonoff-am2301
-default_envs = esp32-dev
+default_envs = esp32, esp32-oled, esp8266, esp8266-oled, esp8266-tw, esp8266-spanish, esp8266-portuguese-br, esp8266-slovak, esp8266-ispindel, esp8266-it, esp8266-norwegian, thorrax, sonoff, sonoff-esp8285, d1pro, sonoff-am2301
+#default_envs = esp32-dev
 #default_envs = esp32
 #default_envs = esp8266-dev