Skip to content

Commit a14d9e1

Browse files
thinkyheadernisv
thinkyhead
authored and
ernisv
committed
🔧 Fix up WiFi options (MarlinFirmware#25586)
1 parent 72ab8c4 commit a14d9e1

17 files changed

+217
-183
lines changed

‎Marlin/src/HAL/ESP32/HAL.h

+6-8
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@
5050

5151
#define MYSERIAL1 flushableSerial
5252

53-
#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
54-
#if ENABLED(ESP3D_WIFISUPPORT)
55-
typedef ForwardSerial1Class< decltype(Serial2Socket) > DefaultSerial1;
56-
extern DefaultSerial1 MSerial0;
57-
#define MYSERIAL2 MSerial0
58-
#else
59-
#define MYSERIAL2 webSocketSerial
60-
#endif
53+
#if ENABLED(ESP3D_WIFISUPPORT)
54+
typedef ForwardSerial1Class< decltype(Serial2Socket) > DefaultSerial1;
55+
extern DefaultSerial1 MSerial0;
56+
#define MYSERIAL2 MSerial0
57+
#elif ENABLED(WIFISUPPORT)
58+
#define MYSERIAL2 webSocketSerial
6159
#endif
6260

6361
#define CRITICAL_SECTION_START() portENTER_CRITICAL(&hal.spinlock)

‎Marlin/src/HAL/shared/esp_wifi.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
*/
2222

2323
#include "../../inc/MarlinConfig.h"
24+
25+
#if ENABLED(WIFISUPPORT)
26+
2427
#include "Delay.h"
2528

2629
void esp_wifi_init(void) { // init ESP01 WIFI module pins
@@ -41,3 +44,5 @@ void esp_wifi_init(void) { // init ESP01 WIFI module pi
4144
OUT_WRITE(ESP_WIFI_MODULE_ENABLE_PIN, HIGH);
4245
#endif
4346
}
47+
48+
#endif // WIFISUPPORT

‎Marlin/src/MarlinCore.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
#include "HAL/shared/esp_wifi.h"
3535
#include "HAL/shared/cpu_exception/exception_hook.h"
3636

37+
#if ENABLED(WIFISUPPORT)
38+
#include "HAL/shared/esp_wifi.h"
39+
#endif
40+
3741
#ifdef ARDUINO
3842
#include <pins_arduino.h>
3943
#endif
@@ -1268,7 +1272,9 @@ void setup() {
12681272

12691273
SETUP_RUN(hal.init_board());
12701274

1271-
SETUP_RUN(esp_wifi_init());
1275+
#if ENABLED(WIFISUPPORT)
1276+
SETUP_RUN(esp_wifi_init());
1277+
#endif
12721278

12731279
// Report Reset Reason
12741280
if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);

‎Marlin/src/inc/SanityCheck.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -4166,10 +4166,14 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
41664166
#endif
41674167

41684168
/**
4169-
* Sanity check for WIFI
4169+
* Sanity check WiFi options
41704170
*/
4171-
#if EITHER(ESP3D_WIFISUPPORT, WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32)
4172-
#error "ESP3D_WIFISUPPORT or WIFISUPPORT requires an ESP32 MOTHERBOARD."
4171+
#if ENABLED(ESP3D_WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32)
4172+
#error "ESP3D_WIFISUPPORT requires an ESP32 MOTHERBOARD."
4173+
#elif ENABLED(WEBSUPPORT) && NONE(ARDUINO_ARCH_ESP32, WIFISUPPORT)
4174+
#error "WEBSUPPORT requires WIFISUPPORT and an ESP32 MOTHERBOARD."
4175+
#elif BOTH(ESP3D_WIFISUPPORT, WIFISUPPORT)
4176+
#error "Enable only one of ESP3D_WIFISUPPORT or WIFISUPPORT."
41734177
#endif
41744178

41754179
/**

‎Marlin/src/pins/sam/pins_RURAMPS4D_11.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,13 @@
163163
#define TFT_LCD_MODULE_COM 1
164164
#define TFT_LCD_MODULE_BAUDRATE 115600
165165

166-
// ESP WiFi Use internal USART-2
167-
#define ESP_WIFI_MODULE_COM 2
168-
#define ESP_WIFI_MODULE_BAUDRATE 115600
169-
#define ESP_WIFI_MODULE_RESET_PIN -1
170-
#define PIGGY_GPIO_PIN -1
166+
#if ENABLED(WIFISUPPORT)
167+
// ESP WiFi Use internal USART-2
168+
#define ESP_WIFI_MODULE_COM 2
169+
#define ESP_WIFI_MODULE_BAUDRATE 115600
170+
#define ESP_WIFI_MODULE_RESET_PIN -1
171+
#define PIGGY_GPIO_PIN -1
172+
#endif
171173

172174
//
173175
// EEPROM

‎Marlin/src/pins/sam/pins_RURAMPS4D_13.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,13 @@
153153
#define TFT_LCD_MODULE_COM 1
154154
#define TFT_LCD_MODULE_BAUDRATE 115200
155155

156-
// ESP WiFi Use internal USART-2
157-
#define ESP_WIFI_MODULE_COM 2
158-
#define ESP_WIFI_MODULE_BAUDRATE 115200
159-
#define ESP_WIFI_MODULE_RESET_PIN -1
160-
#define PIGGY_GPIO_PIN -1
156+
#if ENABLED(WIFISUPPORT)
157+
// ESP WiFi Use internal USART-2
158+
#define ESP_WIFI_MODULE_COM 2
159+
#define ESP_WIFI_MODULE_BAUDRATE 115200
160+
#define ESP_WIFI_MODULE_RESET_PIN -1
161+
#define PIGGY_GPIO_PIN -1
162+
#endif
161163

162164
//
163165
// EEPROM

‎Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h

+23-21
Original file line numberDiff line numberDiff line change
@@ -138,27 +138,29 @@
138138
#define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
139139
#endif
140140

141-
/**
142-
* MKS Robin_Wifi or another ESP8266 module
143-
*
144-
* __ESP(M1)__ -J1-
145-
* GND| 15 | | 08 |+3v3 (22) RXD1 (PA10)
146-
* | 16 | | 07 |MOSI (21) TXD1 (PA9) Active LOW, probably OK to leave floating
147-
* IO2| 17 | | 06 |MISO (19) IO1 (PC7) Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
148-
* IO0| 18 | | 05 |CLK (18) IO0 (PA8) Must be HIGH (ESP3D software configures this with a pullup so OK to leave as floating)
149-
* IO1| 19 | | 03 |EN (03) WIFI_EN Must be HIGH for module to run
150-
* | nc | | nc | (01) WIFI_CTRL (PA5)
151-
* RX| 21 | | nc |
152-
* TX| 22 | | 01 |RST
153-
* ￣￣ AE￣￣
154-
*/
155-
// Module ESP-WIFI
156-
#define ESP_WIFI_MODULE_COM 2 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
157-
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
158-
#define ESP_WIFI_MODULE_RESET_PIN PA5 // WIFI CTRL/RST
159-
#define ESP_WIFI_MODULE_ENABLE_PIN -1
160-
#define ESP_WIFI_MODULE_TXD_PIN PA9 // MKS or ESP WIFI RX PIN
161-
#define ESP_WIFI_MODULE_RXD_PIN PA10 // MKS or ESP WIFI TX PIN
141+
#if ENABLED(WIFISUPPORT)
142+
/**
143+
* MKS Robin_Wifi or another ESP8266 module
144+
*
145+
* __ESP(M1)__ -J1-
146+
* GND| 15 | | 08 |+3v3 (22) RXD1 (PA10)
147+
* | 16 | | 07 |MOSI (21) TXD1 (PA9) Active LOW, probably OK to leave floating
148+
* IO2| 17 | | 06 |MISO (19) IO1 (PC7) Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
149+
* IO0| 18 | | 05 |CLK (18) IO0 (PA8) Must be HIGH (ESP3D software configures this with a pullup so OK to leave as floating)
150+
* IO1| 19 | | 03 |EN (03) WIFI_EN Must be HIGH for module to run
151+
* | nc | | nc | (01) WIFI_CTRL (PA5)
152+
* RX| 21 | | nc |
153+
* TX| 22 | | 01 |RST
154+
* ￣￣ AE￣￣
155+
*/
156+
// Module ESP-WIFI
157+
#define ESP_WIFI_MODULE_COM 2 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
158+
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
159+
#define ESP_WIFI_MODULE_RESET_PIN PA5 // WIFI CTRL/RST
160+
#define ESP_WIFI_MODULE_ENABLE_PIN -1
161+
#define ESP_WIFI_MODULE_TXD_PIN PA9 // MKS or ESP WIFI RX PIN
162+
#define ESP_WIFI_MODULE_RXD_PIN PA10 // MKS or ESP WIFI TX PIN
163+
#endif
162164
#endif
163165

164166
//

‎Marlin/src/pins/stm32f1/pins_GTM32_MINI.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,11 @@
226226

227227
#define SDSS SD_SS_PIN
228228

229-
//
230-
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
231-
// Must define WIFISUPPORT in Configuration.h for the printer.
232-
//
233-
#define ESP_WIFI_MODULE_COM 2
234-
#define ESP_WIFI_MODULE_BAUDRATE 115200
235-
#define ESP_WIFI_MODULE_RESET_PIN -1
229+
#if ENABLED(WIFISUPPORT)
230+
//
231+
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
232+
//
233+
#define ESP_WIFI_MODULE_COM 2
234+
#define ESP_WIFI_MODULE_BAUDRATE 115200
235+
#define ESP_WIFI_MODULE_RESET_PIN -1
236+
#endif

‎Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,11 @@
220220

221221
#define SDSS SD_SS_PIN
222222

223-
//
224-
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
225-
// Must define WIFISUPPORT in Configuration.h for the printer.
226-
//
227-
#define ESP_WIFI_MODULE_COM 2
228-
#define ESP_WIFI_MODULE_BAUDRATE 115200
229-
#define ESP_WIFI_MODULE_RESET_PIN -1
223+
#if ENABLED(WIFISUPPORT)
224+
//
225+
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
226+
//
227+
#define ESP_WIFI_MODULE_COM 2
228+
#define ESP_WIFI_MODULE_BAUDRATE 115200
229+
#define ESP_WIFI_MODULE_RESET_PIN -1
230+
#endif

‎Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,11 @@
231231

232232
#define SDSS SD_SS_PIN
233233

234-
//
235-
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
236-
// Must define WIFISUPPORT in Configuration.h for the printer.
237-
//
238-
#define ESP_WIFI_MODULE_COM 2
239-
#define ESP_WIFI_MODULE_BAUDRATE 115200
240-
#define ESP_WIFI_MODULE_RESET_PIN -1
234+
#if ENABLED(WIFISUPPORT)
235+
//
236+
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
237+
//
238+
#define ESP_WIFI_MODULE_COM 2
239+
#define ESP_WIFI_MODULE_BAUDRATE 115200
240+
#define ESP_WIFI_MODULE_RESET_PIN -1
241+
#endif

‎Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,11 @@
223223

224224
#define SDSS SD_SS_PIN
225225

226-
//
227-
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
228-
// Must define WIFISUPPORT in Configuration.h for the printer.
229-
//
230-
#define ESP_WIFI_MODULE_COM 2
231-
#define ESP_WIFI_MODULE_BAUDRATE 115200
232-
#define ESP_WIFI_MODULE_RESET_PIN -1
226+
#if ENABLED(WIFISUPPORT)
227+
//
228+
// ESP WiFi can be soldered to J9 connector which is wired to USART2.
229+
//
230+
#define ESP_WIFI_MODULE_COM 2
231+
#define ESP_WIFI_MODULE_BAUDRATE 115200
232+
#define ESP_WIFI_MODULE_RESET_PIN -1
233+
#endif

‎Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h

+10-9
Original file line numberDiff line numberDiff line change
@@ -390,15 +390,16 @@
390390
#error "SD CUSTOM_CABLE is not compatible with BTT E3 RRF."
391391
#endif
392392

393-
//
394-
// WIFI
395-
//
396-
397-
#define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
398-
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
399-
#define ESP_WIFI_MODULE_RESET_PIN PA4
400-
#define ESP_WIFI_MODULE_ENABLE_PIN PA5
401-
#define ESP_WIFI_MODULE_GPIO0_PIN PA6
393+
#if ENABLED(WIFISUPPORT)
394+
//
395+
// WIFI
396+
//
397+
#define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
398+
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
399+
#define ESP_WIFI_MODULE_RESET_PIN PA4
400+
#define ESP_WIFI_MODULE_ENABLE_PIN PA5
401+
#define ESP_WIFI_MODULE_GPIO0_PIN PA6
402+
#endif
402403

403404
#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
404405
#define FPC2_PIN PB11

‎Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

+24-22
Original file line numberDiff line numberDiff line change
@@ -544,26 +544,28 @@
544544
#define NEOPIXEL_PIN PB0
545545
#endif
546546

547-
//
548-
// WIFI
549-
//
547+
#if ENABLED(WIFISUPPORT)
548+
//
549+
// WIFI
550+
//
550551

551-
/**
552-
* -------
553-
* GND | 9 | | 8 | 3.3V
554-
* (ESP-CS) PB12 | 10 | | 7 | PB15 (ESP-MOSI)
555-
* 3.3V | 11 | | 6 | PB14 (ESP-MISO)
556-
* (ESP-IO0) PD7 | 12 | | 5 | PB13 (ESP-CLK)
557-
* (ESP-IO4) PD10 | 13 | | 4 | --
558-
* -- | 14 | | 3 | PE15 (ESP-EN)
559-
* (ESP-RX) PD8 | 15 | | 2 | --
560-
* (ESP-TX) PD9 | 16 | | 1 | PE14 (ESP-RST)
561-
* -------
562-
* WIFI
563-
*/
564-
#define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
565-
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
566-
#define ESP_WIFI_MODULE_RESET_PIN PG7
567-
#define ESP_WIFI_MODULE_ENABLE_PIN PG8
568-
#define ESP_WIFI_MODULE_GPIO0_PIN PD7
569-
#define ESP_WIFI_MODULE_GPIO4_PIN PD10
552+
/**
553+
* -------
554+
* GND | 9 | | 8 | 3.3V
555+
* (ESP-CS) PB12 | 10 | | 7 | PB15 (ESP-MOSI)
556+
* 3.3V | 11 | | 6 | PB14 (ESP-MISO)
557+
* (ESP-IO0) PD7 | 12 | | 5 | PB13 (ESP-CLK)
558+
* (ESP-IO4) PD10 | 13 | | 4 | --
559+
* -- | 14 | | 3 | PE15 (ESP-EN)
560+
* (ESP-RX) PD8 | 15 | | 2 | --
561+
* (ESP-TX) PD9 | 16 | | 1 | PE14 (ESP-RST)
562+
* -------
563+
* WIFI
564+
*/
565+
#define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
566+
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
567+
#define ESP_WIFI_MODULE_RESET_PIN PG7
568+
#define ESP_WIFI_MODULE_ENABLE_PIN PG8
569+
#define ESP_WIFI_MODULE_GPIO0_PIN PD7
570+
#define ESP_WIFI_MODULE_GPIO4_PIN PD10
571+
#endif

‎Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h

+20-18
Original file line numberDiff line numberDiff line change
@@ -547,22 +547,24 @@
547547
#endif
548548
#endif
549549

550-
//
551-
// WIFI
552-
//
550+
#if ENABLED(WIFISUPPORT)
551+
//
552+
// WIFI
553+
//
553554

554-
/**
555-
* ------
556-
* RX | 8 7 | 3.3V GPIO0 PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
557-
* GPIO0 | 6 5 | Reset GPIO2 PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
558-
* GPIO2 | 4 3 | Enable Reset PG0 ... active low, probably OK to leave floating
559-
* GND | 2 1 | TX Enable PG1 ... Must be high for module to run
560-
* ------
561-
* W1
562-
*/
563-
#define ESP_WIFI_MODULE_COM 6 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
564-
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
565-
#define ESP_WIFI_MODULE_RESET_PIN PG0
566-
#define ESP_WIFI_MODULE_ENABLE_PIN PG1
567-
#define ESP_WIFI_MODULE_GPIO0_PIN PF14
568-
#define ESP_WIFI_MODULE_GPIO2_PIN PF15
555+
/**
556+
* ------
557+
* RX | 8 7 | 3.3V GPIO0 PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
558+
* GPIO0 | 6 5 | Reset GPIO2 PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
559+
* GPIO2 | 4 3 | Enable Reset PG0 ... active low, probably OK to leave floating
560+
* GND | 2 1 | TX Enable PG1 ... Must be high for module to run
561+
* ------
562+
* W1
563+
*/
564+
#define ESP_WIFI_MODULE_COM 6 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
565+
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
566+
#define ESP_WIFI_MODULE_RESET_PIN PG0
567+
#define ESP_WIFI_MODULE_ENABLE_PIN PG1
568+
#define ESP_WIFI_MODULE_GPIO0_PIN PF14
569+
#define ESP_WIFI_MODULE_GPIO2_PIN PF15
570+
#endif

0 commit comments

Comments
 (0)