From bba57d47713c98d80bd3a5267b1c80a9f9c547c7 Mon Sep 17 00:00:00 2001 From: Ewoud Date: Mon, 9 Jan 2023 17:41:52 +0100 Subject: [PATCH] Remove I2CSCL/SDA/SCLK/MOSI/MISOPIN rename *_DATASPI to *_MOSISPI use HW_PIN_* instead --- platformio.ini | 4 ++-- .../usermod_v2_four_line_display.h | 6 ++--- .../usermod_v2_four_line_display_ALT.h | 6 ++--- wled00/const.h | 23 ++++--------------- wled00/pin_manager.cpp | 4 ++-- wled00/set.cpp | 2 +- wled00/wled.h | 4 ++-- wled00/xml.cpp | 4 ++-- 8 files changed, 19 insertions(+), 34 deletions(-) diff --git a/platformio.ini b/platformio.ini index efd36dff..d3258312 100644 --- a/platformio.ini +++ b/platformio.ini @@ -581,7 +581,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME -D HW_PIN_SCL=35 -D HW_PIN_SDA=33 -D HW_PIN_CLOCKSPI=7 - -D HW_PIN_DATASPI=11 + -D HW_PIN_MOSISPI=11 ;WLEDMM renamed from HW_PIN_DATASPI -D HW_PIN_MISOSPI=9 ; -D STATUSLED=15 -D WLED_USE_MY_CONFIG @@ -975,7 +975,7 @@ build_flags = ${common.build_flags} ${esp32.build_flagsV4} ${esp32s2.build_flags ;-D IRPIN=7 -D HW_PIN_SCL=40 -D HW_PIN_SDA=41 - -D HW_PIN_DATASPI=35 + -D HW_PIN_MOSISPI=35 ;WLEDMM renamed from HW_PIN_DATASPI -D HW_PIN_CLOCKSPI=36 -D HW_PIN_MISOSPI=37 -D AUDIOPIN=-1 diff --git a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h index be44b6f0..7f052648 100644 --- a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h +++ b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h @@ -33,8 +33,8 @@ #ifndef FLD_PIN_CLOCKSPI #define FLD_PIN_CLOCKSPI spi_sclk #endif - #ifndef FLD_PIN_DATASPI - #define FLD_PIN_DATASPI spi_mosi + #ifndef FLD_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI + #define FLD_PIN_MOSISPI spi_mosi #endif #ifndef FLD_PIN_CS #define FLD_PIN_CS spi_cs @@ -109,7 +109,7 @@ class FourLineDisplayUsermod : public Usermod { int8_t ioPin[5] = {FLD_PIN_SCL, FLD_PIN_SDA, -1, -1, -1}; // I2C pins: SCL, SDA uint32_t ioFrequency = 400000; // in Hz (minimum is 100000, baseline is 400000 and maximum should be 3400000) #else - int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_DATASPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST + int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_MOSISPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST uint32_t ioFrequency = 1000000; // in Hz (minimum is 500kHz, baseline is 1MHz and maximum should be 20MHz) #endif DisplayType type = FLD_TYPE; // display type diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h index bcd6f81e..64c9abcc 100644 --- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h +++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h @@ -39,8 +39,8 @@ #ifndef FLD_PIN_CLOCKSPI #define FLD_PIN_CLOCKSPI spi_sclk #endif - #ifndef FLD_PIN_DATASPI - #define FLD_PIN_DATASPI spi_mosi + #ifndef FLD_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI + #define FLD_PIN_MOSISPI spi_mosi #endif #ifndef FLD_PIN_CS #define FLD_PIN_CS spi_cs @@ -121,7 +121,7 @@ class FourLineDisplayUsermod : public Usermod { int8_t ioPin[5] = {FLD_PIN_SCL, FLD_PIN_SDA, -1, -1, -1}; // I2C pins: SCL, SDA uint32_t ioFrequency = 400000; // in Hz (minimum is 100000, baseline is 400000 and maximum should be 3400000) #else - int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_DATASPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST + int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_MOSISPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST uint32_t ioFrequency = 1000000; // in Hz (minimum is 500kHz, baseline is 1MHz and maximum should be 20MHz) #endif diff --git a/wled00/const.h b/wled00/const.h index 10c7db24..67ce6996 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -418,12 +418,6 @@ // HW_PIN_SCL & HW_PIN_SDA are used for information in usermods settings page and usermods themselves // which GPIO pins are actually used in a hardwarea layout (controller board) -#if defined(I2CSCLPIN) && !defined(HW_PIN_SCL) - #define HW_PIN_SCL I2CSCLPIN -#endif -#if defined(I2CSDAPIN) && !defined(HW_PIN_SDA) - #define HW_PIN_SDA I2CSDAPIN -#endif // you cannot change HW I2C pins on 8266 #if defined(ESP8266) && defined(HW_PIN_SCL) #undef HW_PIN_SCL @@ -441,21 +435,12 @@ // HW_PIN_SCLKSPI & HW_PIN_MOSISPI & HW_PIN_MISOSPI are used for information in usermods settings page and usermods themselves // which GPIO pins are actually used in a hardwarea layout (controller board) -#if defined(SPISCLKPIN) && !defined(HW_PIN_CLOCKSPI) - #define HW_PIN_CLOCKSPI SPISCLKPIN -#endif -#if defined(SPIMOSIPIN) && !defined(HW_PIN_MOSISPI) //WLEDMM not HW_PIN_DATASPI??? - #define HW_PIN_MOSISPI SPIMOSIPIN -#endif -#if defined(SPIMISOPIN) && !defined(HW_PIN_MISOSPI) - #define HW_PIN_MISOSPI SPIMISOPIN -#endif // you cannot change HW SPI pins on 8266 #if defined(ESP8266) && defined(HW_PIN_CLOCKSPI) #undef HW_PIN_CLOCKSPI #endif -#if defined(ESP8266) && defined(HW_PIN_DATASPI) - #undef HW_PIN_DATASPI +#if defined(ESP8266) && defined(HW_PIN_MOSISPI) //WLEDMM renamed from HW_PIN_DATASPI + #undef HW_PIN_MOSISPI #endif #if defined(ESP8266) && defined(HW_PIN_MISOSPI) #undef HW_PIN_MISOSPI @@ -464,8 +449,8 @@ #ifndef HW_PIN_CLOCKSPI #define HW_PIN_CLOCKSPI SCK //WLEDMM to check if -1 is better #endif -#ifndef HW_PIN_DATASPI - #define HW_PIN_DATASPI MOSI //WLEDMM to check if -1 is better +#ifndef HW_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI + #define HW_PIN_MOSISPI MOSI //WLEDMM to check if -1 is better #endif #ifndef HW_PIN_MISOSPI #define HW_PIN_MISOSPI MISO //WLEDMM to check if -1 is better diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp index da7f40d8..489c308e 100644 --- a/wled00/pin_manager.cpp +++ b/wled00/pin_manager.cpp @@ -213,9 +213,9 @@ String PinManagerClass::getPinSpecialText(int gpio) { // special purpose PIN in if (gpio == FLD_PIN_SDA) return(F("(default) 4lines disp. I2C SDA")); if (gpio == FLD_PIN_SCL) return(F("(default) 4lines disp. I2C SCL")); #endif - #if defined(FLD_PIN_CLOCKSPI) && defined(FLD_PIN_DATASPI) + #if defined(FLD_PIN_CLOCKSPI) && defined(FLD_PIN_MOSISPI) //WLEDMM renamed from HW_PIN_DATASPI if (gpio == FLD_PIN_CLOCKSPI) return(F("(default) 4lines disp. SPI SCLK")); - if (gpio == FLD_PIN_DATASPI) return(F("(default) 4lines disp. SPI DATA")); + if (gpio == FLD_PIN_MOSISPI) return(F("(default) 4lines disp. SPI DATA")); #endif #if defined(FLD_PIN_CS) if (gpio == FLD_PIN_CS) return(F("(default) 4lines disp. SPI CS")); diff --git a/wled00/set.cpp b/wled00/set.cpp index 61a8c008..b75cf08c 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -554,7 +554,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) #ifdef ESP8266 // cannot change pins on ESP8266 - if (hw_mosi_pin >= 0 && hw_mosi_pin != HW_PIN_DATASPI) hw_mosi_pin = HW_PIN_DATASPI; + if (hw_mosi_pin >= 0 && hw_mosi_pin != HW_PIN_MOSISPI) hw_mosi_pin = HW_PIN_MOSISPI; //WLEDMM renamed from HW_PIN_DATASPI if (hw_miso_pin >= 0 && hw_miso_pin != HW_PIN_MISOSPI) hw_mosi_pin = HW_PIN_MISOSPI; if (hw_sclk_pin >= 0 && hw_sclk_pin != HW_PIN_CLOCKSPI) hw_sclk_pin = HW_PIN_CLOCKSPI; #endif diff --git a/wled00/wled.h b/wled00/wled.h index bbfa8efe..453967fe 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2301083 +#define VERSION 2301091 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -692,7 +692,7 @@ WLED_GLOBAL int8_t i2c_scl _INIT(HW_PIN_SCL); #endif // global SPI DATA/MOSI pin (used for usermods) -#ifndef HW_PIN_MOSISPI // WLEDMM not SPIMOSIPIN, what about HW_PIN_DATASPI ???? +#ifndef HW_PIN_MOSISPI // WLEDMM not SPIMOSIPIN WLED_GLOBAL int8_t spi_mosi _INIT(-1); #else WLED_GLOBAL int8_t spi_mosi _INIT(HW_PIN_MOSISPI); diff --git a/wled00/xml.cpp b/wled00/xml.cpp index e34317ad..2a420f79 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -719,8 +719,8 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W oappend(SET_F("xOption('SCL:pin',1,' ⎌',")); oappendi(HW_PIN_SCL); oappend(");"); #endif oappend(SET_F("addInfo('MOSI:pin',0,'', 'MOSI');")); - #ifdef HW_PIN_DATASPI - oappend(SET_F("xOption('MOSI:pin',1,' ⎌',")); oappendi(HW_PIN_DATASPI); oappend(");"); + #ifdef HW_PIN_MOSISPI //WLEDMM renamed from HW_PIN_DATASPI + oappend(SET_F("xOption('MOSI:pin',1,' ⎌',")); oappendi(HW_PIN_MOSISPI); oappend(");"); #endif oappend(SET_F("addInfo('MISO:pin',0,'', 'MISO');")); #ifdef HW_PIN_MISOSPI