From e8fa9c747eb13af54faf71acd6a1d38b71ca4fcc Mon Sep 17 00:00:00 2001
From: lumapu <lp@lufami.de>
Date: Sun, 10 Sep 2023 16:01:07 +0200
Subject: [PATCH] 0.7.48 * fix SSD1309 2.42" display pinout * improved setup
 page: save and delete of inverters

---
 src/CHANGES.md          |  4 ++++
 src/defines.h           |  2 +-
 src/web/html/setup.html | 43 ++++++++++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/CHANGES.md b/src/CHANGES.md
index f241e5f2..d4898317 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -1,5 +1,9 @@
 # Development Changes
 
+## 0.7.48 - 2023-09-10
+* fix SSD1309 2.42" display pinout
+* improved setup page: save and delete of inverters
+
 ## 0.7.47 - 2023-09-07
 * fix boot loop #1140
 * fix regex in `setup` page
diff --git a/src/defines.h b/src/defines.h
index 13bb75a1..c29f3932 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       7
-#define VERSION_PATCH       47
+#define VERSION_PATCH       48
 
 //-------------------------------------
 typedef struct {
diff --git a/src/web/html/setup.html b/src/web/html/setup.html
index a3ecca25..7af9fa88 100644
--- a/src/web/html/setup.html
+++ b/src/web/html/setup.html
@@ -343,7 +343,6 @@
         </div>
         {#HTML_FOOTER}
         <script type="text/javascript">
-            var highestId = 0;
             var maxInv = 0;
             var ts = 0;
 
@@ -470,9 +469,7 @@
             }
 
             document.getElementById("btnAdd").addEventListener("click", function() {
-                if(highestId <= (maxInv-1)) {
-                    ivHtml(JSON.parse('{"enabled":true,"name":"","serial":"","channels":6,"ch_max_pwr":[0,0,0,0,0,0],"ch_name":["","","","","",""],"ch_yield_cor":[0,0,0,0,0,0]}'), highestId);
-                }
+                ivHtml(JSON.parse('{"enabled":true,"name":"","serial":"","channels":6,"ch_max_pwr":[0,0,0,0,0,0],"ch_name":["","","","","",""],"ch_yield_cor":[0,0,0,0,0,0]}'));
             });
 
             function apiCbWifi(obj) {
@@ -542,12 +539,8 @@
             }
 
             function delIv() {
-                var id = this.id.substring(0,4);
-                var e = document.getElementsByName(id + "Addr")[0];
-                e.value = "";
-                e.dispatchEvent(new Event("keyup"));
-                e.dispatchEvent(new Event("change"));
-                document.getElementsByName(id + "Name")[0].value = "";
+                var id = this.id.substring(0, this.id.length-3);
+                document.getElementById(id).remove();
             }
 
             function mlCb(id, des, chk=false) {
@@ -567,12 +560,25 @@
                 ]);
             }
 
-            function ivHtml(obj, id) {
-                highestId = id + 1;
-                if(highestId == maxInv)
+            function getFreeId() {
+                var id = 0;
+                while(id < maxInv) {
+                    if(null == document.getElementById("inv" + id))
+                        return id;
+                    id++;
+                }
+                return null;
+            }
+
+            function ivHtml(obj) {
+                var id = getFreeId();
+                if(null == id) {
                     setHide("btnAdd", true);
+                    return;
+                }
 
-                var iv = document.getElementById("inverter");
+                var iv = ml("div", {id: "inv" + id}, null);
+                document.getElementById("inverter").appendChild(iv);
                 iv.appendChild(des("Inverter " + id));
                 id = "inv" + id;
 
@@ -651,7 +657,7 @@
                     );
                 }
 
-                var del = inp(id+"del", "X", 0, ["btn", "btnDel"], id+"del", "button");
+                var del = ml("input", {class: "btn btnDel", type: "button", id: id+"del", value: "X"}, null);
                 del.addEventListener("click", delIv);
                 iv.append(mlE("Delete", del));
             }
@@ -699,10 +705,10 @@
             }
 
             function parseIv(obj) {
+                maxInv = obj["max_num_inverters"];
                 for(var i = 0; i < obj.inverter.length; i++)
-                    ivHtml(obj.inverter[i], i);
+                    ivHtml(obj.inverter[i]);
                 ivGlob(obj);
-                maxInv = obj["max_num_inverters"];
             }
 
             function parseMqtt(obj) {
@@ -881,7 +887,8 @@
                     [2, [1,1,0,0,0,0]], //SH1106_128X64
                     [3, [1,1,1,1,0,0]], //PCD8544_84X48 /nokia5110
                     [4, [1,1,0,0,0,0]], //SSD1306_128X32
-                    [5, [1,1,0,0,0,0]], //SSD1306_64X48
+                    [5, [1,1,0,0,0,0]], //SSD1306_128x64
+                    [6, [1,1,0,0,0,0]], //SSD1309_128x64
                     [10, [1,1,1,1,1,1]] //ePaper
                 ])
                 for(var i = 0; i < pins.length; i++) {