Fix has display for pwn scan

justcallmekoko · Nov 19, 2024 · 4b4055d · 4b4055d
1 parent 925a8d6
commit 4b4055d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -223,6 +223,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder Flipper bin
         run: |
@@ -234,6 +236,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=enabled
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder Multi Board bin
         run: |
@@ -263,6 +267,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename OG Marauder bin
         run: |
@@ -307,6 +313,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename v6 Marauder bin
         run: |
@@ -331,6 +339,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename v6 Marauder bin
         run: |
@@ -357,6 +367,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder Kit bin
         run: |
@@ -383,6 +395,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder Mini bin
         run: |
@@ -407,6 +421,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder ESP32 LDDB bin
         run: |
@@ -431,6 +447,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder for Marauder Dev Board Pro
         run: |
@@ -460,6 +478,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:m5stick-c:PartitionScheme=min_spiffs
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder M5StickC bin
         run: |
@@ -490,6 +510,8 @@ jobs:
           sketch-names: esp32_marauder.ino
           arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled
           extra-arduino-cli-args: "--warnings none"
+          arduino-platform: esp32:[email protected]
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json
 
       - name: Rename Marauder Marauder Rev Feather
         run: |

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
@@ -3035,15 +3035,18 @@ String WiFiScan::processPwnagotchiBeacon(const uint8_t* frame, int length) {
     Serial.print("Pwnd Totals: ");
     Serial.println(pwnd_tot);
 
-    display_obj.display_buffer->add(String("Pwnagotchi: ") + name + ",                 ");
-    display_obj.display_buffer->add("      Pwnd: " + String(pwnd_tot) + ",             ");
-    display_obj.display_buffer->add("    Uptime: " + String(uptime) + ",               ");
-    if (deauth)
-      display_obj.display_buffer->add("    Deauth: true,                       ");
-    else
-      display_obj.display_buffer->add("    Deauth: false,                      ");
+    #ifdef HAS_SCREEN
 
-    display_obj.display_buffer->add(String("       Ver: ") + ver + "                   ");
+      display_obj.display_buffer->add(String("Pwnagotchi: ") + name + ",                 ");
+      display_obj.display_buffer->add("      Pwnd: " + String(pwnd_tot) + ",             ");
+      display_obj.display_buffer->add("    Uptime: " + String(uptime) + ",               ");
+      if (deauth)
+        display_obj.display_buffer->add("    Deauth: true,                       ");
+      else
+        display_obj.display_buffer->add("    Deauth: false,                      ");
+
+      display_obj.display_buffer->add(String("       Ver: ") + ver + "                   ");
+    #endif
 
     return String("Pwnagotchi: ") + name + ", \nPwnd: " + String(pwnd_tot) + ", \nVer: " + ver;
   } else {