Unifi App and module firmware to support FlipperZero's Dev Module v.1

Author: SequoiaSan

FlipperZero-WiFi-Scanner-App/applications/wifi_scanner/wifi_scanner.c

@@ -16,8 +16,6 @@
 
 #include "FlipperZeroWiFiModuleDefines.h"
 
-#define FLIPPERZERO_DEV_BOARD_V_1 0
-
 #define WIFI_APP_DEBUG 0
 
 #if WIFI_APP_DEBUG
@@ -33,13 +31,8 @@
 
 #define DISABLE_CONSOLE !WIFI_APP_DEBUG
 
-#if FLIPPERZERO_DEV_BOARD_V_1
-#define ENABLE_MODULE_POWER 0
-#define ENABLE_MODULE_DETECTION 0
-#else
 #define ENABLE_MODULE_POWER 1
 #define ENABLE_MODULE_DETECTION 1
-#endif
 
 
 #define ANIMATION_TIME 350
@@ -504,14 +497,14 @@ static int32_t uart_worker(void* context) {
                     return 1;
                 }
 
-
                 if (!app->m_wifiModuleInitialized)
                 {
                     if (string_cmp_str(chunksArray[EChunkArrayData_Context], MODULE_CONTEXT_INITIALIZATION) == 0)
                     {
                         app->m_wifiModuleInitialized = true;
                         app->m_context = ScanAnimation;
                     }
+
                 }
                 else
                 {
@@ -667,10 +660,8 @@ int32_t wifi_scanner_app(void* p)
     furi_thread_start(app->m_worker_thread);
     WIFI_APP_LOG_I("UART thread allocated");
 
-#if !ENABLE_MODULE_POWER
     // Because we assume that module was on before we launched the app. We need to ensure that module will be in initial state on app start
     send_serial_command(ESerialCommand_Restart);
-#endif // ENABLE_MODULE_POWER
 
     SPluginEvent event; 
     for(bool processing = true; processing;) 
@@ -779,7 +770,7 @@ int32_t wifi_scanner_app(void* p)
                 {
                     if(event.m_input.key == InputKeyBack)
                     {
-                        if(event.m_input.type == InputTypeShort || event.m_input.type == InputTypeLong) //event.input.type == InputTypePress)
+                        if(event.m_input.type == InputTypeShort || event.m_input.type == InputTypeLong)
                         {
                             processing = false;
                         }

FlipperZero-WiFi-Scanner_Module/FlipperZero-WiFi-Scanner_Module.ino

@@ -10,6 +10,11 @@
 #include "DebugHelpers.h"
 #include "FlipperZeroWiFiModuleDefines.h"
 
+#if FLIPPERZERO_DEV_BOARD_V_1 && !ESP32
+Please_choose_ESP32S2_Dev_Module_from_Board_Manager
+#endif
+
+
 const uint16_t ASSOCIATIVE_INDEX_ARRAY_MAX_ELEMENTS = UCHAR_MAX + 1;
 uint8_t g_associativeIndexArray[ASSOCIATIVE_INDEX_ARRAY_MAX_ELEMENTS];
 
@@ -234,6 +239,11 @@ void ScanMode()
 }
 
 void setup() {
+#if ESP32 // For FlipperZero's Dev Module v.1
+  pinMode(17, OUTPUT);
+  digitalWrite(17, false);
+#endif
+  
   Serial.begin(FLIPPERZERO_SERIAL_BAUD);
   while (!Serial) {
     ; // wait for serial port to connect