Skip to content

Commit a53ad3b

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 Pins updates
1 parent cbaff4b commit a53ad3b

File tree

210 files changed

+4143
-2663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+4143
-2663
lines changed

‎Marlin/src/inc/MarlinConfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727

2828
#include "MarlinConfigPre.h"
2929

30-
#ifndef __MARLIN_DEPS__
30+
#ifdef __MARLIN_DEPS__
31+
#include "../HAL/shared/fauxpins.h"
32+
#else
3133
#include "../HAL/HAL.h"
3234
#endif
3335

‎Marlin/src/pins/esp32/env_validate.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
* along with this program. If not, see <https://www.gnu.org/licenses/>.
2020
*
2121
*/
22-
#pragma once
22+
#ifndef ENV_VALIDATE_H
23+
#define ENV_VALIDATE_H
2324

2425
#if NOT_TARGET(ARDUINO_ARCH_ESP32)
2526
#error "Oops! Select an ESP32 board in 'Tools > Board.'"
2627
#endif
28+
29+
#endif

‎Marlin/src/pins/esp32/pins_ENWI_ESPNP.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
//
3535
// I2S (steppers & other output-only pins)
3636
//
37-
#define I2S_STEPPER_STREAM
37+
#ifndef I2S_STEPPER_STREAM
38+
#define I2S_STEPPER_STREAM
39+
#endif
3840
#if ENABLED(I2S_STEPPER_STREAM)
3941
#define I2S_WS 17
4042
#define I2S_BCK 22
@@ -91,7 +93,9 @@
9193
#define K_CS_PIN 159
9294

9395
// Reduce baud rate to improve software serial reliability
94-
#define TMC_BAUD_RATE 19200
96+
#ifndef TMC_BAUD_RATE
97+
#define TMC_BAUD_RATE 19200
98+
#endif
9599

96100
//
97101
// Temperature Sensors
@@ -108,7 +112,7 @@
108112

109113
// #define FAN_SOFT_PWM_REQUIRED // check if needed
110114

111-
// Neopixel Rings
115+
// NeoPixel Rings
112116
#define NEOPIXEL_PIN 14
113117
#define NEOPIXEL2_PIN 27
114118

‎Marlin/src/pins/esp32/pins_ESP32.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
//
3333
// I2S (steppers & other output-only pins)
3434
//
35-
#define I2S_STEPPER_STREAM
35+
#ifndef I2S_STEPPER_STREAM
36+
#define I2S_STEPPER_STREAM
37+
#endif
3638
#if ENABLED(I2S_STEPPER_STREAM)
3739
#define I2S_WS 25
3840
#define I2S_BCK 26

‎Marlin/src/pins/esp32/pins_MKS_TINYBEE.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
//
5757
// Enable I2S stepper stream
5858
//
59-
#define I2S_STEPPER_STREAM
59+
#ifndef I2S_STEPPER_STREAM
60+
#define I2S_STEPPER_STREAM
61+
#endif
6062
#if ENABLED(I2S_STEPPER_STREAM)
6163
#define I2S_WS 26
6264
#define I2S_BCK 25
@@ -119,7 +121,7 @@
119121
* ------ ------
120122
* (BEEPER) 149 | 1 2 | 13 (BTN_ENC) (SPI MISO) 19 | 1 2 | 18 (SPI SCK)
121123
* (LCD_EN) 21 | 3 4 | 4 (LCD_RS) (BTN_EN1) 14 | 3 4 | 5 (SPI CS)
122-
* (LCD_D4) 0 5 6 | 16 (LCD_D5) (BTN_EN2) 12 5 6 | 23 (SPI MOSI)
124+
* (LCD_D4) 0 | 5 6 16 (LCD_D5) (BTN_EN2) 12 | 5 6 23 (SPI MOSI)
123125
* (LCD_D6) 15 | 7 8 | 17 (LCD_D7) (SPI_DET) 34 | 7 8 | RESET
124126
* GND | 9 10 | 5V GND | 9 10 | 3.3V
125127
* ------ ------

‎Marlin/src/pins/esp32/pins_MRR_ESPE.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
//
5252
// Enable I2S stepper stream
5353
//
54-
#define I2S_STEPPER_STREAM
54+
#ifndef I2S_STEPPER_STREAM
55+
#define I2S_STEPPER_STREAM
56+
#endif
5557
#if ENABLED(I2S_STEPPER_STREAM)
5658
#define I2S_WS 26
5759
#define I2S_BCK 25
@@ -119,9 +121,9 @@
119121
#define SDSS 5
120122
#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
121123

122-
//////////////////////////
123-
// LCDs and Controllers //
124-
//////////////////////////
124+
//
125+
// LCD / Controller
126+
//
125127

126128
#if HAS_WIRED_LCD
127129

‎Marlin/src/pins/esp32/pins_PANDA_M4.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727

2828
#define BOARD_INFO_NAME "Panda_M4"
2929

30+
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
31+
#error "PANDA M4 only supports 1 hotend / E stepper."
32+
#endif
33+
3034
#include "pins_PANDA_common.h"
3135

3236
//

‎Marlin/src/pins/esp32/pins_PANDA_ZHU.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727

2828
#define BOARD_INFO_NAME "Panda_ZHU"
2929

30+
#if E_STEPPERS > 5
31+
#error "PANDA ZHU supports up to 5 E steppers."
32+
#endif
33+
#if HAS_MULTI_HOTEND
34+
#error "PANDA ZHU only supports 1 hotend."
35+
#endif
36+
3037
#include "pins_PANDA_common.h"
3138

3239
//

‎Marlin/src/pins/esp32/pins_PANDA_common.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
#define TEMP_BED_PIN 36 // Analog Input
6464

6565
#if ENABLED(MAX31856_PANDAPI)
66-
#define MAX31856_CLK_PIN 29
67-
#define MAX31856_MISO_PIN 24
68-
#define MAX31856_MOSI_PIN 28
69-
#define MAX31856_CS_PIN 27
66+
#define TEMP_0_CLK_PIN 29
67+
#define TEMP_0_MISO_PIN 24
68+
#define TEMP_0_MOSI_PIN 28
69+
#define TEMP_0_CS_PIN 27
7070
#endif
7171

7272
//
@@ -86,7 +86,7 @@
8686
* (EN1) 33 | 3 4 | (5 SDSS?) (EN) 26 | 3 4 | 27 (RS)
8787
* (EN2) 32 5 6 | (23 MOSI?) (D4) 14 | 5 6 --
8888
* (SDDET 2?) | 7 8 | (RESET) -- | 7 8 | --
89-
* -- | 9 10 | -- (GND) | 9 10 | (5V)
89+
* -- | 9 10 | -- GND | 9 10 | 5V
9090
* ------ ------
9191
* EXP2 EXP1
9292
*/

‎Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,6 @@
3434
//
3535
// I2S (steppers & other output-only pins)
3636
//
37-
#define I2S_STEPPER_STREAM
37+
#ifndef I2S_STEPPER_STREAM
38+
#define I2S_STEPPER_STREAM
39+
#endif

0 commit comments

Comments
 (0)