fixup preprocessor directives

esp32_marauder/CommandLine.cpp

@@ -270,12 +270,15 @@ void CommandLine::runCommand(String input) {
     #endif
   }
   // ls command
-  #ifdef HAS_SD
     else if (cmd_args.get(0) == LS_CMD) {
+      #ifdef HAS_SD
         if (cmd_args.size() > 1)
           sd_obj.listDir(cmd_args.get(1));
         else
           Serial.println("You did not provide a dir to list");
+      #else
+        Serial.println("SD support disabled, cannot use command");
+        return;
       }
   #endif
 
@@ -666,6 +669,7 @@ void CommandLine::runCommand(String input) {
       }
       // Update via SD
       else if (sd_sw != -1) {
+      #ifdef HAS_SD
           #ifndef WRITE_PACKETS_SERIAL
             if (!sd_obj.supported) {
               Serial.println("SD card is not connected. Cannot perform SD Update");
@@ -676,6 +680,10 @@ void CommandLine::runCommand(String input) {
           #else
             Serial.println("SD card not initialized. Cannot perform SD Update");
           #endif
+      #else
+        Serial.println("SD card support disabled. Cannot perform SD Update");
+        return;
+      #endif
       }
     }
   }

esp32_marauder/SDInterface.cpp

@@ -1,9 +1,8 @@
-#ifdef HAS_SD
-
 #include "SDInterface.h"
 #include "lang_var.h"
 
 bool SDInterface::initSD() {
+  #ifdef HAS_SD
     String display_string = "";
 
     #ifdef KIT
@@ -69,6 +68,11 @@
     
       return true;
   }
+
+  #else
+    Serial.println("SD support disabled, skipping init");
+    return false;
+  #endif
 }
 
 void SDInterface::listDir(String str_dir){
@@ -254,5 +258,3 @@
     }
   }
 }
-
-#endif

esp32_marauder/WiFiScan.cpp

@@ -580,8 +580,10 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("ap");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -809,7 +811,7 @@ void WiFiScan::RunInfo()
     #ifdef HAS_SCREEN
       display_obj.tft.println(text_table4[48]);
     #endif
-  #else
+  #elif defined(HAS_SD)
     if (sd_obj.supported) {
       #ifdef HAS_SCREEN
         display_obj.tft.println(text_table4[28]);
@@ -823,6 +825,8 @@ void WiFiScan::RunInfo()
         display_obj.tft.println(text_table4[31]);
       #endif
     }
+  #else
+    return;
   #endif
 
   #ifdef HAS_BATTERY
@@ -848,8 +852,10 @@ void WiFiScan::RunInfo()
 void WiFiScan::RunEspressifScan(uint8_t scan_mode, uint16_t color) {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("espressif");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -901,8 +907,10 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
 
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("packet_monitor");
+  #else
+    return;
   #endif
 
   #ifdef HAS_ILI9341
@@ -1020,8 +1028,10 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
   #else
     #ifdef WRITE_PACKETS_SERIAL
       buffer_obj.open();
-    #else
+    #elif defined(HAS_SD)
       sd_obj.openCapture("eapol");
+    #else
+      return;
     #endif
     
     #ifdef HAS_SCREEN
@@ -1119,8 +1129,10 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("pwnagotchi");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -1165,8 +1177,10 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("beacon");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -1210,8 +1224,10 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("station");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -1255,9 +1271,11 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     if (scan_mode != WIFI_SCAN_SIG_STREN)
       sd_obj.openCapture("raw");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -1304,8 +1322,10 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("deauth");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -1351,8 +1371,10 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
 {
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj.open();
-  #else
+  #elif defined(HAS_SD)
     sd_obj.openCapture("probe");
+  #else
+    return;
   #endif
 
   #ifdef MARAUDER_FLIPPER
@@ -3209,8 +3231,10 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
   if (save_packet) {
     #ifdef WRITE_PACKETS_SERIAL
       buffer_obj.addPacket(snifferPacket->payload, len);
-    #else
+    #elif defined(HAS_SD)
       sd_obj.addPacket(snifferPacket->payload, len);
+    #else
+      return;
     #endif
   }
 }

esp32_marauder/WiFiScan.h

@@ -38,11 +38,9 @@
 #include "Assets.h"
 #ifdef MARAUDER_FLIPPER
   #include "flipperLED.h"
-#endif
-#ifdef XIAO_ESP32_S3
+#elif defined(XIAO_ESP32_S3)
   #include "xiaoLED.h"
-#endif
-#ifndef MARAUDER_FLIPPER || XIAO_ESP32_S3
+#else
   #include "LedInterface.h"
 #endif
 //#include "MenuFunctions.h"

esp32_marauder/esp32_marauder.ino

@@ -116,7 +116,6 @@ CommandLine cli_obj;
 #endif
 
 const String PROGMEM version_number = MARAUDER_VERSION;
-const String PROGMEM board_target = MARAUDER_TARGET;
 
 #ifdef HAS_NEOPIXEL_LED
   Adafruit_NeoPixel strip = Adafruit_NeoPixel(Pixels, PIN, NEO_GRB + NEO_KHZ800);
@@ -267,7 +266,7 @@ void setup()
 
   #ifdef WRITE_PACKETS_SERIAL
     buffer_obj = Buffer();
-  #else
+  #elif defined(HAS_SD)
     // Do some SD stuff
     if(sd_obj.initSD()) {
       #ifdef HAS_SCREEN
@@ -281,6 +280,8 @@ void setup()
         display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
       #endif
     }
+  #else
+    return;
   #endif
 
   #ifdef HAS_BATTERY
@@ -374,8 +375,10 @@ void loop()
 
     #ifdef WRITE_PACKETS_SERIAL
       buffer_obj.forceSaveSerial();
-    #else
+    #elif defined(HAS_SD)
       sd_obj.main();
+    #else
+      return;
     #endif
 
     #ifdef HAS_BATTERY