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

Change datatype for nrf24 pins from int8_t to gpio_num_t

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

12
include/PinMapping.h
View File

@@ -13,12 +13,12 @@
struct PinMapping_t { struct PinMapping_t {
char name[MAPPING_NAME_STRLEN + 1]; char name[MAPPING_NAME_STRLEN + 1];
int8_t nrf24_miso; gpio_num_t nrf24_miso;
int8_t nrf24_mosi; gpio_num_t nrf24_mosi;
int8_t nrf24_clk; gpio_num_t nrf24_clk;
int8_t nrf24_irq; gpio_num_t nrf24_irq;
int8_t nrf24_en; gpio_num_t nrf24_en;
int8_t nrf24_cs; gpio_num_t nrf24_cs;
int8_t cmt_clk; int8_t cmt_clk;
int8_t cmt_cs; int8_t cmt_cs;

132
platformio.ini
View File

@@ -127,24 +127,24 @@ build_flags = ${env.build_flags}
[env:generic] [env:generic]
board = esp32dev board = esp32dev
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=19 -DHOYMILES_PIN_MISO=GPIO_NUM_19
-DHOYMILES_PIN_MOSI=23 -DHOYMILES_PIN_MOSI=GPIO_NUM_23
-DHOYMILES_PIN_SCLK=18 -DHOYMILES_PIN_SCLK=GPIO_NUM_18
-DHOYMILES_PIN_IRQ=16 -DHOYMILES_PIN_IRQ=GPIO_NUM_16
-DHOYMILES_PIN_CE=4 -DHOYMILES_PIN_CE=GPIO_NUM_4
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=GPIO_NUM_5
[env:olimex_esp32_poe] [env:olimex_esp32_poe]
; https://www.olimex.com/Products/IoT/ESP32/ESP32-POE/open-source-hardware ; https://www.olimex.com/Products/IoT/ESP32/ESP32-POE/open-source-hardware
board = esp32-poe board = esp32-poe
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=15 -DHOYMILES_PIN_MISO=GPIO_NUM_15
-DHOYMILES_PIN_MOSI=2 -DHOYMILES_PIN_MOSI=GPIO_NUM_2
-DHOYMILES_PIN_SCLK=14 -DHOYMILES_PIN_SCLK=GPIO_NUM_14
-DHOYMILES_PIN_IRQ=13 -DHOYMILES_PIN_IRQ=GPIO_NUM_13
-DHOYMILES_PIN_CE=16 -DHOYMILES_PIN_CE=GPIO_NUM_16
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=GPIO_NUM_5
-DOPENDTU_ETHERNET -DOPENDTU_ETHERNET
@@ -152,12 +152,12 @@ build_flags = ${env.build_flags}
; https://www.olimex.com/Products/IoT/ESP32/ESP32-EVB/open-source-hardware ; https://www.olimex.com/Products/IoT/ESP32/ESP32-EVB/open-source-hardware
board = esp32-evb board = esp32-evb
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=15 -DHOYMILES_PIN_MISO=GPIO_NUM_15
-DHOYMILES_PIN_MOSI=2 -DHOYMILES_PIN_MOSI=GPIO_NUM_2
-DHOYMILES_PIN_SCLK=14 -DHOYMILES_PIN_SCLK=GPIO_NUM_14
-DHOYMILES_PIN_IRQ=13 -DHOYMILES_PIN_IRQ=GPIO_NUM_13
-DHOYMILES_PIN_CE=16 -DHOYMILES_PIN_CE=GPIO_NUM_16
-DHOYMILES_PIN_CS=17 -DHOYMILES_PIN_CS=GPIO_NUM_17
-DOPENDTU_ETHERNET -DOPENDTU_ETHERNET
@@ -165,24 +165,24 @@ build_flags = ${env.build_flags}
board = wemos_d1_mini32 board = wemos_d1_mini32
build_flags = build_flags =
${env.build_flags} ${env.build_flags}
-DHOYMILES_PIN_MISO=19 -DHOYMILES_PIN_MISO=GPIO_NUM_19
-DHOYMILES_PIN_MOSI=23 -DHOYMILES_PIN_MOSI=GPIO_NUM_23
-DHOYMILES_PIN_SCLK=18 -DHOYMILES_PIN_SCLK=GPIO_NUM_18
-DHOYMILES_PIN_IRQ=16 -DHOYMILES_PIN_IRQ=GPIO_NUM_16
-DHOYMILES_PIN_CE=17 -DHOYMILES_PIN_CE=GPIO_NUM_17
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=GPIO_NUM_5
[env:wt32_eth01] [env:wt32_eth01]
; http://www.wireless-tag.com/portfolio/wt32-eth01/ ; http://www.wireless-tag.com/portfolio/wt32-eth01/
board = wt32-eth01 board = wt32-eth01
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=4 -DHOYMILES_PIN_MISO=GPIO_NUM_4
-DHOYMILES_PIN_MOSI=2 -DHOYMILES_PIN_MOSI=GPIO_NUM_2
-DHOYMILES_PIN_SCLK=32 -DHOYMILES_PIN_SCLK=GPIO_NUM_32
-DHOYMILES_PIN_IRQ=33 -DHOYMILES_PIN_IRQ=GPIO_NUM_33
-DHOYMILES_PIN_CE=14 -DHOYMILES_PIN_CE=GPIO_NUM_14
-DHOYMILES_PIN_CS=15 -DHOYMILES_PIN_CS=GPIO_NUM_15
-DOPENDTU_ETHERNET -DOPENDTU_ETHERNET
@@ -190,12 +190,12 @@ build_flags = ${env.build_flags}
; https://www.waveshare.com/wiki/NodeMCU-ESP-S3-12K-Kit ; https://www.waveshare.com/wiki/NodeMCU-ESP-S3-12K-Kit
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=16 -DHOYMILES_PIN_MISO=GPIO_NUM_16
-DHOYMILES_PIN_MOSI=17 -DHOYMILES_PIN_MOSI=GPIO_NUM_17
-DHOYMILES_PIN_SCLK=18 -DHOYMILES_PIN_SCLK=GPIO_NUM_18
-DHOYMILES_PIN_IRQ=3 -DHOYMILES_PIN_IRQ=GPIO_NUM_3
-DHOYMILES_PIN_CE=4 -DHOYMILES_PIN_CE=GPIO_NUM_4
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=GPIO_NUM_5
[env:lolin32_lite] [env:lolin32_lite]
@@ -203,22 +203,22 @@ build_flags = ${env.build_flags}
; https://www.az-delivery.de/products/esp32-lolin-lolin32 ; https://www.az-delivery.de/products/esp32-lolin-lolin32
board = lolin32_lite board = lolin32_lite
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=19 -DHOYMILES_PIN_MISO=GPIO_NUM_19
-DHOYMILES_PIN_MOSI=23 -DHOYMILES_PIN_MOSI=GPIO_NUM_23
-DHOYMILES_PIN_SCLK=18 -DHOYMILES_PIN_SCLK=GPIO_NUM_18
-DHOYMILES_PIN_IRQ=16 -DHOYMILES_PIN_IRQ=GPIO_NUM_16
-DHOYMILES_PIN_CE=17 -DHOYMILES_PIN_CE=GPIO_NUM_17
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=GPIO_NUM_5
[env:lolin_s2_mini] [env:lolin_s2_mini]
board = lolin_s2_mini board = lolin_s2_mini
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=13 -DHOYMILES_PIN_MISO=GPIO_NUM_13
-DHOYMILES_PIN_MOSI=11 -DHOYMILES_PIN_MOSI=GPIO_NUM_11
-DHOYMILES_PIN_SCLK=12 -DHOYMILES_PIN_SCLK=GPIO_NUM_12
-DHOYMILES_PIN_CS=10 -DHOYMILES_PIN_CS=GPIO_NUM_10
-DHOYMILES_PIN_IRQ=4 -DHOYMILES_PIN_IRQ=GPIO_NUM_4
-DHOYMILES_PIN_CE=5 -DHOYMILES_PIN_CE=GPIO_NUM_5
[env:opendtufusionv1] [env:opendtufusionv1]
@@ -227,12 +227,12 @@ upload_protocol = esp-builtin
debug_tool = esp-builtin debug_tool = esp-builtin
debug_speed = 12000 debug_speed = 12000
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=48 -DHOYMILES_PIN_MISO=GPIO_NUM_48
-DHOYMILES_PIN_MOSI=35 -DHOYMILES_PIN_MOSI=GPIO_NUM_35
-DHOYMILES_PIN_SCLK=36 -DHOYMILES_PIN_SCLK=GPIO_NUM_36
-DHOYMILES_PIN_IRQ=47 -DHOYMILES_PIN_IRQ=GPIO_NUM_47
-DHOYMILES_PIN_CE=38 -DHOYMILES_PIN_CE=GPIO_NUM_38
-DHOYMILES_PIN_CS=37 -DHOYMILES_PIN_CS=GPIO_NUM_37
-DLED0=GPIO_NUM_17 -DLED0=GPIO_NUM_17
-DLED1=GPIO_NUM_18 -DLED1=GPIO_NUM_18
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
@@ -244,12 +244,12 @@ upload_protocol = esp-builtin
debug_tool = esp-builtin debug_tool = esp-builtin
debug_speed = 12000 debug_speed = 12000
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=48 -DHOYMILES_PIN_MISO=GPIO_NUM_48
-DHOYMILES_PIN_MOSI=35 -DHOYMILES_PIN_MOSI=GPIO_NUM_35
-DHOYMILES_PIN_SCLK=36 -DHOYMILES_PIN_SCLK=GPIO_NUM_36
-DHOYMILES_PIN_IRQ=47 -DHOYMILES_PIN_IRQ=GPIO_NUM_47
-DHOYMILES_PIN_CE=38 -DHOYMILES_PIN_CE=GPIO_NUM_38
-DHOYMILES_PIN_CS=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=6
@@ -267,12 +267,12 @@ upload_protocol = esp-builtin
debug_tool = esp-builtin debug_tool = esp-builtin
debug_speed = 12000 debug_speed = 12000
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=48 -DHOYMILES_PIN_MISO=GPIO_NUM_48
-DHOYMILES_PIN_MOSI=35 -DHOYMILES_PIN_MOSI=GPIO_NUM_35
-DHOYMILES_PIN_SCLK=36 -DHOYMILES_PIN_SCLK=GPIO_NUM_36
-DHOYMILES_PIN_IRQ=47 -DHOYMILES_PIN_IRQ=GPIO_NUM_47
-DHOYMILES_PIN_CE=38 -DHOYMILES_PIN_CE=GPIO_NUM_38
-DHOYMILES_PIN_CS=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=6

24
src/PinMapping.cpp
View File

@@ -38,27 +38,27 @@
#endif #endif
#ifndef HOYMILES_PIN_SCLK #ifndef HOYMILES_PIN_SCLK
#define HOYMILES_PIN_SCLK -1 #define HOYMILES_PIN_SCLK GPIO_NUM_NC
#endif #endif
#ifndef HOYMILES_PIN_CS #ifndef HOYMILES_PIN_CS
#define HOYMILES_PIN_CS -1 #define HOYMILES_PIN_CS GPIO_NUM_NC
#endif #endif
#ifndef HOYMILES_PIN_CE #ifndef HOYMILES_PIN_CE
#define HOYMILES_PIN_CE -1 #define HOYMILES_PIN_CE GPIO_NUM_NC
#endif #endif
#ifndef HOYMILES_PIN_IRQ #ifndef HOYMILES_PIN_IRQ
#define HOYMILES_PIN_IRQ -1 #define HOYMILES_PIN_IRQ GPIO_NUM_NC
#endif #endif
#ifndef HOYMILES_PIN_MISO #ifndef HOYMILES_PIN_MISO
#define HOYMILES_PIN_MISO -1 #define HOYMILES_PIN_MISO GPIO_NUM_NC
#endif #endif
#ifndef HOYMILES_PIN_MOSI #ifndef HOYMILES_PIN_MOSI
#define HOYMILES_PIN_MOSI -1 #define HOYMILES_PIN_MOSI GPIO_NUM_NC
#endif #endif
#ifndef CMT_CLK #ifndef CMT_CLK
@@ -268,12 +268,12 @@ bool PinMappingClass::init(const String& deviceMapping)
bool PinMappingClass::isValidNrf24Config() const bool PinMappingClass::isValidNrf24Config() const
{ {
return _pinMapping.nrf24_clk >= 0 return _pinMapping.nrf24_clk > GPIO_NUM_NC
&& _pinMapping.nrf24_cs >= 0 && _pinMapping.nrf24_cs > GPIO_NUM_NC
&& _pinMapping.nrf24_en >= 0 && _pinMapping.nrf24_en > GPIO_NUM_NC
&& _pinMapping.nrf24_irq >= 0 && _pinMapping.nrf24_irq > GPIO_NUM_NC
&& _pinMapping.nrf24_miso >= 0 && _pinMapping.nrf24_miso > GPIO_NUM_NC
&& _pinMapping.nrf24_mosi >= 0; && _pinMapping.nrf24_mosi > GPIO_NUM_NC;
} }
bool PinMappingClass::isValidCmt2300Config() const bool PinMappingClass::isValidCmt2300Config() const