From ea1ee02b538bde9d6621126baae6f4d4dbd7c4bc Mon Sep 17 00:00:00 2001 From: Kajetan Rzepecki Date: Sat, 20 Apr 2019 20:41:17 +0200 Subject: [PATCH] Disable hardware PWM on ESP32 I2S expander (#13762) --- Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h b/Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h index 0f1bc8024a..b71ca78418 100644 --- a/Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h +++ b/Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h @@ -27,6 +27,10 @@ * Utility functions */ +// I2S expander pin mapping. +#define IS_I2S_EXPANDER_PIN(IO) TEST(IO, 7) +#define I2S_EXPANDER_PIN_INDEX(IO) (IO & 0x7F) + // Set pin as input #define _SET_INPUT(IO) pinMode(IO, INPUT) @@ -37,10 +41,10 @@ #define _PULLUP(IO, v) pinMode(IO, v ? INPUT_PULLUP : INPUT) // Read a pin wrapper -#define READ(IO) (TEST(IO, 7) ? i2s_state(IO & 0x7F) : digitalRead(IO)) +#define READ(IO) (IS_I2S_EXPANDER_PIN(IO) ? i2s_state(I2S_EXPANDER_PIN_INDEX(IO)) : digitalRead(IO)) // Write to a pin wrapper -#define WRITE(IO, v) (TEST(IO, 7) ? i2s_write(IO & 0x7F, v) : digitalWrite(IO, v)) +#define WRITE(IO, v) (IS_I2S_EXPANDER_PIN(IO) ? i2s_write(I2S_EXPANDER_PIN_INDEX(IO), v) : digitalWrite(IO, v)) // Set pin as input wrapper #define SET_INPUT(IO) _SET_INPUT(IO) @@ -61,8 +65,9 @@ #define extDigitalRead(IO) digitalRead(IO) #define extDigitalWrite(IO,V) digitalWrite(IO,V) -#define PWM_PIN(P) true -#define USEABLE_HARDWARE_PWM(P) PWM_PIN(P) +// PWM outputs +#define PWM_PIN(P) (P < 34) // NOTE Pins >= 34 are input only on ESP32, so they can't be used for output. +#define USEABLE_HARDWARE_PWM(P) (!IS_I2S_EXPANDER_PIN(P) && PWM_PIN(P)) // Toggle pin value #define TOGGLE(IO) WRITE(IO, !READ(IO))