From e63efd3bf1b0d6fc0d95903928b69dab05048a59 Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Wed, 1 Feb 2023 22:45:04 +0200
Subject: [PATCH] implemented all WiFi modes (AP, STA and AP+STA)

---
 HTML/adapters.html   | 20 ++++++++++----------
 HTML/res/styles.css  |  4 ++--
 components/webguiapp |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/HTML/adapters.html b/HTML/adapters.html
index 40fbd1a..69a8f68 100644
--- a/HTML/adapters.html
+++ b/HTML/adapters.html
@@ -39,8 +39,8 @@
               <script>PrintSaveFail('~status_fail~');
 							PrintSaveBtn('eth'); PrintApplyBtn('eth');</script>
             </form>
-          </div>
         </div>
+      </div>
 
         <div class="mlp ~hide_lora~">
           <div class="mlpc">
@@ -78,7 +78,6 @@
                           <td class='rl'>Включить WiFi</td>
                           <td><input type="checkbox" name="wifien" value="1" ~wfen~/></td>
                         </tr>
-
                         <tr>
                           <td class='rl'><button type="button" class='btn' name='upd' onclick="StartScan()">Scan
                               WiFi</button></td>
@@ -87,11 +86,12 @@
                       </table>
                       <p id="nets"></p>
                       <table class='cntr'>
-                        <tr>
-                          <td class='rl'>Режим WiFi:</td>
-                          <td><input name="netm" type="radio" value="2" onclick="configIPBoxes()"~cln~>Клиент(CLN)</input></br>
-                            <input name="netm" type="radio" value="1" onclick="configIPBoxes()"~apn~>Точка
-                            доступа(AP)</input></td>
+                        <tr><td class='rl'>Режим WiFi:</td>
+                          <td><select name="wfmode">
+                              <option value="sta"~wfmode(1)~>Клиент (STA)</option>
+                              <option value="ap"~wfmode(2)~>Точка доступа (AP)</option>
+                              <option value="apsta"~wfmode(3)~>Комбинированный (AP+STA)</option>
+                          </select></td>
                         </tr>
                         <script>PrintTextInput('Имя WiFi сети(AP):','wfiap','~ssidap~',3,31);
 						PrintTextInput('Ключ WiFi сети(AP):','wfpap','~wkeyap~',8,31);
@@ -117,7 +117,7 @@
                       <script>PrintSaveFail('~status_fail~');
 						PrintSaveBtn('wifi'); PrintApplyBtn('wifi');</script>
                     </form>
-                  </div>
+                </div>
                 </div>
 
                 <div class="mlp ~hide_gprs~">
@@ -142,9 +142,9 @@
                       </table>
                       <script>PrintSaveFail('~status_fail~');PrintSaveBtn('gprs'); PrintApplyBtn('gprs');</script>
                     </form>
-                  </div>
                 </div>
-          </div>
+                </div>
+        </div>
     </section>
   </main>
   <script>
diff --git a/HTML/res/styles.css b/HTML/res/styles.css
index 2c3dcfd..e2277c8 100644
--- a/HTML/res/styles.css
+++ b/HTML/res/styles.css
@@ -297,7 +297,7 @@ img {
 
 .rl{text-align:right;}
 
-input, .btn, .lab, textarea {
+input, select, .btn, .lab, textarea {
 	font:.85rem consolas,monospace;
 	padding-left:3px;
 	border:solid 1px #CCCCCC;
@@ -320,7 +320,7 @@ textarea {
 }
 
 .stg td{width:auto;padding:1px;margin:0}
-.stg input, select {height:25px}
+.stg input, {height:25px}
 input[type="radio"] { margin-top: -1px; vertical-align: middle;}
 .stg table{margin: 5px auto}
 .dot {height: 30px;
diff --git a/components/webguiapp b/components/webguiapp
index cce9b9b..67d676c 160000
--- a/components/webguiapp
+++ b/components/webguiapp
@@ -1 +1 @@
-Subproject commit cce9b9be61b8f7eec574f1bc40f5688c3864dbd7
+Subproject commit 67d676c5c9a3f4131faad5fd439c871c1c95dfb7