Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

i2c_sda, i2c_scl, spi_mosi, spi_miso, spi_sclk without HW_PIN_*, bh1750

Browse Source 
platformio: 
- add bh1750 to _max
- define rotary defaults for wemos

usermod_bh1750
- Remove HW_PIN_* and replace by i2c_sda etc
- add appendConfigData

usermods mpu6050_imu, rtc, 4ld, pinmanager
- Remove HW_PIN_* 

change SDA2:pin (etc) to SDA:pin
This commit is contained in:
Ewoud
2023-01-05 16:35:49 +01:00
parent 2ec24242db
commit 642d7d91ea
15 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/data/settings_um.htm
View File

@@ -252,13 +252,13 @@
urows+="<i style=\"color:orange\">(only changable on ESP32, change requires reboot!)</i>";
urows+="<hr class=\"sml\">";
urows+="<p><u>Global I2C GPIOs (HW)</u></p>";
addField("SDA2", "pin", -1, false);
addField("SCL2", "pin", -1, false);
addField("SDA", "pin", -1, false);
addField("SCL", "pin", -1, false);
urows+="<hr class=\"sml\">";
urows+="<p><u>Global SPI GPIOs (HW)</u></p>";
addField("MOSI2", "pin", -1, false);
addField("MISO2", "pin", -1, false);
addField("SCLK2", "pin", -1, false);
addField("MOSI", "pin", -1, false);
addField("MISO", "pin", -1, false);
addField("SCLK", "pin", -1, false);
}
if (isO(umCfg)) {
//WLEDMM: read url parameter. e.g. um=AudioReactive and if set only add the usermod with the same name

10
wled00/pin_manager.cpp
View File

@@ -152,11 +152,11 @@ String PinManagerClass::getPinSpecialText(int gpio) { // special purpose PIN in
#endif
// hardware special purpose PINS. part2 - default pins
if ((gpio == i2c_sda) || ((gpio == HW_PIN_SDA) && (i2c_sda < 0))) return(F("(default) I2C SDA"));
if ((gpio == i2c_scl) || ((gpio == HW_PIN_SCL) && (i2c_scl < 0))) return(F("(default) I2C SCL"));
if ((gpio == spi_sclk) || ((gpio == HW_PIN_CLOCKSPI) && (spi_sclk < 0))) return(F("(default) SPI SLK / SCK"));
if ((gpio == spi_mosi) || ((gpio == HW_PIN_DATASPI) && (spi_mosi < 0))) return(F("(default) SPI PICO / MOSI"));
if ((gpio == spi_miso) || ((gpio == HW_PIN_MISOSPI) && (spi_miso < 0))) return(F("(default) SPI POCI / MISO"));
if (gpio == i2c_sda) return(F("(default) I2C SDA"));
if (gpio == i2c_scl) return(F("(default) I2C SCL"));
if (gpio == spi_sclk) return(F("(default) SPI SLK / SCK"));
if (gpio == spi_mosi) return(F("(default) SPI PICO / MOSI"));
if (gpio == spi_miso) return(F("(default) SPI POCI / MISO"));
//if ((gpio == spi_cs) || ((gpio == HW_PIN_CS) && (spi_cs < 0))) return(F("(default) SPI CS / SS"));
#if defined(WLED_USE_SD_MMC) || defined(WLED_USE_SD_SPI) || defined(SD_ADAPTER)
if ((gpio == HW_PIN_CSSPI)) return(F("(default) SPI CS / SS")); // no part of usermod default settings, currently only needed by SD_CARD usermod

10
wled00/set.cpp
View File

@@ -522,11 +522,11 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
AsyncWebParameter* p = request->getParam(i);
if (p_prev != nullptr && p->name() == p_prev->name())
{
if (p->name() == "SDA2:pin") hw_sda_pin = p->value().toInt();
if (p->name() == "SCL2:pin") hw_scl_pin = p->value().toInt();
if (p->name() == "MOSI2:pin") hw_mosi_pin = p->value().toInt();
if (p->name() == "MISO2:pin") hw_miso_pin = p->value().toInt();
if (p->name() == "SCLK2:pin") hw_sclk_pin = p->value().toInt();
if (p->name() == "SDA:pin") hw_sda_pin = p->value().toInt();
if (p->name() == "SCL:pin") hw_scl_pin = p->value().toInt();
if (p->name() == "MOSI:pin") hw_mosi_pin = p->value().toInt();
if (p->name() == "MISO:pin") hw_miso_pin = p->value().toInt();
if (p->name() == "SCLK:pin") hw_sclk_pin = p->value().toInt();
}
p_prev = p;
}

30
wled00/xml.cpp
View File

@@ -704,31 +704,31 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
// oappend(SET_F("numM="));
// oappendi(usermods.getModCount());
// oappend(";");
oappend(SET_F("d.getElementsByName(\"SDA2:pin\")[1].value=")); oappendi(i2c_sda); oappend(";");
oappend(SET_F("d.getElementsByName(\"SCL2:pin\")[1].value=")); oappendi(i2c_scl); oappend(";");
oappend(SET_F("d.getElementsByName(\"MOSI2:pin\")[1].value=")); oappendi(spi_mosi); oappend(";");
oappend(SET_F("d.getElementsByName(\"MISO2:pin\")[1].value=")); oappendi(spi_miso); oappend(";");
oappend(SET_F("d.getElementsByName(\"SCLK2:pin\")[1].value=")); oappendi(spi_sclk); oappend(";");
oappend(SET_F("d.getElementsByName(\"SDA:pin\")[1].value=")); oappendi(i2c_sda); oappend(";");
oappend(SET_F("d.getElementsByName(\"SCL:pin\")[1].value=")); oappendi(i2c_scl); oappend(";");
oappend(SET_F("d.getElementsByName(\"MOSI:pin\")[1].value=")); oappendi(spi_mosi); oappend(";");
oappend(SET_F("d.getElementsByName(\"MISO:pin\")[1].value=")); oappendi(spi_miso); oappend(";");
oappend(SET_F("d.getElementsByName(\"SCLK:pin\")[1].value=")); oappendi(spi_sclk); oappend(";");
//WLEDMM: add help info showing defaults
oappend(SET_F("addInfo('SDA2:pin',0,'', 'SDA');"));
oappend(SET_F("addInfo('SDA:pin',0,'', 'SDA');"));
#ifdef HW_PIN_SDA
oappend(SET_F("xOption('SDA2:pin',1,' ⎌',")); oappendi(HW_PIN_SDA); oappend(");");
oappend(SET_F("xOption('SDA:pin',1,' ⎌',")); oappendi(HW_PIN_SDA); oappend(");");
#endif
oappend(SET_F("addInfo('SCL2:pin',0,'', 'SCL');"));
oappend(SET_F("addInfo('SCL:pin',0,'', 'SCL');"));
#ifdef HW_PIN_SCL
oappend(SET_F("xOption('SCL2:pin',1,' ⎌',")); oappendi(HW_PIN_SCL); oappend(");");
oappend(SET_F("xOption('SCL:pin',1,' ⎌',")); oappendi(HW_PIN_SCL); oappend(");");
#endif
oappend(SET_F("addInfo('MOSI2:pin',0,'', 'MOSI');"));
oappend(SET_F("addInfo('MOSI:pin',0,'', 'MOSI');"));
#ifdef HW_PIN_DATASPI
oappend(SET_F("xOption('MOSI2:pin',1,' ⎌',")); oappendi(HW_PIN_DATASPI); oappend(");");
oappend(SET_F("xOption('MOSI:pin',1,' ⎌',")); oappendi(HW_PIN_DATASPI); oappend(");");
#endif
oappend(SET_F("addInfo('MISO2:pin',0,'', 'MISO');"));
oappend(SET_F("addInfo('MISO:pin',0,'', 'MISO');"));
#ifdef HW_PIN_MISOSPI
oappend(SET_F("xOption('MISO2:pin',1,' ⎌',")); oappendi(HW_PIN_MISOSPI); oappend(");");
oappend(SET_F("xOption('MISO:pin',1,' ⎌',")); oappendi(HW_PIN_MISOSPI); oappend(");");
#endif
oappend(SET_F("addInfo('SCLK2:pin',0,'', 'SCLK');"));
oappend(SET_F("addInfo('SCLK:pin',0,'', 'SCLK');"));
#ifdef HW_PIN_CLOCKSPI
oappend(SET_F("xOption('SCLK2:pin',1,' ⎌',")); oappendi(HW_PIN_CLOCKSPI); oappend(");");
oappend(SET_F("xOption('SCLK:pin',1,' ⎌',")); oappendi(HW_PIN_CLOCKSPI); oappend(");");
#endif
}