Few more fixes to Evil portal

esp32cam_marauder/EvilPortal.ino

@@ -3,13 +3,13 @@
 #include "ESPAsyncWebServer.h"
 #include <AsyncTCP.h>
 #include <DNSServer.h>
-//#include <WiFi.h>
+#include <WiFi.h>
 
 #define MAX_HTML_SIZE 20000
 
-/*#define B_PIN 4
+#define B_PIN 4
 #define G_PIN 5
-#define R_PIN 6*/
+#define R_PIN 6
 
 #define WAITING 0
 #define GOOD 1
@@ -23,7 +23,7 @@
 
 // GLOBALS
 DNSServer dnsServer;
-AsyncWebServer server(80);
+AsyncWebServer evilportal_server(80);
 
 bool runServer = false;
 
@@ -38,8 +38,6 @@ char index_html[MAX_HTML_SIZE] = "TEST";
 // RESET
 void (*resetFunction)(void) = 0;
 
-
-
 // AP FUNCTIONS
 class CaptiveRequestHandler : public AsyncWebHandler {
 public:
@@ -53,8 +51,8 @@ public:
   }
 };
 
-/*void setLed(int i) {
-  if (i == WAITING) {
+void setLed(int i) {
+  /*if (i == WAITING) {
     digitalWrite(B_PIN, LOW);
     digitalWrite(G_PIN, HIGH);
     digitalWrite(R_PIN, HIGH);
@@ -66,16 +64,16 @@ public:
     digitalWrite(B_PIN, HIGH);
     digitalWrite(G_PIN, HIGH);
     digitalWrite(R_PIN, LOW);
-  }
-}*/
+  }*/
+}
 
 void setupServer() {  
-  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+  evilportal_server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
     request->send_P(200, "text/html", index_html);
     Serial.println("client connected");
   });
 
-  server.on("/get", HTTP_GET, [](AsyncWebServerRequest *request) {
+  evilportal_server.on("/get", HTTP_GET, [](AsyncWebServerRequest *request) {
     String inputMessage;
     String inputParam;
 
@@ -112,8 +110,8 @@ void startAP() {
   setupServer();
 
   dnsServer.start(53, "*", WiFi.softAPIP());
-  server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);
-  server.begin();
+  evilportal_server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);
+  evilportal_server.begin();
 }
 
 bool checkForCommand(char *command) {
@@ -172,14 +170,14 @@ void evilportal_setup() {
   pinMode(G_PIN, OUTPUT);
   pinMode(R_PIN, OUTPUT);*/
 
-  //setLed(WAITING);
+  setLed(WAITING);
 
   //Serial.begin(115200);
 
   // wait for init flipper input
   getInitInput();
 
-  //setLed(GOOD);
+  setLed(GOOD);
 
   startPortal();
 }

flipper_companion_apps/applications/plugins/esp32cam_evilportal/evil_portal_app.c

@@ -110,7 +110,7 @@ int32_t evil_portal_app(void *p) {
   
   // Enable uart listener
   furi_hal_console_disable();
-  furi_hal_uart_set_br(FuriHalUartIdUSART1, 230400); // TODO: Clean this
+  furi_hal_uart_set_br(UART_CH, BAUDRATE); // TODO: Clean this
   //furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, evil_portal_uart_on_irq_cb, app);
     
   furi_hal_power_disable_external_3_3v();
@@ -121,7 +121,7 @@ int32_t evil_portal_app(void *p) {
   for(int i=0;i<2;i++)
   {
       furi_delay_ms(500); 
-      furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t[1]){'e'}, 1);
+      furi_hal_uart_tx(UART_CH, (uint8_t[1]){'e'}, 1);
   }
   furi_delay_ms(1);       
   Evil_PortalApp *evil_portal_app = evil_portal_app_alloc();

flipper_companion_apps/applications/plugins/esp32cam_morseflasher/uart_terminal_app.c

@@ -93,7 +93,7 @@ int32_t uart_terminal_app(void* p) {
     
     // Enable uart listener
     furi_hal_console_disable();
-    furi_hal_uart_set_br(FuriHalUartIdUSART1, 230400); // TODO: Clean this
+    furi_hal_uart_set_br(UART_CH, BAUDRATE); // TODO: Clean this
     //furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, uart_echo_on_irq_cb, app);
   
     furi_hal_power_disable_external_3_3v();
@@ -104,7 +104,7 @@ int32_t uart_terminal_app(void* p) {
     for(int i=0;i<2;i++)
     {
         furi_delay_ms(500); 
-        furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t[1]){'.'}, 1);
+        furi_hal_uart_tx(UART_CH, (uint8_t[1]){'.'}, 1);
     }
     furi_delay_ms(1);
     UART_TerminalApp* uart_terminal_app = uart_terminal_app_alloc();

flipper_companion_apps/applications/plugins/esp32cam_morseflasher/uart_terminal_app_i.h

@@ -16,6 +16,8 @@
 
 #define UART_TERMINAL_TEXT_BOX_STORE_SIZE (4096)
 #define UART_TERMINAL_TEXT_INPUT_STORE_SIZE (512)
+#define UART_CH (FuriHalUartIdUSART1)
+#define BAUDRATE (230400)
 
 struct UART_TerminalApp {
     Gui* gui;

flipper_companion_apps/applications/plugins/esp32cam_morseflasher/uart_terminal_uart.c

@@ -1,9 +1,6 @@
 #include "uart_terminal_app_i.h"
 #include "uart_terminal_uart.h"
 
-#define UART_CH (FuriHalUartIdUSART1)
-#define BAUDRATE (230400)
-
 struct UART_TerminalUart {
     UART_TerminalApp* app;
     FuriThread* rx_thread;
@@ -62,7 +59,7 @@ void uart_terminal_uart_tx(uint8_t* data, size_t len) {
 
 UART_TerminalUart* uart_terminal_uart_init(UART_TerminalApp* app) {
     UART_TerminalUart* uart = malloc(sizeof(UART_TerminalUart));
-
+    
     /*furi_hal_console_disable();
     if(app->BAUDRATE == 0) {
         app->BAUDRATE = 230400;