Updates for esp32s2 build

meshtastic · Apr 21, 2024 · 2c902aa · 2c902aa
1 parent ac87c00
commit 2c902aa
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/arch/esp32/esp32s2.ini b/arch/esp32/esp32s2.ini
@@ -2,7 +2,7 @@
 extends = esp32_base
 
 build_src_filter = 
-  ${esp32_base.build_src_filter} -<nimble/> -<mesh/raspihttp>
+  ${esp32_base.build_src_filter} -<libpax/> -<nimble/> -<mesh/raspihttp>
 
 monitor_speed = 115200
 
@@ -12,4 +12,5 @@ build_flags =
 
 lib_ignore = 
   ${esp32_base.lib_ignore} 
-  NimBLE-Arduino
+  NimBLE-Arduino
+  libpax
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
@@ -721,7 +721,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
 #if HAS_BLUETOOTH
     conn.has_bluetooth = true;
     conn.bluetooth.pin = config.bluetooth.fixed_pin;
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2)
     conn.bluetooth.is_connected = nimbleBluetooth->isConnected();
     conn.bluetooth.rssi = nimbleBluetooth->getRssi();
 #elif defined(ARCH_NRF52)

diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
@@ -163,7 +163,7 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
         storeForwardModule = new StoreForwardModule();
 #endif
-#if !MESHTASTIC_EXCLUDE_PAXCOUNTER
+#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_PAXCOUNTER
         paxcounterModule = new PaxcounterModule();
 #endif
 #endif

diff --git a/src/modules/esp32/PaxcounterModule.cpp b/src/modules/esp32/PaxcounterModule.cpp
@@ -1,5 +1,5 @@
 #include "configuration.h"
-#if defined(ARCH_ESP32)
+#if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "Default.h"
 #include "MeshService.h"
 #include "PaxcounterModule.h"

diff --git a/src/modules/esp32/PaxcounterModule.h b/src/modules/esp32/PaxcounterModule.h
@@ -2,7 +2,7 @@
 
 #include "ProtobufModule.h"
 #include "configuration.h"
-#if defined(ARCH_ESP32)
+#if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "../mesh/generated/meshtastic/paxcount.pb.h"
 #include "NodeDB.h"
 #include <libpax_api.h>

diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
@@ -111,7 +111,7 @@ void esp32Setup()
     preferences.putUInt("rebootCounter", rebootCounter);
     preferences.end();
     LOG_DEBUG("Number of Device Reboots: %d\n", rebootCounter);
-#if !MESHTASTIC_EXCLUDE_BLUETOOTH
+#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_BLUETOOTH
     String BLEOTA = BleOta::getOtaAppVersion();
     if (BLEOTA.isEmpty()) {
         LOG_DEBUG("No OTA firmware available\n");

diff --git a/src/sleep.cpp b/src/sleep.cpp
@@ -211,7 +211,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
     // esp_wifi_stop();
     waitEnterSleep(skipPreflight);
 
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2)
     // Full shutdown of bluetooth hardware
     if (nimbleBluetooth)
         nimbleBluetooth->deinit();