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

Merge remote-tracking branch 'upstream/main' into mdev

Browse Source
This commit is contained in:
Ewoud
2023-01-24 20:57:08 +01:00
parent 15d753aa4a d553160d65
commit 9894ae725b
24 changed files with 3652 additions and 1706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usermods/Temperature/usermod_temperature.h
View File

@@ -385,9 +385,9 @@ class UsermodTemperature : public Usermod {
void appendConfigData()
{
oappend(SET_F("addHB('Temperature');")); // WLEDMM
oappend(SET_F("addInfo('Temperature:parasite-pwr"));
oappend(SET_F("addInfo('Temperature:parasite-pwr")); //WLEDMM use literals
oappend(SET_F("',1,'<i>(if no Vcc connected)</i>');")); // 0 is field type, 1 is actual field
oappend(SET_F("addInfo('Temperature:parasite-pwr-pin"));
oappend(SET_F("addInfo('Temperature:parasite-pwr-pin")); //WLEDMM use literals
oappend(SET_F("',1,'<i>(for external MOSFET)</i>');")); // 0 is field type, 1 is actual field
}

2
usermods/multi_relay/usermod_multi_relay.h
View File

@@ -184,7 +184,7 @@ class MultiRelay : public Usermod {
*/
MultiRelay() {
const int8_t defPins[] = {MULTI_RELAY_PINS};
for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
for (size_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
_relay[i].pin = i<sizeof(defPins) ? defPins[i] : -1;
_relay[i].delay = 0;
_relay[i].mode = false;