an attempt to fix ESP32-C6 build

lyusupov · Oct 21, 2024 · e858757 · e858757
1 parent 3a46bc6
commit e858757
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/software/firmware/source/SkyView/Platform_ESP32.cpp b/software/firmware/source/SkyView/Platform_ESP32.cpp
@@ -610,8 +610,12 @@ static void ESP32_setup()
   }
 #endif /* TBD */
 
+#else
+#if ARDUINO_USB_CDC_ON_BOOT && defined(CONFIG_IDF_TARGET_ESP32C6)
+  Serial.begin(SERIAL_OUT_BR);
 #else
   Serial.begin(SERIAL_OUT_BR, SERIAL_OUT_BITS);
+#endif /* CONFIG_IDF_TARGET_ESP32C6 */
 #endif /* ARDUINO_USB_CDC_ON_BOOT && (CONFIG_IDF_TARGET_ESP32S2 || S3) */
 }
 

diff --git a/software/firmware/source/SkyWatch/Platform_ESP32.cpp b/software/firmware/source/SkyWatch/Platform_ESP32.cpp
@@ -330,6 +330,7 @@ static void ESP32_setup()
     bool bma_present = false;
     bool rtc_present = false;
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
     Wire1.begin(SOC_GPIO_PIN_TWATCH_SEN_SDA , SOC_GPIO_PIN_TWATCH_SEN_SCL);
     Wire1.beginTransmission(AXP202_SLAVE_ADDRESS);
     axp_present = (Wire1.endTransmission() == 0);
@@ -386,6 +387,7 @@ static void ESP32_setup()
       rtc = new PCF8563_Class(*i2c);
       hw_info.rtc = RTC_PCF8563;
     }
+#endif /* CONFIG_IDF_TARGET_ESP32 */
   }
 
 #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6)

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -710,6 +710,7 @@ static void ESP32_setup()
     hw_info.rtc = RTC_PCF8563;
     hw_info.imu = ACC_BMA423;
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
     Wire1.begin(SOC_GPIO_PIN_TWATCH_SEN_SDA , SOC_GPIO_PIN_TWATCH_SEN_SCL);
     Wire1.beginTransmission(AXP202_SLAVE_ADDRESS);
     bool has_axp202 = (Wire1.endTransmission() == 0);
@@ -740,9 +741,11 @@ static void ESP32_setup()
     } else {
       WIRE_FINI(Wire1);
     }
+#endif /* CONFIG_IDF_TARGET_ESP32 */
   } else if (hw_info.model == SOFTRF_MODEL_PRIME_MK2) {
     esp32_board = ESP32_TTGO_T_BEAM;
 
+#if defined(CONFIG_IDF_TARGET_ESP32)
     Wire1.begin(TTGO_V2_OLED_PIN_SDA , TTGO_V2_OLED_PIN_SCL);
     Wire1.beginTransmission(AXP192_SLAVE_ADDRESS);
     bool has_axp = (Wire1.endTransmission() == 0);
@@ -828,6 +831,7 @@ static void ESP32_setup()
         hw_info.revision = 2;
       }
     }
+#endif /* CONFIG_IDF_TARGET_ESP32 */
     lmic_pins.rst  = SOC_GPIO_PIN_TBEAM_RF_RST_V05;
     lmic_pins.busy = SOC_GPIO_PIN_TBEAM_RF_BUSY_V08;
 #if defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -4354,7 +4358,9 @@ static bool ESP32_Baro_setup()
     /* Try out OLED I2C bus */
     Wire.begin(TTGO_V2_OLED_PIN_SDA, TTGO_V2_OLED_PIN_SCL);
     if (hw_info.model == SOFTRF_MODEL_PRIME_MK2 && hw_info.revision >= 8) {
+#if defined(CONFIG_IDF_TARGET_ESP32)
       Wire1 = Wire;
+#endif /* CONFIG_IDF_TARGET_ESP32 */
     }
     if (!Baro_probe()) {
       if (!(hw_info.model == SOFTRF_MODEL_PRIME_MK2 && hw_info.revision >= 8)) {

diff --git a/software/firmware/source/libraries/WiFiWebServer/src/WiFiWebServer.hpp b/software/firmware/source/libraries/WiFiWebServer/src/WiFiWebServer.hpp
@@ -176,15 +176,15 @@
 
 ////////////////////////////////////////
 
-#elif (ESP32)
+#elif defined(ESP32)
 
   #if (_WIFI_LOGLEVEL_ > 2)
     #warning Use ESP32 from WiFiWebServer
   #endif
 
 ////////////////////////////////////////
 
-#elif (ESP8266)
+#elif defined(ESP8266)
 
   #if (_WIFI_LOGLEVEL_ > 2)
     #warning Use ESP8266 from WiFiWebServer
@@ -272,7 +272,7 @@
 
 // KH, For PROGMEM commands
 // ESP32/ESP8266 includes <pgmspace.h> by default, and memccpy_P was already defined there
-#if !(ESP32 || ESP8266 || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4))
+#if !(defined(ESP32) || defined(ESP8266) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4))
   #include <avr/pgmspace.h>
   #define memccpy_P(dest, src, c, n) memccpy((dest), (src), (c), (n))
 #endif
@@ -389,7 +389,7 @@ typedef struct
 
 #include "utility/RequestHandler.h"
 
-#if (ESP32 || ESP8266)
+#if (defined(ESP32) || defined(ESP8266))
     #include "FS.h"
 #endif
 
@@ -400,7 +400,7 @@ class WiFiWebServer
 {
   public:
 
-#if (ESP32 || ESP8266)  
+#if (defined(ESP32) || defined(ESP8266))
     WiFiWebServer(IPAddress addr, int port = 80);
 #endif
 
@@ -551,7 +551,7 @@ class WiFiWebServer
 
 		////////////////////////////////////////
 
-#if !(ESP32 || ESP8266)
+#if !(defined(ESP32) || defined(ESP8266))
     template<typename T> size_t streamFile(T &file, const String& contentType) 
     {
       using namespace mime;
@@ -607,7 +607,7 @@ class WiFiWebServer
 
 		////////////////////////////////////////
 
-#if (ESP32 || ESP8266)		
+#if (defined(ESP32) || defined(ESP8266))
 		virtual size_t _currentClientWrite_P(PGM_P buffer, size_t length) 
 		{ 
 			return _currentClient.write_P( buffer, length ); 
@@ -638,7 +638,7 @@ class WiFiWebServer
     void          _prepareHeader(WWString& response, int code, const char* content_type, size_t contentLength);
     bool          _collectHeader(const char* headerName, const char* headerValue);
 
-#if (ESP32 || ESP8266)
+#if (defined(ESP32) || defined(ESP8266))
     void _streamFileCore(const size_t fileSize, const String & fileName, const String & contentType, const int code = 200);
 
 		////////////////////////////////////////