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

Merge remote-tracking branch 'origin/dev' into mdev

Browse Source
This commit is contained in:
Ewowi
2022-10-10 16:35:25 +02:00
parent 53f1270988 4fb44d98db
commit bd6ef0464f
12 changed files with 570 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wled00/FX_fcn.cpp
View File

@@ -1659,9 +1659,7 @@ void WS2812FX::loadCustomPalettes()
CRGBPalette16 targetPalette;
for (int index = 0; index<10; index++) {
char fileName[32];
strcpy_P(fileName, PSTR("/palette"));
sprintf(fileName +8, "%d", index);
strcat(fileName, ".json");
sprintf_P(fileName, PSTR("/palette%d.json"), index);
StaticJsonDocument<1536> pDoc; // barely enough to fit 72 numbers
if (WLED_FS.exists(fileName)) {

6
wled00/const.h
View File

@@ -319,9 +319,11 @@
#endif
#ifndef ABL_MILLIAMPS_DEFAULT
#define ABL_MILLIAMPS_DEFAULT 850 // auto lower brightness to stay close to milliampere limit
#define ABL_MILLIAMPS_DEFAULT 850 // auto lower brightness to stay close to milliampere limit
#else
#if ABL_MILLIAMPS_DEFAULT < 250 // make sure value is at least 250
#if ABL_MILLIAMPS_DEFAULT == 0 // disable ABL
#elif ABL_MILLIAMPS_DEFAULT < 250 // make sure value is at least 250
#warning "make sure value is at least 250"
#define ABL_MILLIAMPS_DEFAULT 250
#endif
#endif

2
wled00/data/index.js
View File

@@ -1541,7 +1541,7 @@ function requestJson(command=null)
div.outerHTML = generateListItemHtml(
'palette',
255-j,
'~ Custom '+j+1+' ~',
'~ Custom '+j+' ~',
'setPalette',
`<div class="lstIprev" style="${genPalPrevCss(255-j)}"></div>`
);

1003
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

4
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2209261
#define VERSION 2210041
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG
@@ -27,7 +27,7 @@
//#define WLED_DISABLE_ALEXA // saves 11kb
//#define WLED_DISABLE_BLYNK // saves 6kb
//#define WLED_DISABLE_HUESYNC // saves 4kb
//#define WLED_DISABLE_INFRARED // saves 12kb
//#define WLED_DISABLE_INFRARED // saves 12kb, there is no pin left for this on ESP8266-01
#ifndef WLED_DISABLE_MQTT
#define WLED_ENABLE_MQTT // saves 12kb
#endif