Fix for arduino-esp32 v2.x.x

qqqlab · Jun 12, 2024 · f673e71 · f673e71
1 parent 5fb710a
commit f673e71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/madflight.h b/src/madflight.h
@@ -1,4 +1,4 @@
-#define MADFLIGHT_VERSION "madflight v1.1.3"
+#define MADFLIGHT_VERSION "madflight v1.1.4-DEV"
 
 /*==========================================================================================
 madflight - Flight Controller for ESP32 / RP2040 / STM32

diff --git a/src/madflight/hw_ESP32/ESP32_SoftWire.h b/src/madflight/hw_ESP32/ESP32_SoftWire.h
@@ -139,6 +139,7 @@ SOFTWARE.
 //-----------------------------------------------------------------------------------------
 
 #include "ESP32_SoftWire.h"
+#include <soc/gpio_struct.h>
 
 #define SDA_HI() GPIO.out_w1ts = _sda_mask // Do not drive SDA (set pin high-impedance)
 #define SDA_LO() GPIO.out_w1tc = _sda_mask // Actively drive SDA signal low

diff --git a/src/madflight/hw_ESP32/hw_ESP32.h b/src/madflight/hw_ESP32/hw_ESP32.h
@@ -11,7 +11,9 @@ This file defines:
   HW_xxx and hw_xxx -> all other hardware platform specific stuff
 ########################################################################################################################*/
 
-#define HW_ARDUINO_STR "Arduino-ESP32 v" ESP_ARDUINO_VERSION_STR
+#define mf_df2xstr(s)              #s
+#define mf_df2str(s)               mf_df2xstr(s)
+#define HW_ARDUINO_STR "Arduino-ESP32 v" mf_df2str(ESP_ARDUINO_VERSION_MAJOR) "." mf_df2str(ESP_ARDUINO_VERSION_MINOR) "." mf_df2str(ESP_ARDUINO_VERSION_PATCH)
 
 //======================================================================================================================//
 //                    DEFAULT BOARD