浏览代码

Init all ESP01 (module) WIFI pins (#17679)

Bob Kuhn 5 年前
父节点
当前提交
8f3d17699a
没有帐户链接到提交者的电子邮件

+ 9
- 1
Marlin/src/HAL/shared/esp_wifi.cpp 查看文件

@@ -23,13 +23,21 @@
23 23
 #include "../../inc/MarlinConfig.h"
24 24
 #include "Delay.h"
25 25
 
26
-void esp_wifi_init(void) {
26
+void esp_wifi_init(void) {                          // init ESP01 WIFI module pins
27
+  #if PIN_EXISTS(ESP_WIFI_MODULE_GPIO0)
28
+    OUT_WRITE(ESP_WIFI_MODULE_GPIO0_PIN, HIGH);
29
+  #endif
30
+  #if PIN_EXISTS(ESP_WIFI_MODULE_GPIO2)
31
+    OUT_WRITE(ESP_WIFI_MODULE_GPIO2_PIN, HIGH);
32
+  #endif
27 33
   #if PIN_EXISTS(ESP_WIFI_MODULE_RESET)
34
+    delay(1);  // power up delay (0.1mS minimum)
28 35
     OUT_WRITE(ESP_WIFI_MODULE_RESET_PIN, LOW);
29 36
     delay(1);
30 37
     OUT_WRITE(ESP_WIFI_MODULE_RESET_PIN, HIGH);
31 38
   #endif
32 39
   #if PIN_EXISTS(ESP_WIFI_MODULE_ENABLE)
40
+    delay(1);  // delay after reset released (0.1mS minimum)
33 41
     OUT_WRITE(ESP_WIFI_MODULE_ENABLE_PIN, HIGH);
34 42
   #endif
35 43
 }

+ 6
- 0
Marlin/src/pins/pinsDebug_list.h 查看文件

@@ -1415,3 +1415,9 @@
1415 1415
 #if PIN_EXISTS(ESP_WIFI_MODULE_ENABLE)
1416 1416
   REPORT_NAME_DIGITAL(__LINE__, ESP_WIFI_MODULE_ENABLE_PIN)
1417 1417
 #endif
1418
+#if PIN_EXISTS(ESP_WIFI_MODULE_GPIO0)
1419
+  REPORT_NAME_DIGITAL(__LINE__, ESP_WIFI_MODULE_GPIO0_PIN)
1420
+#endif
1421
+#if PIN_EXISTS(ESP_WIFI_MODULE_GPIO2)
1422
+  REPORT_NAME_DIGITAL(__LINE__, ESP_WIFI_MODULE_GPIO2_PIN)
1423
+#endif

+ 8
- 6
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h 查看文件

@@ -340,13 +340,15 @@
340 340
 /**
341 341
  *          _____
342 342
  *      TX | 1 2 | GND      Enable PG1   // Must be high for module to run
343
- *  Enable | 3 4 | GPIO2    Reset  PG0   // Leave as unused (OK to leave floating)
344
- *   Reset | 5 6 | GPIO0    GPIO2  PF15  // Leave as unused (best to leave floating)
345
- *     3.3V| 7 8 | RX       GPIO0  PF14  // Leave as unused (best to leave floating)
343
+ *  Enable | 3 4 | GPIO2    Reset  PG0   // active low, probably OK to leave floating
344
+ *   Reset | 5 6 | GPIO0    GPIO2  PF15  // must be high (ESP3D software configures this with a pullup so OK to leave as floating)
345
+ *     3.3V| 7 8 | RX       GPIO0  PF14  // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
346 346
  *            ̄ ̄
347 347
  *            W1
348 348
  */
349
-#define ESP_WIFI_MODULE_COM 6                     // Must also set SERIAL_PORT or SERIAL_PORT_2 to this
350
-#define ESP_WIFI_MODULE_BAUDRATE        BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
351
-#define ESP_WIFI_MODULE_RESET_PIN           -1
349
+#define ESP_WIFI_MODULE_COM 6                         // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
350
+#define ESP_WIFI_MODULE_BAUDRATE            BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
351
+#define ESP_WIFI_MODULE_RESET_PIN           PG0
352 352
 #define ESP_WIFI_MODULE_ENABLE_PIN          PG1
353
+#define ESP_WIFI_MODULE_GPIO0_PIN           PF14
354
+#define ESP_WIFI_MODULE_GPIO2_PIN           PF15

正在加载...
取消
保存