Added ESP32 support

Author: SequoiaSan

FlipperZero-WiFi-Scanner_Module-ESP8266/.gitattributes

@@ -0,0 +1,31 @@
+class PerfTimer
+{
+  public:
+    PerfTimer(const char* debugName) : m_debugName(debugName)
+    {
+      m_startTime = millis();
+    }
+  
+    ~PerfTimer()
+    {
+      char buffer[128];
+      sprintf(buffer, "[%s] %ul millis", m_debugName, millis() - m_startTime);
+      Serial.println();
+      Serial.println(buffer);
+    }
+
+  private:
+    unsigned long m_startTime = 0;
+    const char* m_debugName;
+};
+
+
+#ifdef DEBUG
+#define DEBUG_LOG(text) Serial.print(text)
+#define DEBUG_LOG_LN(text) Serial.println(text)
+#define FUNCTION_PERF() PerfTimer perfTimer(__FUNCTION__)
+#else
+#define DEBUG_LOG(text) 
+#define DEBUG_LOG_LN(text)
+#define FUNCTION_PERF()
+#endif

FlipperZero-WiFi-Scanner_Module-ESP8266/DebugHelpers.h

@@ -1,6 +1,11 @@
 //#define DEBUG
 
-#include "ESP8266WiFi.h"
+#if ESP8266
+#include <ESP8266WiFi.h>
+#else // ESP32
+#include <WiFi.h>
+#endif
+
 #include "DebugHelpers.h"
 #include "FlipperZeroWiFiModuleDefines.h"
 
@@ -77,23 +82,45 @@ void ChangeContext(EContext context)
   }
 }
 
-const char* EncryptionTypeToString(short encType)
+const char* EncryptionTypeToString(uint8_t encType)
 {
+#if ESP8266
   switch(encType)
   {
-    case 5:
+    case ENC_TYPE_WEP:
       return "WEP";
-    case 2:
+    case ENC_TYPE_TKIP:
       return "TKIP";
-    case 4:
+    case ENC_TYPE_CCMP:
       return "CCMP";
-    case 7:
-      return "NONE";
-    case 8:
+    case ENC_TYPE_NONE:
+      return "OPEN";
+    case ENC_TYPE_AUTO:
       return "AUTO";
     default:
       return "FAIL";
   }
+#elif ESP32
+  switch(encType)
+  {
+    case WIFI_AUTH_OPEN:
+      return "OPEN";
+    case WIFI_AUTH_WEP:
+      return "WEP";
+    case WIFI_AUTH_WPA_PSK:
+      return "WPA";
+    case WIFI_AUTH_WPA2_PSK:
+      return "WPA2";
+    case WIFI_AUTH_WPA_WPA2_PSK:
+      return "WP1/2";
+    case WIFI_AUTH_WPA2_ENTERPRISE:
+      return "WPA2 E";
+    default:
+      return "FAIL";
+  }
+#else
+  return "FAIL";
+#endif
 }
 
 void SendError(const char* str)
