lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default pins for Multi-Relay.

Browse Source 
Update page fix.
This commit is contained in:
Blaz Kristan 2022-04-28 22:31:09 +02:00
parent 9667365d9e
commit 2a3d128f3c
3 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usermods/multi_relay/usermod_multi_relay.h
View File

@ -6,6 +6,10 @@
#define MULTI_RELAY_MAX_RELAYS 4 #define MULTI_RELAY_MAX_RELAYS 4
#endif #endif
#ifndef MULTI_RELAY_PINS
#define MULTI_RELAY_PINS -1
#endif
#define WLED_DEBOUNCE_THRESHOLD 50 //only consider button input of at least 50ms as valid (debouncing) #define WLED_DEBOUNCE_THRESHOLD 50 //only consider button input of at least 50ms as valid (debouncing)
#define ON true #define ON true
@ -177,8 +181,9 @@ class MultiRelay : public Usermod {
* constructor * constructor
*/ */
MultiRelay() { MultiRelay() {
const int8_t defPins[] = {MULTI_RELAY_PINS};
for (uint8_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) { for (uint8_t i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
_relay[i].pin = -1; _relay[i].pin = i<sizeof(defPins) ? defPins[i] : -1;
_relay[i].delay = 0; _relay[i].delay = 0;
_relay[i].mode = false; _relay[i].mode = false;
_relay[i].active = false; _relay[i].active = false;
@ -619,7 +624,7 @@ class MultiRelay : public Usermod {
DEBUG_PRINTLN(F(" config (re)loaded.")); DEBUG_PRINTLN(F(" config (re)loaded."));
} }
// use "return !top["newestParameter"].isNull();" when updating Usermod with new features // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
return !top[FPSTR(_broadcast)].isNull(); return !top[FPSTR(_HAautodiscovery)].isNull();
} }
/** /**

7
wled00/data/update.htm
View File

@ -19,11 +19,10 @@
Installed version: <span class="sip">##VERSION##</span><br> Installed version: <span class="sip">##VERSION##</span><br>
Download the latest binary: <a href="https://github.com/Aircoookie/WLED/releases" target="_blank"> Download the latest binary: <a href="https://github.com/Aircoookie/WLED/releases" target="_blank">
<img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br> <img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br>
<input type='file' class="bt" name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app--> <input type='file' name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->
<input type='submit' class="bt" value='Update!' ><br> <button type="submit">Update!</button><br>
<button type="button" class="bt" onclick="B()">Back</button> <button type="button" onclick="B()">Back</button>
</form> </form>
<div id="msg"><b>Updating...</b><br>Please do not close or refresh the page :)</div> <div id="msg"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
</body> </body>
</html> </html>

81
wled00/html_other.h
View File

@ -41,48 +41,47 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
#endif #endif
// Autogenerated from wled00/data/update.htm, do not edit!! // Autogenerated from wled00/data/update.htm, do not edit!!
const uint16_t PAGE_update_length = 630; const uint16_t PAGE_update_length = 615;
const uint8_t PAGE_update[] PROGMEM = { const uint8_t PAGE_update[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0xc1, 0x6e, 0xd4, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0x5d, 0x6f, 0xd4, 0x30,
0x10, 0xbd, 0xe7, 0x2b, 0x5c, 0x9f, 0x76, 0x25, 0xd6, 0x29, 0xe5, 0x44, 0x49, 0x52, 0x58, 0x5a, 0x10, 0x7c, 0xcf, 0xaf, 0x70, 0xfd, 0x74, 0x27, 0x71, 0x4e, 0x29, 0x4f, 0x94, 0x24, 0x85, 0xa3,
0xa1, 0x4a, 0x48, 0xad, 0xd4, 0x16, 0xc4, 0x09, 0x39, 0xf6, 0x64, 0x63, 0xd6, 0xb1, 0x53, 0x7b, 0x15, 0xaa, 0x84, 0xd4, 0x4a, 0x6d, 0x41, 0x3c, 0x21, 0xc7, 0xde, 0x5c, 0xcc, 0x39, 0x76, 0x6a,
0xb2, 0xab, 0x08, 0xf5, 0xdf, 0x99, 0x38, 0xbb, 0x55, 0x0b, 0xe2, 0x12, 0xc5, 0xf1, 0x7b, 0x6f, 0x6f, 0xee, 0x14, 0x55, 0xfd, 0xef, 0x6c, 0x9c, 0xbb, 0x82, 0xf8, 0x78, 0x89, 0xe2, 0xec, 0xec,
0x66, 0xde, 0x9b, 0x14, 0x27, 0x97, 0x37, 0x9f, 0xef, 0x7f, 0xdc, 0x5e, 0xb1, 0x16, 0x3b, 0x5b, 0x78, 0x77, 0x66, 0x52, 0x9c, 0x5c, 0xde, 0x7c, 0xbc, 0xff, 0x76, 0x7b, 0xc5, 0x5a, 0xec, 0x6c,
0x15, 0x87, 0x27, 0x48, 0x5d, 0x15, 0x1d, 0xa0, 0x64, 0xca, 0x3b, 0x04, 0x87, 0x25, 0xdf, 0x1b, 0x55, 0x1c, 0x9e, 0x20, 0x75, 0x55, 0x74, 0x80, 0x92, 0x29, 0xef, 0x10, 0x1c, 0x96, 0x7c, 0x6f,
0x8d, 0x6d, 0xa9, 0x61, 0x67, 0x14, 0xac, 0xd2, 0x81, 0x33, 0x27, 0x3b, 0x28, 0xf9, 0xce, 0xc0, 0x34, 0xb6, 0xa5, 0x86, 0x9d, 0x51, 0xb0, 0x4a, 0x07, 0xce, 0x9c, 0xec, 0xa0, 0xe4, 0x3b, 0x03,
0xbe, 0xf7, 0x01, 0x79, 0x95, 0x15, 0x68, 0xd0, 0x42, 0xf5, 0xfd, 0xeb, 0xd5, 0x25, 0x7b, 0xe8, 0xfb, 0xde, 0x07, 0xe4, 0x55, 0x56, 0xa0, 0x41, 0x0b, 0xd5, 0xd7, 0xcf, 0x57, 0x97, 0xec, 0xa1,
0xb5, 0x44, 0x28, 0xf2, 0xf9, 0x53, 0x11, 0x55, 0x30, 0x3d, 0x56, 0x59, 0x33, 0x38, 0x85, 0xc6, 0xd7, 0x12, 0xa1, 0xc8, 0xe7, 0x4f, 0x45, 0x54, 0xc1, 0xf4, 0x58, 0x65, 0xcd, 0xe0, 0x14, 0x1a,
0x3b, 0xb6, 0x5e, 0x2c, 0x7f, 0xef, 0x8d, 0xd3, 0x7e, 0x2f, 0x5a, 0x13, 0xd1, 0x87, 0x51, 0xd4, 0xef, 0xd8, 0x7a, 0xb1, 0x7c, 0xda, 0x1b, 0xa7, 0xfd, 0x5e, 0xb4, 0x26, 0xa2, 0x0f, 0xa3, 0xa8,
0x52, 0x6d, 0x17, 0xcb, 0xa7, 0x67, 0xc8, 0x03, 0x41, 0xb4, 0x57, 0x43, 0x47, 0x1d, 0x88, 0x0d, 0xa5, 0xda, 0x2e, 0x96, 0xcf, 0x2f, 0x90, 0x07, 0x82, 0x68, 0xaf, 0x86, 0x8e, 0x26, 0x10, 0x1b,
0xe0, 0x95, 0x85, 0xe9, 0x75, 0x3d, 0x5e, 0xeb, 0x05, 0x1f, 0x1a, 0xbe, 0x14, 0x11, 0x47, 0x0b, 0xc0, 0x2b, 0x0b, 0xd3, 0xeb, 0x7a, 0xbc, 0xd6, 0x0b, 0x3e, 0x34, 0x7c, 0x29, 0x22, 0x8e, 0x16,
0x42, 0x9b, 0xd8, 0x5b, 0x39, 0x96, 0xdc, 0x79, 0x07, 0xfc, 0xcd, 0x7f, 0x29, 0x5d, 0xdc, 0xfc, 0x84, 0x36, 0xb1, 0xb7, 0x72, 0x2c, 0xb9, 0xf3, 0x0e, 0xf8, 0xab, 0xff, 0xb6, 0x74, 0x71, 0xf3,
0xcb, 0xa9, 0xad, 0x57, 0x5b, 0xfe, 0x94, 0x15, 0xf9, 0xa1, 0xc5, 0x43, 0xab, 0x2c, 0x06, 0x55, 0x77, 0x4f, 0x6d, 0xbd, 0xda, 0xf2, 0xe7, 0xac, 0xc8, 0x0f, 0x23, 0x1e, 0x46, 0x65, 0x31, 0xa8,
0xf2, 0x3c, 0x02, 0xa2, 0x71, 0x9b, 0x98, 0x47, 0xf1, 0x2b, 0x5e, 0xf4, 0xe5, 0x7b, 0x5e, 0xbd, 0x92, 0xe7, 0x11, 0x10, 0x8d, 0xdb, 0xc4, 0x3c, 0x8a, 0x1f, 0xf1, 0xa2, 0x2f, 0xdf, 0xf2, 0xea,
0x40, 0x4e, 0x52, 0x55, 0xf6, 0xd1, 0x74, 0x93, 0x01, 0x6c, 0x08, 0x76, 0xc1, 0x67, 0x79, 0x15, 0x37, 0xe4, 0x44, 0x55, 0x65, 0xef, 0x4d, 0x37, 0x09, 0xc0, 0x86, 0x60, 0x17, 0x7c, 0xa6, 0x57,
0x23, 0x5f, 0x7e, 0x20, 0x64, 0x42, 0x14, 0xf9, 0x6c, 0x69, 0xed, 0xf5, 0xc8, 0xbc, 0xb3, 0x5e, 0x31, 0xf2, 0xe5, 0x3b, 0x42, 0x26, 0x44, 0x91, 0xcf, 0x92, 0xd6, 0x5e, 0x8f, 0xcc, 0x3b, 0xeb,
0xea, 0x92, 0x7f, 0x01, 0xfc, 0xb6, 0x58, 0x92, 0x5c, 0x7b, 0x56, 0x65, 0xc9, 0xb2, 0x3b, 0xdf, 0xa5, 0x2e, 0xf9, 0x27, 0xc0, 0x2f, 0x8b, 0x25, 0xd1, 0xb5, 0x67, 0x55, 0x96, 0x24, 0xbb, 0xf3,
0xe0, 0x5e, 0x06, 0x78, 0xf6, 0x8e, 0x6e, 0x8a, 0xc6, 0x87, 0x8e, 0x51, 0x16, 0xad, 0x27, 0xce, 0x0d, 0xee, 0x65, 0x80, 0x17, 0xed, 0xa8, 0x52, 0x34, 0x3e, 0x74, 0x8c, 0xbc, 0x68, 0x3d, 0xf5,
0xed, 0xcd, 0xdd, 0x3d, 0x67, 0x32, 0xd9, 0x43, 0xcd, 0x0d, 0x09, 0xc7, 0x99, 0xa1, 0x2b, 0xf2, 0xdc, 0xde, 0xdc, 0xdd, 0x73, 0x26, 0x93, 0x3c, 0x34, 0xdc, 0x90, 0x70, 0x9c, 0x19, 0x2a, 0x91,
0x83, 0x65, 0x40, 0xce, 0x8d, 0x3d, 0x85, 0xd2, 0x0d, 0x16, 0x4d, 0x2f, 0x03, 0xe6, 0x13, 0x7f, 0x1e, 0x2c, 0x03, 0x52, 0x6e, 0xec, 0xc9, 0x94, 0x6e, 0xb0, 0x68, 0x7a, 0x19, 0x30, 0x9f, 0xfa,
0x45, 0x30, 0xc9, 0xa9, 0x72, 0x1c, 0xea, 0xce, 0x50, 0x9a, 0x0f, 0x53, 0xe1, 0x6b, 0x17, 0x51, 0x57, 0x04, 0x93, 0x9c, 0x6e, 0x8e, 0x43, 0xdd, 0x19, 0x72, 0xf3, 0x61, 0xba, 0xf8, 0xda, 0x45,
0x5a, 0x0b, 0x9a, 0xed, 0x20, 0x44, 0x52, 0x3c, 0x67, 0x45, 0xec, 0xa5, 0x63, 0x99, 0xb2, 0x32, 0x94, 0xd6, 0x82, 0x66, 0x3b, 0x08, 0x91, 0x18, 0xcf, 0x59, 0x11, 0x7b, 0xe9, 0x58, 0xa6, 0xac,
0xc6, 0x92, 0x47, 0xd3, 0xf3, 0xea, 0x54, 0xbc, 0x7d, 0x27, 0xce, 0x56, 0xb5, 0x3d, 0xa5, 0x69, 0x8c, 0xb1, 0xe4, 0xd1, 0xf4, 0xbc, 0x3a, 0x15, 0xaf, 0xdf, 0x88, 0xb3, 0x55, 0x6d, 0x4f, 0x69,
0xe8, 0x96, 0xa6, 0x08, 0xd5, 0xa5, 0xdf, 0xa7, 0x29, 0x18, 0xb6, 0xc0, 0x2c, 0xf5, 0x10, 0x91, 0x1b, 0xaa, 0xd2, 0x16, 0xa1, 0xba, 0xf4, 0xfb, 0xb4, 0x05, 0xc3, 0x16, 0x98, 0xa5, 0x19, 0x22,
0xd5, 0xc6, 0xc9, 0x30, 0x92, 0x86, 0x64, 0x59, 0x1b, 0xa0, 0x29, 0x79, 0x8b, 0xd8, 0xc7, 0xf3, 0xb2, 0xda, 0x38, 0x19, 0x46, 0xe2, 0x90, 0x2c, 0x6b, 0x03, 0x34, 0x25, 0x6f, 0x11, 0xfb, 0x78,
0x3c, 0xdf, 0x18, 0x6c, 0x87, 0x5a, 0x28, 0xdf, 0xe5, 0x9f, 0x4c, 0x50, 0xde, 0xfb, 0xad, 0x81, 0x9e, 0xe7, 0x1b, 0x83, 0xed, 0x50, 0x0b, 0xe5, 0xbb, 0xfc, 0x83, 0x09, 0xca, 0x7b, 0xbf, 0x35,
0x7c, 0x1a, 0x39, 0x0f, 0x60, 0x41, 0x46, 0x88, 0x9c, 0xa1, 0x0c, 0x94, 0x57, 0xc9, 0x7f, 0xd6, 0x90, 0x4f, 0x2b, 0xe7, 0x01, 0x2c, 0xc8, 0x08, 0x91, 0x33, 0x94, 0x81, 0xfc, 0x2a, 0xf9, 0xf7,
0x56, 0xba, 0x2d, 0xd9, 0x62, 0xba, 0x0d, 0xcb, 0x52, 0x08, 0x47, 0x1d, 0xfa, 0x22, 0x62, 0x6b, 0xda, 0x4a, 0xb7, 0x25, 0x59, 0x4c, 0xb7, 0x61, 0x59, 0x32, 0xe1, 0xc8, 0x43, 0x5f, 0x44, 0x6c,
0xc0, 0xea, 0x28, 0x8c, 0x3f, 0xc8, 0x1e, 0x25, 0xfe, 0x96, 0x16, 0x71, 0xb7, 0xb9, 0x48, 0xf6, 0x0d, 0x58, 0x1d, 0x85, 0xf1, 0x07, 0xda, 0x23, 0xc5, 0x9f, 0xd4, 0x22, 0xee, 0x36, 0x17, 0x49,
0x97, 0x0d, 0x75, 0xb8, 0x8a, 0x8f, 0x03, 0x59, 0x3b, 0x2d, 0x69, 0x2e, 0xd3, 0x0c, 0x85, 0x71, 0xfe, 0xb2, 0xa1, 0x09, 0x57, 0xf1, 0x71, 0x20, 0x69, 0xa7, 0x90, 0xe6, 0x32, 0xed, 0x50, 0x18,
0xfd, 0x80, 0x6c, 0xf6, 0xab, 0x31, 0x96, 0x7c, 0x3c, 0xcc, 0x5d, 0xe3, 0x71, 0xb7, 0x8f, 0x06, 0xd7, 0x0f, 0xc8, 0x66, 0xbd, 0x1a, 0x63, 0xe1, 0x18, 0xe8, 0xa3, 0xaa, 0x01, 0x1e, 0x07, 0x13,
0x07, 0x78, 0x1c, 0x4c, 0x00, 0xfd, 0x92, 0x98, 0xcd, 0xcc, 0xd9, 0xd2, 0x57, 0xdc, 0x9d, 0xb4, 0x40, 0xcf, 0xe8, 0x7a, 0x40, 0xa4, 0x4c, 0xce, 0xf0, 0x59, 0x47, 0x22, 0x9b, 0x9d, 0x3a, 0x29,
0x03, 0xdd, 0xcc, 0x29, 0x9e, 0xf0, 0x99, 0x54, 0x0f, 0x88, 0xb4, 0xd3, 0x33, 0x69, 0x3e, 0xbc, 0xf2, 0xb9, 0xfc, 0x0f, 0xe8, 0x7c, 0x98, 0xc4, 0x57, 0xd6, 0xa8, 0x6d, 0xc9, 0xd7, 0x93, 0xf6,
0x22, 0x65, 0xde, 0x29, 0x6b, 0xd4, 0xb6, 0xe4, 0xeb, 0x29, 0x9c, 0x35, 0xfd, 0x0b, 0x45, 0x3e, 0x6b, 0x8a, 0xfa, 0xaf, 0xa6, 0x64, 0x52, 0x55, 0x68, 0xb3, 0xcb, 0x92, 0x97, 0x53, 0x50, 0x89,
0xe3, 0x68, 0x7f, 0xa6, 0x14, 0xab, 0x42, 0x9b, 0x5d, 0xca, 0x7a, 0x5a, 0x64, 0x52, 0xac, 0x52, 0xa6, 0x4a, 0xec, 0x94, 0x3e, 0x21, 0x04, 0x81, 0x13, 0xf9, 0x6d, 0x5a, 0x96, 0x69, 0xcf, 0x9c,
0x05, 0xda, 0x4e, 0x21, 0x04, 0x61, 0x53, 0x9d, 0xec, 0x36, 0xb9, 0xc1, 0xb4, 0x67, 0xce, 0x23, 0x47, 0xa6, 0xac, 0xa7, 0x83, 0x0f, 0x34, 0x6b, 0x13, 0x20, 0xb6, 0xc9, 0x8f, 0x5e, 0x6e, 0x80,
0x15, 0xf0, 0x74, 0xf0, 0x81, 0x26, 0x68, 0x02, 0xc4, 0x36, 0x05, 0xd6, 0xcb, 0x0d, 0xb0, 0xf3, 0x9d, 0x2f, 0x8b, 0x9c, 0xf8, 0xa6, 0x75, 0xa7, 0xd4, 0x4d, 0x11, 0x9c, 0xfe, 0xed, 0x9f, 0x54,
0x65, 0x91, 0x93, 0x1e, 0x69, 0x4f, 0x5b, 0x39, 0xad, 0xe8, 0xf4, 0xef, 0xff, 0x01, 0x17, 0xda, 0x34, 0xf6, 0xf4, 0xf1, 0x03, 0x00, 0x00
0x9b, 0x0e, 0x11, 0x04, 0x00, 0x00
}; };