Merge pull request #43 from SQ2CPA/main

Changes before release
richonguzman · Mar 8, 2024 · 5334260 · 5334260
2 parents d50f0dd + 0868448
commit 5334260
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/data_embed/index.html b/data_embed/index.html
@@ -160,6 +160,7 @@ <h5>
                                             id="beacon.comment"
                                             class="form-control"
                                             placeholder="LoRa APRS"
+                                            required=""
                                         />
                                     </div>
                                     <div class="col-12 mt-3">
@@ -320,11 +321,14 @@ <h5>
                                         <small>(in minutes)</small></label
                                     >
                                     <input
-                                        type="text"
+                                        type="number"
                                         name="wifi.autoAP.powerOff"
                                         id="wifi.autoAP.powerOff"
                                         class="form-control"
                                         placeholder="15"
+                                        required=""
+                                        step="1"
+                                        min="0"
                                     />
                                     <div class="form-text">
                                         Set to <strong>0</strong> if you don't
@@ -618,11 +622,14 @@ <h5>
                                         >
                                         <div class="input-group">
                                             <input
-                                                type="text"
+                                                type="number"
                                                 name="other.rememberStationTime"
                                                 id="other.rememberStationTime"
                                                 placeholder="30"
                                                 class="form-control"
+                                                required=""
+                                                step="1"
+                                                min="1"
                                             />
                                             <span class="input-group-text"
                                                 >minutes</span
@@ -664,6 +671,7 @@ <h5>
                                         <select
                                             class="form-select form-select"
                                             name="digi.mode"
+                                            id="digi.mode"
                                         >
                                             <option value="0">off</option>
                                             <option value="2">
@@ -854,11 +862,14 @@ <h5>
                                         >
                                         <div class="input-group">
                                             <input
-                                                type="text"
+                                                type="number"
                                                 name="beacon.interval"
                                                 id="beacon.interval"
                                                 placeholder="15"
                                                 class="form-control"
+                                                required=""
+                                                step="1"
+                                                min="1"
                                             />
                                             <span class="input-group-text"
                                                 >minutes</span
@@ -1056,13 +1067,15 @@ <h5>
                                                 id="lora.txFreq"
                                                 placeholder="433775000"
                                                 class="form-control"
+                                                required=""
                                             />
                                             <input
                                                 type="hidden"
                                                 name="lora.iGateFreq"
                                                 id="lora.iGateFreq"
                                                 placeholder="433775000"
                                                 class="form-control"
+                                                required=""
                                             />
                                             <span class="input-group-text"
                                                 >Hz</span

diff --git a/data_embed/script.js b/data_embed/script.js
@@ -148,6 +148,7 @@ function loadSettings(settings) {
     // document.getElementById("digi.comment").value = settings.digi.comment;
     // document.getElementById("digi.latitude").value = settings.digi.latitude;
     // document.getElementById("digi.longitude").value = settings.digi.longitude;
+    document.getElementById("digi.mode").value = settings.digi.mode;
 
     // OTA
     document.getElementById("ota.username").value = settings.ota.username;

diff --git a/installer/Install Upgrade.lnk b/installer/Install Upgrade.lnk
diff --git a/installer/Install with Factory Reset.lnk b/installer/Install with Factory Reset.lnk