From 7946c745d4e40ff8b2cd86ed78b99000c774bd6c Mon Sep 17 00:00:00 2001 From: Ewoud Date: Sat, 19 Nov 2022 14:15:29 +0100 Subject: [PATCH] Fix ledmap code Index.js: fix ledmap bug json.cpp: remove old ledmap checks presets.cpp: remove loadledmap call --- wled00/data/index.js | 2 +- wled00/html_other.h | 76 +++++++++++++++++++++--------------------- wled00/html_settings.h | 34 +++++++++---------- wled00/html_ui.h | 4 +-- wled00/json.cpp | 11 +----- wled00/presets.cpp | 1 - 6 files changed, 59 insertions(+), 69 deletions(-) diff --git a/wled00/data/index.js b/wled00/data/index.js index 3b8012ed..0d3818ae 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -1854,7 +1854,7 @@ ${makePlSel(plJson[i].end?plJson[i].end:0, true)} `; - if (Array.isArray(lastinfo.maps) && lastinfo.maps.length>1) { + if (Array.isArray(lastinfo.maps) && lastinfo.maps.length>0) { content += `
Ledmap: 
"; diff --git a/wled00/html_other.h b/wled00/html_other.h index 8ba3e04d..5229a0a6 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -41,46 +41,46 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()====="; #endif // Autogenerated from wled00/data/update.htm, do not edit!! -const uint16_t PAGE_update_length = 603; +const uint16_t PAGE_update_length = 605; const uint8_t PAGE_update[] PROGMEM = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x7d, 0xcf, 0x57, 0x78, 0x7e, 0x6a, 0x25, 0x66, 0x0f, 0xc4, 0x0b, 0x23, 0xc9, 0x50, 0xd9, - 0x84, 0x90, 0x98, 0x36, 0x69, 0x1b, 0x88, 0x27, 0xe4, 0xc4, 0x37, 0x8d, 0xa9, 0x63, 0x67, 0xf6, - 0x4d, 0xab, 0x0a, 0xed, 0xdf, 0xb9, 0x76, 0xda, 0x81, 0x34, 0x78, 0x68, 0x55, 0xc7, 0xe7, 0x9e, - 0x9e, 0x7b, 0xce, 0x49, 0x79, 0x72, 0x79, 0xf3, 0xf1, 0xfe, 0xfb, 0xed, 0x15, 0xeb, 0x71, 0xb0, - 0x75, 0x79, 0xf8, 0x06, 0xa5, 0xeb, 0x72, 0x00, 0x54, 0xac, 0xf5, 0x0e, 0xc1, 0x61, 0xc5, 0x77, - 0x46, 0x63, 0x5f, 0x69, 0xd8, 0x9a, 0x16, 0x4e, 0xf3, 0x81, 0x33, 0xa7, 0x06, 0xa8, 0xf8, 0xd6, - 0xc0, 0x6e, 0xf4, 0x01, 0x79, 0x5d, 0x94, 0x68, 0xd0, 0x42, 0xfd, 0xed, 0xcb, 0xd5, 0x25, 0x7b, - 0x18, 0xb5, 0x42, 0x28, 0xe5, 0xfc, 0xa8, 0x8c, 0x6d, 0x30, 0x23, 0xd6, 0x45, 0x37, 0xb9, 0x16, - 0x8d, 0x77, 0x6c, 0xb5, 0x58, 0xfe, 0xda, 0x19, 0xa7, 0xfd, 0x4e, 0xf4, 0x26, 0xa2, 0x0f, 0x7b, - 0xd1, 0xa8, 0x76, 0xb3, 0x58, 0x3e, 0x3d, 0x43, 0x1e, 0x08, 0xa2, 0x7d, 0x3b, 0x0d, 0xa4, 0x40, - 0xac, 0x01, 0xaf, 0x2c, 0xa4, 0x9f, 0xab, 0xfd, 0x67, 0xbd, 0xe0, 0x53, 0xc7, 0x97, 0x22, 0xe2, - 0xde, 0x82, 0xd0, 0x26, 0x8e, 0x56, 0xed, 0x2b, 0xee, 0xbc, 0x03, 0xfe, 0xea, 0xbf, 0x23, 0x43, - 0x5c, 0xbf, 0x9c, 0x69, 0xac, 0x6f, 0x37, 0xfc, 0xa9, 0x28, 0xe5, 0x41, 0xe2, 0x41, 0x2a, 0x8b, - 0xa1, 0xad, 0xb8, 0x8c, 0x80, 0x68, 0xdc, 0x3a, 0xca, 0x28, 0x7e, 0xc6, 0x8b, 0xb1, 0x7a, 0xc7, - 0xeb, 0xbf, 0x90, 0x89, 0xaa, 0x2e, 0x3e, 0x98, 0x21, 0x19, 0xc0, 0xa6, 0x60, 0x17, 0x7c, 0xa6, - 0x6f, 0x63, 0xe4, 0xcb, 0xf7, 0x84, 0xcc, 0x88, 0x52, 0xce, 0x96, 0x36, 0x5e, 0xef, 0x99, 0x77, - 0xd6, 0x2b, 0x5d, 0xf1, 0x4f, 0x80, 0x5f, 0x17, 0x4b, 0xa2, 0xeb, 0xdf, 0xd4, 0xc5, 0xb5, 0xf7, - 0xee, 0xda, 0x6b, 0x96, 0xad, 0xbb, 0xf3, 0x1d, 0xee, 0x54, 0x80, 0x67, 0x0f, 0x09, 0x51, 0x76, - 0x3e, 0x0c, 0x8c, 0x32, 0xe9, 0x3d, 0xcd, 0xde, 0xde, 0xdc, 0xdd, 0x73, 0xa6, 0xb2, 0x4d, 0x24, - 0x72, 0xca, 0x38, 0xce, 0x0c, 0x5d, 0x91, 0x2f, 0xac, 0x00, 0x72, 0x70, 0x3f, 0x52, 0x38, 0xc3, - 0x64, 0xd1, 0x8c, 0x2a, 0xa0, 0x4c, 0xf3, 0xa7, 0x04, 0x53, 0x9c, 0x14, 0xc4, 0xa9, 0x19, 0x0c, - 0xa5, 0xfa, 0x90, 0x05, 0xc4, 0x51, 0x39, 0xd6, 0x5a, 0x15, 0x63, 0xc5, 0xa3, 0x19, 0x79, 0x7d, - 0x26, 0x5e, 0xbf, 0x15, 0x67, 0x82, 0x3e, 0xb4, 0x01, 0x5d, 0x52, 0xb2, 0x4d, 0xa8, 0x2f, 0xfd, - 0x2e, 0x4b, 0x67, 0xd8, 0x03, 0xb3, 0xf4, 0x87, 0x11, 0x59, 0x00, 0x0b, 0x2a, 0xc2, 0x39, 0x2b, - 0x15, 0x2b, 0xfa, 0x00, 0x5d, 0xc5, 0x7b, 0xc4, 0x31, 0x9e, 0x4b, 0xb9, 0x36, 0xd8, 0x4f, 0x8d, - 0x68, 0xfd, 0x20, 0x0f, 0xdb, 0x4d, 0x16, 0xa2, 0x4c, 0x1b, 0xca, 0xc3, 0x58, 0xe4, 0x0c, 0x55, - 0xa0, 0x98, 0x2a, 0xfe, 0xa3, 0xb1, 0xca, 0x6d, 0x48, 0x8c, 0x19, 0xd6, 0xac, 0xc8, 0xde, 0x1f, - 0x89, 0xe8, 0x89, 0x88, 0xbd, 0x01, 0xab, 0xa3, 0x30, 0xfe, 0xc0, 0x7b, 0xa4, 0x78, 0xc1, 0x2d, - 0xe2, 0x76, 0x7d, 0x91, 0x6d, 0xaf, 0x3a, 0x12, 0x79, 0x1a, 0x1f, 0x27, 0xb2, 0x32, 0x95, 0x53, - 0xaa, 0x3a, 0xad, 0x51, 0x1a, 0x37, 0x4e, 0xc8, 0x66, 0x7f, 0x3a, 0x63, 0xe1, 0x58, 0xe4, 0xa3, - 0x8b, 0x01, 0x1e, 0x27, 0x13, 0x40, 0xcf, 0xe8, 0x66, 0x42, 0xa4, 0x2e, 0xce, 0xf0, 0xd9, 0x37, - 0x22, 0x9b, 0x93, 0x39, 0x29, 0xe5, 0x7c, 0xfd, 0x0f, 0xe8, 0x7c, 0x48, 0x66, 0xb7, 0xd6, 0xb4, - 0x9b, 0x8a, 0xaf, 0x92, 0xd7, 0x2b, 0xaa, 0xf8, 0x9f, 0xa1, 0x1c, 0x4a, 0x5d, 0x6a, 0xb3, 0x2d, - 0x72, 0x76, 0xa9, 0xa0, 0x44, 0x53, 0x67, 0x76, 0x6a, 0x9d, 0x10, 0x82, 0xc0, 0x99, 0xfc, 0x36, - 0x6f, 0xcb, 0xb4, 0x67, 0xce, 0x23, 0x85, 0xe5, 0xe9, 0xe0, 0x03, 0x69, 0xed, 0x02, 0xc4, 0x3e, - 0x47, 0x32, 0xaa, 0x35, 0xb0, 0xf3, 0x65, 0x29, 0x89, 0x2f, 0xad, 0x9b, 0xda, 0x96, 0xaa, 0x97, - 0xde, 0xe9, 0xdf, 0x00, 0x3f, 0x0c, 0x61, 0xe9, 0x03, 0x00, 0x00 + 0x14, 0x7d, 0xcf, 0x57, 0x78, 0x7e, 0x6a, 0x25, 0x66, 0x8f, 0x69, 0x2f, 0x8c, 0x24, 0x43, 0x65, + 0x13, 0x42, 0x62, 0x5a, 0xa5, 0x6d, 0x20, 0x9e, 0x90, 0x13, 0xdf, 0x24, 0xa6, 0x8e, 0x9d, 0xd9, + 0x37, 0xad, 0x2a, 0xb4, 0x7f, 0xe7, 0xc6, 0x69, 0x07, 0xd2, 0xe0, 0x25, 0xaa, 0xe3, 0x73, 0x4f, + 0xcf, 0x3d, 0xe7, 0x24, 0x3f, 0xb9, 0xbe, 0xfb, 0xf8, 0xf0, 0x7d, 0x7d, 0xc3, 0x3a, 0xec, 0x6d, + 0x99, 0x1f, 0x9e, 0xa0, 0x74, 0x99, 0xf7, 0x80, 0x8a, 0xd5, 0xde, 0x21, 0x38, 0x2c, 0xf8, 0xce, + 0x68, 0xec, 0x0a, 0x0d, 0x5b, 0x53, 0xc3, 0x69, 0x3a, 0x70, 0xe6, 0x54, 0x0f, 0x05, 0xdf, 0x1a, + 0xd8, 0x0d, 0x3e, 0x20, 0x2f, 0xb3, 0x1c, 0x0d, 0x5a, 0x28, 0xbf, 0x7d, 0xb9, 0xb9, 0x66, 0x8f, + 0x83, 0x56, 0x08, 0xb9, 0x9c, 0x5f, 0xe5, 0xb1, 0x0e, 0x66, 0xc0, 0x32, 0x6b, 0x46, 0x57, 0xa3, + 0xf1, 0x8e, 0xad, 0x16, 0xcb, 0x5f, 0x3b, 0xe3, 0xb4, 0xdf, 0x89, 0xce, 0x44, 0xf4, 0x61, 0x2f, + 0x2a, 0x55, 0x6f, 0x16, 0xcb, 0xe7, 0x17, 0xc8, 0x23, 0x41, 0xb4, 0xaf, 0xc7, 0x9e, 0x14, 0x88, + 0x16, 0xf0, 0xc6, 0xc2, 0xf4, 0x73, 0xb5, 0xff, 0xac, 0x17, 0x7c, 0x6c, 0xf8, 0x52, 0x44, 0xdc, + 0x5b, 0x10, 0xda, 0xc4, 0xc1, 0xaa, 0x7d, 0xc1, 0x9d, 0x77, 0xc0, 0xdf, 0xfc, 0x77, 0xa4, 0x8f, + 0xed, 0xeb, 0x99, 0xca, 0xfa, 0x7a, 0xc3, 0x9f, 0xb3, 0x5c, 0x1e, 0x24, 0x1e, 0xa4, 0xb2, 0x18, + 0xea, 0x82, 0xcb, 0x08, 0x88, 0xc6, 0xb5, 0x51, 0x46, 0xf1, 0x33, 0x5e, 0x0d, 0xc5, 0x3b, 0x5e, + 0xfe, 0x85, 0x9c, 0xa8, 0xca, 0xec, 0x83, 0xe9, 0x27, 0x03, 0xd8, 0x18, 0xec, 0x82, 0xcf, 0xf4, + 0x75, 0x8c, 0x7c, 0xf9, 0x9e, 0x90, 0x09, 0x91, 0xcb, 0xd9, 0xd2, 0xca, 0xeb, 0x3d, 0xf3, 0xce, + 0x7a, 0xa5, 0x0b, 0xfe, 0x09, 0xf0, 0xeb, 0x62, 0x49, 0x74, 0xdd, 0x79, 0x99, 0xdd, 0x7a, 0xef, + 0x6e, 0xbd, 0x66, 0xc9, 0xba, 0x7b, 0xdf, 0xe0, 0x4e, 0x05, 0x78, 0xf1, 0x90, 0x10, 0x79, 0xe3, + 0x43, 0xcf, 0x28, 0x93, 0xce, 0xd3, 0xec, 0xfa, 0xee, 0xfe, 0x81, 0x33, 0x95, 0x6c, 0x22, 0x91, + 0x63, 0xc2, 0x71, 0x66, 0xe8, 0x8a, 0x7c, 0x61, 0x19, 0x90, 0x83, 0xfb, 0x81, 0xc2, 0xe9, 0x47, + 0x8b, 0x66, 0x50, 0x01, 0xe5, 0x34, 0x7f, 0x4a, 0x30, 0xc5, 0x49, 0x41, 0x1c, 0xab, 0xde, 0x50, + 0xaa, 0x8f, 0x49, 0x40, 0x1c, 0x94, 0x63, 0xb5, 0x55, 0x31, 0x16, 0x3c, 0x9a, 0x81, 0x97, 0x67, + 0xe2, 0xed, 0x85, 0x38, 0x13, 0x17, 0xe2, 0x9c, 0x36, 0xa0, 0x4b, 0x4a, 0xb6, 0x0a, 0xe5, 0xb5, + 0xdf, 0x25, 0xe9, 0x0c, 0x3b, 0x60, 0x96, 0xfe, 0x30, 0x22, 0x0b, 0x60, 0x41, 0x45, 0xb8, 0x64, + 0xb9, 0x62, 0x59, 0x17, 0xa0, 0x29, 0x78, 0x87, 0x38, 0xc4, 0x4b, 0x29, 0x5b, 0x83, 0xdd, 0x58, + 0x89, 0xda, 0xf7, 0xf2, 0xb0, 0xdd, 0x68, 0x21, 0xca, 0x69, 0x43, 0x79, 0x18, 0x8b, 0x9c, 0xa1, + 0x0a, 0x14, 0x53, 0xc1, 0x7f, 0x54, 0x56, 0xb9, 0x0d, 0x89, 0x31, 0x7d, 0xcb, 0xb2, 0xe4, 0xfd, + 0x91, 0x88, 0xde, 0x88, 0xd8, 0x19, 0xb0, 0x3a, 0x0a, 0xe3, 0x0f, 0xbc, 0x47, 0x8a, 0x57, 0xdc, + 0x22, 0x6e, 0xdb, 0xab, 0x64, 0x7b, 0xd1, 0x90, 0xc8, 0xd3, 0xf8, 0x34, 0x92, 0x95, 0x53, 0x39, + 0xa5, 0x2a, 0xa7, 0x35, 0x72, 0xe3, 0x86, 0x11, 0xd9, 0xec, 0x4f, 0x63, 0x2c, 0x1c, 0x8b, 0x7c, + 0x74, 0x31, 0xc0, 0xd3, 0x68, 0x02, 0xe8, 0x19, 0x5d, 0x8d, 0x88, 0xd4, 0xc5, 0x19, 0x3e, 0xfb, + 0x46, 0x64, 0x73, 0x32, 0x27, 0xb9, 0x9c, 0xaf, 0xff, 0x01, 0x9d, 0x0f, 0x93, 0xd9, 0xb5, 0x35, + 0xf5, 0xa6, 0xe0, 0xab, 0xc9, 0xeb, 0x15, 0x55, 0xfc, 0xcf, 0x50, 0x0a, 0xa5, 0xcc, 0xb5, 0xd9, + 0x66, 0x29, 0xbb, 0xa9, 0xa0, 0x44, 0x53, 0x26, 0x76, 0x6a, 0x9d, 0x10, 0x82, 0xc0, 0x89, 0x7c, + 0x9d, 0xb6, 0x65, 0xda, 0x33, 0xe7, 0x91, 0xc2, 0xf2, 0x74, 0xf0, 0x81, 0xb4, 0x36, 0x01, 0x62, + 0x97, 0x22, 0x19, 0x54, 0x0b, 0xec, 0x72, 0x99, 0x4b, 0xe2, 0x9b, 0xd6, 0x9d, 0xda, 0x36, 0x55, + 0x6f, 0xfa, 0xa6, 0x7f, 0x03, 0xd6, 0xd4, 0xbb, 0x6c, 0xe9, 0x03, 0x00, 0x00 }; diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 8f74f22f..bd3d3f1b 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -1470,7 +1470,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = { // Autogenerated from wled00/data/settings_sec.htm, do not edit!! -const uint16_t PAGE_settings_sec_length = 2405; +const uint16_t PAGE_settings_sec_length = 2406; const uint8_t PAGE_settings_sec[] PROGMEM = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x73, 0xd3, 0x48, 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x19, 0xaa, 0xb2, 0xd6, 0xa1, 0x48, 0x4e, 0xe0, 0xb6, 0x20, 0x44, @@ -1607,22 +1607,22 @@ const uint8_t PAGE_settings_sec[] PROGMEM = { 0xcd, 0xf1, 0x04, 0x97, 0xac, 0xae, 0x54, 0xda, 0x72, 0xe8, 0x7e, 0xb5, 0x40, 0x1b, 0xce, 0xeb, 0x49, 0x84, 0x9b, 0x63, 0x7c, 0xac, 0x4c, 0xaa, 0xb5, 0x9e, 0x2b, 0x19, 0xd3, 0x4c, 0x18, 0xa3, 0x7b, 0x0b, 0x33, 0xa3, 0x1f, 0x53, 0x3e, 0x4e, 0x0a, 0xb4, 0x4c, 0x3e, 0xa4, 0x65, 0x4a, 0x85, - 0x1e, 0xbb, 0x91, 0x86, 0xc8, 0x86, 0x0d, 0xa2, 0xfd, 0xc7, 0xd1, 0x20, 0xc2, 0xdf, 0x9a, 0xb8, - 0x7e, 0x46, 0xc5, 0x52, 0xcd, 0x55, 0xec, 0xaf, 0x0f, 0x34, 0x35, 0x6b, 0x63, 0xf7, 0x40, 0x8d, - 0x7b, 0xa9, 0x91, 0x99, 0xa2, 0x5c, 0xed, 0xdd, 0x35, 0x60, 0x7b, 0x2b, 0xda, 0xb7, 0xa4, 0x8b, - 0x10, 0x68, 0x50, 0xc9, 0x86, 0x53, 0x6d, 0x25, 0x53, 0x05, 0xea, 0x71, 0x68, 0x0f, 0xf3, 0x75, - 0x05, 0xf7, 0x8e, 0x59, 0x5e, 0xa3, 0x7b, 0xf8, 0x55, 0xdf, 0x20, 0xd1, 0x07, 0x30, 0xfe, 0x9b, - 0x15, 0xee, 0xa3, 0x68, 0x5c, 0x9a, 0xd1, 0x04, 0x08, 0xc8, 0xc0, 0x91, 0xcd, 0x4f, 0x15, 0x7e, - 0x26, 0xde, 0xe9, 0x3c, 0xea, 0xf5, 0xd3, 0x80, 0x1d, 0x0c, 0xf6, 0x7f, 0xdd, 0x3b, 0x18, 0x1c, - 0x1c, 0xb0, 0x17, 0xb9, 0xc1, 0x65, 0x4f, 0x81, 0x44, 0x47, 0x69, 0xbe, 0xa4, 0xab, 0x72, 0xdb, - 0xb3, 0x2e, 0xd0, 0xcd, 0x70, 0x0b, 0x01, 0xf4, 0x30, 0xaa, 0x69, 0xb9, 0x3f, 0x05, 0xc6, 0xa4, - 0xd0, 0x93, 0x78, 0x81, 0x5b, 0xa2, 0x34, 0xf1, 0xc5, 0xf9, 0x8b, 0xb3, 0xd7, 0xa3, 0xb3, 0xaf, - 0x43, 0xd0, 0xbb, 0x3c, 0x1f, 0xb3, 0xa2, 0xd1, 0xe4, 0x1d, 0x44, 0x9f, 0xeb, 0x0c, 0x1d, 0x49, - 0x03, 0xaf, 0xe0, 0x86, 0xb5, 0xe8, 0x96, 0xe0, 0x55, 0x5c, 0xdb, 0xca, 0x8e, 0x10, 0xac, 0xaa, - 0x38, 0x95, 0xae, 0xbf, 0xd2, 0x32, 0x7f, 0x4b, 0x25, 0xc6, 0xa7, 0x2d, 0x0d, 0xbd, 0x52, 0xb9, - 0x10, 0x59, 0x34, 0x3f, 0x03, 0x7c, 0x77, 0xbe, 0xfd, 0x7a, 0xbc, 0xed, 0xfd, 0xd4, 0x7c, 0x1b, - 0x53, 0xd3, 0xc1, 0x07, 0x8d, 0xf5, 0x34, 0xe3, 0xd3, 0xcf, 0x8c, 0xff, 0x03, 0xa4, 0xa5, 0xac, - 0xc6, 0x76, 0x14, 0x00, 0x00 + 0x1e, 0xbb, 0x91, 0x86, 0xc8, 0x86, 0x0d, 0xa2, 0xfd, 0xc7, 0xd1, 0x20, 0x7a, 0x1c, 0x1d, 0xac, + 0x89, 0xeb, 0x67, 0x54, 0x2c, 0xd5, 0x5c, 0xc5, 0xfe, 0xfa, 0x40, 0x53, 0xb3, 0x36, 0x76, 0x0f, + 0xd4, 0xb8, 0x97, 0x1a, 0x99, 0x29, 0xca, 0xd5, 0xde, 0x5d, 0x03, 0xb6, 0xb7, 0xa2, 0x7d, 0x4b, + 0xba, 0x08, 0x81, 0x06, 0x95, 0x6c, 0x38, 0xd5, 0x56, 0x32, 0x55, 0xa0, 0x1e, 0x87, 0xf6, 0x30, + 0x5f, 0x57, 0x70, 0xef, 0x98, 0xe5, 0x35, 0xba, 0x87, 0x5f, 0xf5, 0x0d, 0x12, 0x7d, 0x00, 0xe3, + 0xbf, 0x59, 0xe1, 0x3e, 0x8a, 0xc6, 0xa5, 0x19, 0x4d, 0x80, 0x80, 0x0c, 0x1c, 0xd9, 0xfc, 0x54, + 0xe1, 0x67, 0xe2, 0x9d, 0xce, 0xa3, 0x5e, 0x3f, 0x0d, 0xd8, 0xc1, 0x60, 0xff, 0xd7, 0xbd, 0x83, + 0xc1, 0xc1, 0x01, 0x7b, 0x91, 0x1b, 0x5c, 0xf6, 0x14, 0x48, 0x74, 0x94, 0xe6, 0x4b, 0xba, 0x2a, + 0xb7, 0x3d, 0xeb, 0x02, 0xdd, 0x0c, 0xb7, 0x10, 0x40, 0x0f, 0xa3, 0x9a, 0x96, 0xfb, 0x53, 0x60, + 0x4c, 0x0a, 0x3d, 0x89, 0x17, 0xb8, 0x25, 0x4a, 0x13, 0x5f, 0x9c, 0xbf, 0x38, 0x7b, 0x3d, 0x3a, + 0xfb, 0x3a, 0x04, 0xbd, 0xcb, 0xf3, 0x31, 0x2b, 0x1a, 0x4d, 0xde, 0x41, 0xf4, 0xb9, 0xce, 0xd0, + 0x91, 0x34, 0xf0, 0x0a, 0x6e, 0x58, 0x8b, 0x6e, 0x09, 0x5e, 0xc5, 0xb5, 0xad, 0xec, 0x08, 0xc1, + 0xaa, 0x8a, 0x53, 0xe9, 0xfa, 0x2b, 0x2d, 0xf3, 0xb7, 0x54, 0x62, 0x7c, 0xda, 0xd2, 0xd0, 0x2b, + 0x95, 0x0b, 0x91, 0x45, 0xf3, 0x33, 0xc0, 0x77, 0xe7, 0xdb, 0xaf, 0xc7, 0xdb, 0xde, 0x4f, 0xcd, + 0xb7, 0x31, 0x35, 0x1d, 0x7c, 0xd0, 0x58, 0x4f, 0x33, 0x3e, 0xfd, 0xcc, 0xf8, 0x3f, 0x90, 0x1a, + 0x15, 0x33, 0x76, 0x14, 0x00, 0x00 }; diff --git a/wled00/html_ui.h b/wled00/html_ui.h index 784c41f9..182ce967 100644 --- a/wled00/html_ui.h +++ b/wled00/html_ui.h @@ -1616,7 +1616,7 @@ const uint8_t PAGE_index[] PROGMEM = { 0x7f, 0xc9, 0x28, 0xc3, 0x7a, 0xcc, 0xc6, 0x34, 0xc8, 0xc4, 0x28, 0xfa, 0x33, 0x47, 0xfd, 0xd2, 0x52, 0x9f, 0xa2, 0xab, 0xa4, 0x34, 0x12, 0x8d, 0xf1, 0x34, 0x72, 0xb3, 0x62, 0x17, 0xff, 0x3f, 0xc5, 0x7e, 0xc1, 0xf9, 0x69, 0x80, 0xcc, 0x34, 0xe1, 0xb9, 0x6c, 0x83, 0x82, 0x43, 0x36, 0xce, - 0x46, 0x05, 0xbe, 0xa8, 0x20, 0x50, 0xa9, 0xf3, 0x2d, 0x01, 0xce, 0x68, 0xfd, 0x36, 0x30, 0x1a, + 0x46, 0x05, 0xbe, 0xa8, 0x20, 0x50, 0xa9, 0xf3, 0x2d, 0x01, 0xce, 0x68, 0xfd, 0x36, 0x18, 0xea, 0x8b, 0x0a, 0x6b, 0x04, 0x12, 0x90, 0x40, 0x05, 0x6d, 0xcc, 0xc6, 0x4d, 0x68, 0x47, 0xa8, 0x02, 0xf1, 0x4d, 0x56, 0x47, 0x66, 0x6c, 0x00, 0x64, 0xbc, 0xa8, 0x02, 0x32, 0x5a, 0xc5, 0x24, 0xdf, 0x93, 0xa2, 0x05, 0x97, 0x11, 0xb2, 0x41, 0x07, 0x9e, 0x4c, 0x8e, 0x69, 0xc6, 0x45, 0x14, 0x18, @@ -2003,5 +2003,5 @@ const uint8_t PAGE_index[] PROGMEM = { 0xe6, 0x7a, 0xfc, 0x6e, 0x2e, 0xe5, 0x96, 0x1c, 0xc9, 0x1e, 0xa2, 0x98, 0x1d, 0xa9, 0x88, 0x6a, 0x28, 0xca, 0xfd, 0x0e, 0x79, 0x63, 0xbc, 0xce, 0xd3, 0x1b, 0x79, 0x2b, 0xd4, 0x78, 0x43, 0x0f, 0x9e, 0x48, 0x88, 0x32, 0x5c, 0x5c, 0x2c, 0xcc, 0x9d, 0xd2, 0x3e, 0x32, 0x8f, 0xe2, 0xdf, 0xeb, - 0xf2, 0x26, 0x1e, 0x74, 0xfe, 0x0f, 0x91, 0x91, 0xce, 0x54, 0x54, 0x8e, 0x01, 0x00 + 0xf2, 0x26, 0x1e, 0x74, 0xfe, 0x0f, 0x1b, 0x88, 0x51, 0x33, 0x54, 0x8e, 0x01, 0x00 }; diff --git a/wled00/json.cpp b/wled00/json.cpp index 0c02bf49..18cb54a1 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -423,11 +423,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId) usermods.readFromJsonState(root); - //WLEDMM: if no ledmap loadLedmap=0 (which erases customMappingTable in deserializeMap if exists) - if (root[F("ledmap")].isNull()) - loadLedmap = 0; - else - loadLedmap = root[F("ledmap")] | loadLedmap; + loadLedmap = root[F("ledmap")] | loadLedmap; byte ps = root[F("psave")]; if (ps > 0 && ps < 251) savePreset(ps, nullptr, root); @@ -550,11 +546,6 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme root["bri"] = briLast; root[F("transition")] = transitionDelay/100; //in 100ms } - //WLEDMM only add ledmap if defined, otherwise remove (then ledmap is 0 is assumed in deserializeState) - if (loadLedmap>0) - root[F("ledmap")] = loadLedmap; - else - root.remove(F("ledmap")); if (!forPreset) { if (errorFlag) {root[F("error")] = errorFlag; errorFlag = ERR_NONE;} //prevent error message to persist on screen diff --git a/wled00/presets.cpp b/wled00/presets.cpp index a8209931..f47ccc90 100644 --- a/wled00/presets.cpp +++ b/wled00/presets.cpp @@ -294,7 +294,6 @@ void savePreset(byte index, const char* pname, JsonObject sObj) playlistSave = true; } } - loadLedmap = sObj["ledmap"]; //WLEDMM: assign ledmap } void deletePreset(byte index) {