Skip to content

Commit 1289141

Browse files
🩹 Fix ESP3D WiFi, bump config version (MarlinFirmware#27025)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 18288ce commit 1289141

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Marlin/Configuration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* Advanced settings can be found in Configuration_adv.h
3737
*/
38-
#define CONFIGURATION_H_VERSION 02010202
38+
#define CONFIGURATION_H_VERSION 02010203
3939

4040
//===========================================================================
4141
//============================= Getting Started =============================

Marlin/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* Basic settings can be found in Configuration.h
3232
*/
33-
#define CONFIGURATION_ADV_H_VERSION 02010202
33+
#define CONFIGURATION_ADV_H_VERSION 02010203
3434

3535
// @section develop
3636

@@ -4083,7 +4083,7 @@
40834083
* Extras for an ESP32-based motherboard with WIFISUPPORT
40844084
* These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
40854085
*/
4086-
#if ENABLED(WIFISUPPORT)
4086+
#if ANY(WIFISUPPORT, ESP3D_WIFISUPPORT)
40874087
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery) using SPIFFS
40884088
//#define OTASUPPORT // Support over-the-air firmware updates
40894089
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host

Marlin/src/inc/SanityCheck.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3679,11 +3679,11 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
36793679
#if !(defined(WIFI_SSID) && defined(WIFI_PWD))
36803680
#error "ESP32 motherboard with WIFISUPPORT requires WIFI_SSID and WIFI_PWD."
36813681
#endif
3682-
#elif ENABLED(WIFI_CUSTOM_COMMAND)
3682+
#elif ENABLED(WIFI_CUSTOM_COMMAND) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
36833683
#error "WIFI_CUSTOM_COMMAND requires an ESP32 motherboard and WIFISUPPORT."
3684-
#elif ENABLED(OTASUPPORT)
3684+
#elif ENABLED(OTASUPPORT) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
36853685
#error "OTASUPPORT requires an ESP32 motherboard and WIFISUPPORT."
3686-
#elif defined(WIFI_SSID) || defined(WIFI_PWD)
3686+
#elif (defined(WIFI_SSID) || defined(WIFI_PWD)) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
36873687
#error "WIFI_SSID and WIFI_PWD only apply to ESP32 motherboard with WIFISUPPORT."
36883688
#endif
36893689

Marlin/src/inc/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
* to alert users to major changes.
5353
*/
5454

55-
#define MARLIN_HEX_VERSION 02010202
55+
#define MARLIN_HEX_VERSION 02010203
5656
#ifndef REQUIRED_CONFIGURATION_H_VERSION
5757
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
5858
#endif

0 commit comments

Comments
 (0)