From 48e2a3d24522fcca552fbfbc6fe64480b0b71b29 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Fri, 7 Feb 2025 23:52:00 +0100 Subject: [PATCH] Change datatype for cmt pins from int8_t to gpio_num_t --- include/PinMapping.h | 12 ++++++------ platformio.ini | 24 ++++++++++++------------ src/PinMapping.cpp | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/PinMapping.h b/include/PinMapping.h index 5197bf4a..45f89a7c 100644 --- a/include/PinMapping.h +++ b/include/PinMapping.h @@ -20,12 +20,12 @@ struct PinMapping_t { gpio_num_t nrf24_en; gpio_num_t nrf24_cs; - int8_t cmt_clk; - int8_t cmt_cs; - int8_t cmt_fcs; - int8_t cmt_gpio2; - int8_t cmt_gpio3; - int8_t cmt_sdio; + gpio_num_t cmt_clk; + gpio_num_t cmt_cs; + gpio_num_t cmt_fcs; + gpio_num_t cmt_gpio2; + gpio_num_t cmt_gpio3; + gpio_num_t cmt_sdio; int8_t w5500_mosi; int8_t w5500_miso; diff --git a/platformio.ini b/platformio.ini index 7dddcebd..8db28883 100644 --- a/platformio.ini +++ b/platformio.ini @@ -252,12 +252,12 @@ build_flags = ${env.build_flags} -DHOYMILES_PIN_CS=GPIO_NUM_37 -DLED0=GPIO_NUM_17 -DLED1=GPIO_NUM_18 - -DCMT_CLK=6 - -DCMT_CS=4 - -DCMT_FCS=21 - -DCMT_GPIO2=3 - -DCMT_GPIO3=8 - -DCMT_SDIO=5 + -DCMT_CLK=GPIO_NUM_6 + -DCMT_CS=GPIO_NUM_4 + -DCMT_FCS=GPIO_NUM_21 + -DCMT_GPIO2=GPIO_NUM_3 + -DCMT_GPIO3=GPIO_NUM_8 + -DCMT_SDIO=GPIO_NUM_5 -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 @@ -275,12 +275,12 @@ build_flags = ${env.build_flags} -DHOYMILES_PIN_CS=GPIO_NUM_37 -DLED0=GPIO_NUM_17 -DLED1=GPIO_NUM_18 - -DCMT_CLK=6 - -DCMT_CS=4 - -DCMT_FCS=21 - -DCMT_GPIO2=3 - -DCMT_GPIO3=8 - -DCMT_SDIO=5 + -DCMT_CLK=GPIO_NUM_6 + -DCMT_CS=GPIO_NUM_4 + -DCMT_FCS=GPIO_NUM_21 + -DCMT_GPIO2=GPIO_NUM_3 + -DCMT_GPIO3=GPIO_NUM_8 + -DCMT_SDIO=GPIO_NUM_5 -DW5500_MOSI=40 -DW5500_MISO=41 -DW5500_SCLK=39 diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp index 32b40e29..5253522e 100644 --- a/src/PinMapping.cpp +++ b/src/PinMapping.cpp @@ -62,27 +62,27 @@ #endif #ifndef CMT_CLK -#define CMT_CLK -1 +#define CMT_CLK GPIO_NUM_NC #endif #ifndef CMT_CS -#define CMT_CS -1 +#define CMT_CS GPIO_NUM_NC #endif #ifndef CMT_FCS -#define CMT_FCS -1 +#define CMT_FCS GPIO_NUM_NC #endif #ifndef CMT_GPIO2 -#define CMT_GPIO2 -1 +#define CMT_GPIO2 GPIO_NUM_NC #endif #ifndef CMT_GPIO3 -#define CMT_GPIO3 -1 +#define CMT_GPIO3 GPIO_NUM_NC #endif #ifndef CMT_SDIO -#define CMT_SDIO -1 +#define CMT_SDIO GPIO_NUM_NC #endif #ifndef W5500_MOSI @@ -278,10 +278,10 @@ bool PinMappingClass::isValidNrf24Config() const bool PinMappingClass::isValidCmt2300Config() const { - return _pinMapping.cmt_clk >= 0 - && _pinMapping.cmt_cs >= 0 - && _pinMapping.cmt_fcs >= 0 - && _pinMapping.cmt_sdio >= 0; + return _pinMapping.cmt_clk > GPIO_NUM_NC + && _pinMapping.cmt_cs > GPIO_NUM_NC + && _pinMapping.cmt_fcs > GPIO_NUM_NC + && _pinMapping.cmt_sdio > GPIO_NUM_NC; } bool PinMappingClass::isValidW5500Config() const