Merge branch 'pr3y:main' into main

pr3y · Jan 16, 2025 · ae376b1 · ae376b1
2 parents 7ff3d22 + ec43f0e
commit ae376b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -207,7 +207,7 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
 | Device                  | CC1101    | NRF24    | Interpreter  | FM Radio  | PN532     | Mic   | BadUSB    | RGB Led | Speaker   | Fuel Guage | LITE_MODE |
 | ---                     | :---:     | :---:    | :---:        | :---:     | :---:     | :---: | :---:     | :---:   | :---:     | :---:      | :---:     |
 | [M5Stack Cardputer](https://shop.m5stack.com/products/m5stack-cardputer-kit-w-m5stamps)       | :ok:      | :ok:     | :ok:         | :ok:      | :ok:      | :ok:  | :ok:      | :ok:    | NS4168    | :x:        | :x:       |
-| [M5Stack M5StickC PLUS2](https://shop.m5stack.com/products/m5stickc-plus-esp32-pico-mini-iot-development-kit)  | :ok:      | :ok:     | :ok:         | :ok:      | :ok:      | :ok:  | :ok:¹     | :x:     | Tone      | :x:        | :x:       |
+| [M5Stack M5StickC PLUS2](https://shop.m5stack.com/products/m5stickc-plus2-esp32-mini-iot-development-kit)  | :ok:      | :ok:     | :ok:         | :ok:      | :ok:      | :ok:  | :ok:¹     | :x:     | Tone      | :x:        | :x:       |
 | [M5Stack M5StickC PLUS](https://shop.m5stack.com/products/m5stickc-plus-esp32-pico-mini-iot-development-kit)   | :ok:      | :ok:     | :x:          | :ok:      | :ok:      | :ok:  | :ok:¹     | :x:     | Tone      | :x:        | :x:²      |
 | [M5Stack M5Core BASIC](https://shop.m5stack.com/products/basic-core-iot-development-kit)    | :x:       | :x:      | :x:          | :x:       | :x:       | :ok:  | :ok:¹     | :x:     | Tone      | :x:        | :x:       |
 | [M5Stack M5Core2 v1.1](https://shop.m5stack.com/products/m5stack-core2-esp32-iot-development-kit-v1-1)    | :x:       | :x:      | :x:          | :x:       | :x:       | :ok:  | :ok:¹     | :x:     | :x:       | :x:        | :x:       |

diff --git a/src/core/serialcmds.cpp b/src/core/serialcmds.cpp
@@ -617,10 +617,6 @@ bool processSerialCommand(String cmd_str) {
 
   if(cmd_str == "webui" ) {
     // start the webui
-    if(!wifiConnected) {
-      Serial.println("wifiConnect");
-      wifiConnectMenu(WIFI_AP);  // TODO: read mode from config file
-    }
     Serial.println("startWebUi");
     startWebUi(true);  // MEMO: will quit when check(EscPress)
     return true;

diff --git a/src/modules/others/webInterface.cpp b/src/modules/others/webInterface.cpp
@@ -20,34 +20,13 @@ WebServer* server=nullptr;               // initialise webserver
 const char* host = "bruce";
 String uploadFolder="";
 
-
-
-/**********************************************************************
-**  Function: webUIMyNet
-**  Display options to launch the WebUI
-**********************************************************************/
-void webUIMyNet() {
-  if (WiFi.status() != WL_CONNECTED) {
-    if(wifiConnectMenu()) startWebUi(false);
-    else {
-      displayError("Wifi Offline");
-    }
-  } else {
-    //If it is already connected, just start the network
-    startWebUi(false);
-  }
-  // On fail installing will run the following line
-}
-
-
 /**********************************************************************
 **  Function: loopOptionsWebUi
 **  Display options to launch the WebUI
 **********************************************************************/
 void loopOptionsWebUi() {
-  // Definição da matriz "Options"
   options = {
-      {"my Network", [=]() { webUIMyNet(); }},
+      {"my Network", [=]() { startWebUi(false); }},
       {"AP mode", [=]()    { startWebUi(true); }},
   };
 
@@ -493,11 +472,14 @@ server->on("/script.js", HTTP_GET, []() {
 void startWebUi(bool mode_ap) {
   setupSdCard();
 
+  bool keepWifiConnected = false;
   if (WiFi.status() != WL_CONNECTED) {
     if( mode_ap )
       wifiConnectMenu(WIFI_AP);
     else
       wifiConnectMenu(WIFI_STA);
+  } else {
+    keepWifiConnected = true;
   }
 
   // configure web server
@@ -526,7 +508,7 @@ void startWebUi(bool mode_ap) {
   MDNS.end();
 
   delay(100);
-  wifiDisconnect();
+  if(!keepWifiConnected) wifiDisconnect();
   enableCore0WDT();
   enableCore1WDT();
   enableLoopWDT();

diff --git a/src/modules/rf/rf.cpp b/src/modules/rf/rf.cpp
@@ -1683,6 +1683,7 @@ void rf_scan_copy() {
                 received.key=0;
                 received.preset="";
                 received.protocol="";
+                signals=0;
                 deinitRfModule();
                 delay(1500);
                 goto RestartScan;