@@ -103,6 +130,8 @@ void SendError(const char* str)
 
 void SerilizeAndSend(EContext context, const SScanInfoDisplay& scanInfo)
 {
+  FUNCTION_PERF();
+  
   char serilizedData[150];
   sprintf(serilizedData, "%s+%s+%s+%d+%s+%u+%u+%u+%u",
     ContextToString(context),
@@ -137,11 +166,13 @@ void UnlockAP()
 
 bool FindLockedAP(int& foundAPIndex)
 {
+  FUNCTION_PERF();
+  
   if(IsAnyAPLocked())
   {
     for(int i = 0; i < g_totalAp; ++i)
     {
-      if(strcmp(g_bssid.c_str(), WiFi.BSSIDstr(i).c_str()) == 0)
+      if(g_bssid.equals(WiFi.BSSIDstr(i)))
       {
         foundAPIndex = i;
         return true;
@@ -198,29 +229,6 @@ void NextAP()
   DEBUG_LOG_LN(g_currentNetworkIndex);
 }
 
-void ChangeBetweenMonitorAndScanMode() 
-{
-  DEBUG_LOG_LN(F("ChangeBetweenMonitorAndScanMode"));
-
-  if(g_context != EContext::SCAN_PAGE)
-  {
-    return;
-  }
-  
-  DEBUG_LOG_LN(F("ChangeBetweenMonitorAndScanMode processing"));
-  
-  switch(g_context)
-  {
-    case SCAN_PAGE:
-      LockAP();
-      MonitorNetwork();
-      ChangeContext(EContext::MONITOR_ANIMATION);
-      break;
-    default:
-      break;  
-  }
-}
-
 void setup() {
   Serial.begin(115200);
   while (!Serial) {
@@ -237,7 +245,24 @@ void setup() {
   ScanNetworks();
 }
 
-void OnScanComplete(int totalAps)
+bool GetNetworkInfo(const uint8_t currentAp, String& ssid, uint8_t& encType, int32_t& rssi, String& bssid, int32_t& channel, bool& isHidden)
+{
+  FUNCTION_PERF();
+  
+#if ESP8266
+  uint8_t* fake_BSSID;
+  bssid = WiFi.BSSIDstr(currentAp);
+  return WiFi.getNetworkInfo(currentAp, ssid, encType, rssi, fake_BSSID, channel, isHidden);
+#elif ESP32
+  uint8_t* fake_BSSID;
+  bssid = WiFi.BSSIDstr(currentAp);
+  const bool result = WiFi.getNetworkInfo(currentAp, ssid, encType, rssi, fake_BSSID, channel);
+  isHidden = ssid.length() == 0 ? true : false;
+  return result;
+#endif
+}
+
+void OnScanComplete(int16_t totalAps)
 {
   g_totalAp = totalAps;
   g_currentNetworkIndex = 0;
@@ -249,14 +274,15 @@ void OnScanComplete(int totalAps)
   else
   {
     DEBUG_LOG_LN(F("No APs found. Scan again."));
-    SendError("No APs found. Scan again.");
-    //scannerDisplay.DisplayError("No APs found. Scan again.");
-    ChangeContext(EContext::ERROR);
+    ScanNetworks();
+    //SendError("No APs found. Scan again.");
+    //ChangeContext(EContext::ERROR);
   }  
 }
 
-void OnMonScanComplete(int totalAps)
+void OnMonScanComplete(int16_t totalAps)
 {
+  FUNCTION_PERF();
   DEBUG_LOG_LN(F("DisplayMonitorInfo()"));
 
   g_totalAp = totalAps;
@@ -272,14 +298,13 @@ void OnMonScanComplete(int totalAps)
     {
       scanInfo.m_currentAp = foundAp;
 
-      uint8_t* bssid_fake;
-      if(WiFi.getNetworkInfo(scanInfo.m_currentAp, scanInfo.m_ssid, scanInfo.m_encryptionType, scanInfo.m_rssi, bssid_fake, scanInfo.m_channel, scanInfo.m_isHidden))
+      if(GetNetworkInfo(scanInfo.m_currentAp, scanInfo.m_ssid, scanInfo.m_encryptionType, scanInfo.m_rssi, scanInfo.m_bssid, scanInfo.m_channel, scanInfo.m_isHidden))
       {
         SerilizeAndSend(EContext::MONITOR_PAGE, scanInfo);
       }
       else
       {
-        DEBUG_LOG_LN(F("WiFi.getNetworkInfo() - Failed"));
+        DEBUG_LOG_LN(F("GetNetworkInfo() - Failed"));
         scanInfo.m_rssi = NA;
         SerilizeAndSend(EContext::MONITOR_PAGE, scanInfo);
       }
@@ -308,21 +333,65 @@ void ScanNetworks()
   DEBUG_LOG_LN(F("ScanNetworks()"));
 
   WiFi.scanDelete();
+  
+  const bool async = true;
   const bool showHidden = true;
-  WiFi.scanNetworksAsync(OnScanComplete, showHidden);
+  WiFi.scanNetworks(async, showHidden);
 
   ChangeContext(EContext::SCAN_ANIMATION);
 }
 
-bool MonitorNetwork()
+bool MonitorNetwork(const bool firstRun = true)
 {
-  if(WiFi.scanComplete() >= 0)
+  int16_t scanResult = WiFi.scanComplete();
+  if(scanResult != WIFI_SCAN_RUNNING)
   {
     DEBUG_LOG_LN(F("MonitorNetwork()"));
 
+    if(firstRun)
+    {
+      OnMonScanComplete(scanResult);
+    }
+    
     WiFi.scanDelete();
+    const bool async = true;
     const bool showHidden = true;
-    WiFi.scanNetworksAsync(OnMonScanComplete, showHidden);
+    WiFi.scanNetworks(async, showHidden);
+  }
+}
+
+void CheckScanComplition()
+{
+  int16_t scanResult = WiFi.scanComplete();
+  if(scanResult != WIFI_SCAN_RUNNING)
+  {
+    OnScanComplete(scanResult);
+  }  
+}
+
+void ChangeBetweenMonitorAndScanMode() 
+{
+  DEBUG_LOG_LN(F("ChangeBetweenMonitorAndScanMode"));
+
+  if(g_context != EContext::SCAN_PAGE)
+  {
+    return;
+  }
+  
+  DEBUG_LOG_LN(F("ChangeBetweenMonitorAndScanMode processing"));
+  
+  switch(g_context)
+  {
+    case SCAN_PAGE:
+    {
+      LockAP();
+      const bool firstRun = false;
+      MonitorNetwork(firstRun);
+      ChangeContext(EContext::MONITOR_ANIMATION);
+    }
+      break;
+    default:
+      break;  
   }
 }
 
@@ -336,10 +405,8 @@ void DisplayScannedAP()
     SScanInfoDisplay scanInfo;
     scanInfo.m_currentAp = g_currentNetworkIndex + 1;
     scanInfo.m_totalAp = g_totalAp;
-    scanInfo.m_bssid = WiFi.BSSIDstr(scanInfo.m_currentAp);
-    
-    uint8_t* bssid_fake;
-    if(WiFi.getNetworkInfo(g_currentNetworkIndex, scanInfo.m_ssid, scanInfo.m_encryptionType, scanInfo.m_rssi, bssid_fake, scanInfo.m_channel, scanInfo.m_isHidden))
+
+    if(GetNetworkInfo(g_currentNetworkIndex, scanInfo.m_ssid, scanInfo.m_encryptionType, scanInfo.m_rssi, scanInfo.m_bssid, scanInfo.m_channel, scanInfo.m_isHidden))
     {
       SerilizeAndSend(EContext::SCAN_PAGE, scanInfo);
     }  
@@ -355,6 +422,8 @@ void CheckForFlipperCommands()
 {
   while(Serial.available() > 0)
   {
+    FUNCTION_PERF();
+    
     int incommingCommand = Serial.read();
     if(g_context >= EContext::SCAN_PAGE)
     {
@@ -400,8 +469,10 @@ void loop()
       MonitorNetwork();
       break;
     case EContext::SCAN_ANIMATION:
+      CheckScanComplition();
       break;
     case EContext::MONITOR_ANIMATION:
+      MonitorNetwork();
       break;
     case EContext::ERROR:
       break;