Merge branch 'SlEggBotEL32Cfg' of https://git.sternenlabor.de/Sternenlabor/EggDuino into SlEggBotEL32Cfg

platformio.ini

@@ -12,21 +12,16 @@
 platform = platformio/espressif32
 board = esp32dev
 framework = arduino
-extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
-build_flags =
-	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
 monitor_speed = 115200
 upload_speed = 576000
 upload_port = /dev/ttyUSB*
-; FastAccelStepper 0.33+ requires newer ESP-IDF headers than the
-; espressif32 3.4.0 / Arduino 1.0.6 toolchain provides.
 lib_deps =
 	arminjo/ServoEasing
 	madhephaestus/ESP32Servo@^3.0.6
 	bblanchon/ArduinoJson@^6.21.5
-	gin66/FastAccelStepper@0.30.15
-	h2zero/NimBLE-Arduino@2.2.3
-	links2004/WebSockets@2.6.1
+	gin66/FastAccelStepper@^0.33.13
+	h2zero/NimBLE-Arduino@^2.3.6
+	links2004/WebSockets@^2.6.1
 
 [env:uno_windows]
 platform = platformio/espressif32
@@ -34,6 +29,7 @@ board = esp32dev
 framework = arduino
 extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
 build_flags =
+	-DEGGDUINO_WINDOWS_BUILD_FIXES=1
 	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
 monitor_speed = 115200
 monitor_port = COM*
@@ -52,17 +48,13 @@ lib_deps =
 platform = platformio/espressif32
 board = esp32dev
 framework = arduino
-extra_scripts = pre:scripts/patch_legacy_esp32_libs.py
-build_flags =
-	-include $PROJECT_INCLUDE_DIR/ArduinoEsp32Compat.h
 monitor_speed = 115200
 monitor_port = /dev/cu.usb*
 upload_port = /dev/cu.usb*
-; Keep this aligned with [env:uno] for Arduino-ESP32 1.0.6 compatibility.
 lib_deps =
 	arminjo/ServoEasing
 	madhephaestus/ESP32Servo@^3.0.6
 	bblanchon/ArduinoJson@^6.21.5
-	gin66/FastAccelStepper@0.30.15
-	h2zero/NimBLE-Arduino@2.2.3
-	links2004/WebSockets@2.6.1
+	gin66/FastAccelStepper@^0.33.13
+	h2zero/NimBLE-Arduino@^2.3.6
+	links2004/WebSockets@^2.6.1

src/esp_timer_compat.c

@@ -1,3 +1,4 @@
+#if defined(EGGDUINO_WINDOWS_BUILD_FIXES)
 #include <ArduinoEsp32Compat.h>
 
 #if defined(ESP32) && EGGDUINO_LEGACY_ARDUINO_ESP32
@@ -9,3 +10,4 @@ int esp_timer_is_active(esp_timer_handle_t timer)
     return 0;
 }
 #endif
+#endif