Add files via upload

Configuration added for SML/OBIS

src/web/html/setup.html

@@ -265,6 +265,18 @@
                     </fieldset>
                     </div>
 
+                    <button type="button" class="s_collapsible">Smart Meter (OBIS)</button>
+                    <div class="s_content">
+                        <fieldset class="mb-4">
+                            <legend class="des mx-2">Smart Meter (OBIS)</legend>
+                            <div class="row mb-3">
+                                <div class="col-8 col-sm-3">IR Sensor via UART0</div>
+                                <div class="col-4 col-sm-9"><input type="checkbox" name="irEn"/></div>
+                                <div class="col-8 col-sm-3">(empty browser cache or use CTRL + F5 after reboot to apply this setting)</div>
+                        </div>
+                        </fieldset>
+                    </div>
+
                     <div class="row mb-4 mt-4">
                         <div class="col-8 col-sm-3">Reboot device after successful save</div>
                         <div class="col-4 col-sm-9">
@@ -784,6 +796,10 @@
                 }
             }
 
+            function parseSML(obj) {
+                document.getElementsByName("irEn")[0].checked = obj["show_grid_data"];
+            }
+
             function parse(root) {
                 if(null != root) {
                     parseSys(root["system"]);
@@ -796,6 +812,7 @@
                     parseRadio(root["radio"]);
                     parseSerial(root["serial"]);
                     parseDisplay(root["display"], root["system"]["esp_type"], root["system"]);
+                    parseSML(root["sml_obis"]);
                     getAjax("/api/inverter/list", parseIv);
                 }
             }

src/web/html/visualization.html

@@ -20,7 +20,7 @@
         <div id="wrapper">
             <div id="content">
                 <div id="live"></div>
-                <div id="powerchart"></div>
+                <div id="powerchart">Please find a charting library with a suitable license model.</div>
                 <p>Every <span id="refresh"></span> seconds the values are updated</p>
             </div>
         </div>
@@ -128,10 +128,9 @@
                                 numBig(obj.ch[0][6], "kWh", "Yield Total")
                             ]),
                             ml("div", {class: "hr"}),
-                            obj["grid_power"] ?
+                            (obj["grid_power"] === undefined) ?
                                 ml("div", {class: "row mt-2"},[
                                     numMid(obj.ch[0][8], "W", "DC Power"),
-                                numMid(obj.grid_power, "W", "Grid Power"),
                                     numMid(obj.ch[0][0], "V", "Voltage"),
                                     numMid(obj.ch[0][1], "A", "Current"),
                                     numMid(obj.ch[0][3], "Hz", "Frequency"),
@@ -141,6 +140,7 @@
                                 ]) :
                                 ml("div", {class: "row mt-2"},[
                                     numMid(obj.ch[0][8], "W", "DC Power"),
+                                    numMid(obj.grid_power, "W", "Grid Power"),
                                     numMid(obj.ch[0][0], "V", "Voltage"),
                                     numMid(obj.ch[0][1], "A", "Current"),
                                     numMid(obj.ch[0][3], "Hz", "Frequency"),
@@ -266,12 +266,12 @@
 
                         document.getElementById("dyn_csv_url").innerHTML = document.baseURI.split ("\/live")[0] + "/get_chartdata/chartdata.csv";
                         document.getElementById("refresh").innerHTML = obj["refresh"];
-                        if (obj["grid_power"]) {
+                        if (obj["grid_power"] === undefined) {
-                            document.getElementById("chart_title").innerHTML = "Solar and Grid Power during Daylight";
-                            document.getElementById("yaxis_grid_power_title").innerHTML = "Grid Power in W";
-                        } else {
                             document.getElementById("chart_title").innerHTML = "Solar Power during Daylight";
                             document.getElementById("yaxis_grid_power_title").innerHTML = "";
+                        } else {
+                            document.getElementById("chart_title").innerHTML = "Solar and Grid Power during Daylight";
+                            document.getElementById("yaxis_grid_power_title").innerHTML = "Grid Power in W";
                         }
                         window.setInterval("getAjax('/api/live', parse)", obj["refresh"] * 1000);
                         exeOnce = false;