Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-12 17:59:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change datatype for cmt pins from int8_t to gpio_num_t

Browse Source
This commit is contained in:
Thomas Basler
2025-02-07 23:52:00 +01:00
parent a3610abed7
commit 48e2a3d245
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/PinMapping.h
View File

@@ -20,12 +20,12 @@ struct PinMapping_t {
gpio_num_t nrf24_en; gpio_num_t nrf24_en;
gpio_num_t nrf24_cs; gpio_num_t nrf24_cs;
int8_t cmt_clk; gpio_num_t cmt_clk;
int8_t cmt_cs; gpio_num_t cmt_cs;
int8_t cmt_fcs; gpio_num_t cmt_fcs;
int8_t cmt_gpio2; gpio_num_t cmt_gpio2;
int8_t cmt_gpio3; gpio_num_t cmt_gpio3;
int8_t cmt_sdio; gpio_num_t cmt_sdio;
int8_t w5500_mosi; int8_t w5500_mosi;
int8_t w5500_miso; int8_t w5500_miso;

24
platformio.ini
View File

@@ -252,12 +252,12 @@ build_flags = ${env.build_flags}
-DHOYMILES_PIN_CS=GPIO_NUM_37 -DHOYMILES_PIN_CS=GPIO_NUM_37
-DLED0=GPIO_NUM_17 -DLED0=GPIO_NUM_17
-DLED1=GPIO_NUM_18 -DLED1=GPIO_NUM_18
-DCMT_CLK=6 -DCMT_CLK=GPIO_NUM_6
-DCMT_CS=4 -DCMT_CS=GPIO_NUM_4
-DCMT_FCS=21 -DCMT_FCS=GPIO_NUM_21
-DCMT_GPIO2=3 -DCMT_GPIO2=GPIO_NUM_3
-DCMT_GPIO3=8 -DCMT_GPIO3=GPIO_NUM_8
-DCMT_SDIO=5 -DCMT_SDIO=GPIO_NUM_5
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
@@ -275,12 +275,12 @@ build_flags = ${env.build_flags}
-DHOYMILES_PIN_CS=GPIO_NUM_37 -DHOYMILES_PIN_CS=GPIO_NUM_37
-DLED0=GPIO_NUM_17 -DLED0=GPIO_NUM_17
-DLED1=GPIO_NUM_18 -DLED1=GPIO_NUM_18
-DCMT_CLK=6 -DCMT_CLK=GPIO_NUM_6
-DCMT_CS=4 -DCMT_CS=GPIO_NUM_4
-DCMT_FCS=21 -DCMT_FCS=GPIO_NUM_21
-DCMT_GPIO2=3 -DCMT_GPIO2=GPIO_NUM_3
-DCMT_GPIO3=8 -DCMT_GPIO3=GPIO_NUM_8
-DCMT_SDIO=5 -DCMT_SDIO=GPIO_NUM_5
-DW5500_MOSI=40 -DW5500_MOSI=40
-DW5500_MISO=41 -DW5500_MISO=41
-DW5500_SCLK=39 -DW5500_SCLK=39

20
src/PinMapping.cpp
View File

@@ -62,27 +62,27 @@
#endif #endif
#ifndef CMT_CLK #ifndef CMT_CLK
#define CMT_CLK -1 #define CMT_CLK GPIO_NUM_NC
#endif #endif
#ifndef CMT_CS #ifndef CMT_CS
#define CMT_CS -1 #define CMT_CS GPIO_NUM_NC
#endif #endif
#ifndef CMT_FCS #ifndef CMT_FCS
#define CMT_FCS -1 #define CMT_FCS GPIO_NUM_NC
#endif #endif
#ifndef CMT_GPIO2 #ifndef CMT_GPIO2
#define CMT_GPIO2 -1 #define CMT_GPIO2 GPIO_NUM_NC
#endif #endif
#ifndef CMT_GPIO3 #ifndef CMT_GPIO3
#define CMT_GPIO3 -1 #define CMT_GPIO3 GPIO_NUM_NC
#endif #endif
#ifndef CMT_SDIO #ifndef CMT_SDIO
#define CMT_SDIO -1 #define CMT_SDIO GPIO_NUM_NC
#endif #endif
#ifndef W5500_MOSI #ifndef W5500_MOSI
@@ -278,10 +278,10 @@ bool PinMappingClass::isValidNrf24Config() const
bool PinMappingClass::isValidCmt2300Config() const bool PinMappingClass::isValidCmt2300Config() const
{ {
return _pinMapping.cmt_clk >= 0 return _pinMapping.cmt_clk > GPIO_NUM_NC
&& _pinMapping.cmt_cs >= 0 && _pinMapping.cmt_cs > GPIO_NUM_NC
&& _pinMapping.cmt_fcs >= 0 && _pinMapping.cmt_fcs > GPIO_NUM_NC
&& _pinMapping.cmt_sdio >= 0; && _pinMapping.cmt_sdio > GPIO_NUM_NC;
} }
bool PinMappingClass::isValidW5500Config() const bool PinMappingClass::isValidW5500Config() const