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

Small changes and version 0.14.0.6.0

Browse Source 
Including 2D peek max 4096 leds
This commit is contained in:
Ewoud
2022-11-24 10:57:18 +01:00
parent 17e6a887cb
commit ace3035d4a
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "wled",
"version": "0.14.0.5.0",
"version": "0.14.0.6.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "wled",
"version": "0.14.0.5.0",
"version": "0.14.0.6.0",
"license": "ISC",
"dependencies": {
"clean-css": "^4.2.3",

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "wled",
"version": "0.14.0.5.0",
"version": "0.14.0.6.0",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {

1
usermods/customeffects/customeffects.js
View File

@@ -121,7 +121,6 @@ function downloadCEFile(name) {
var url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/CustomEffects/wled/";
fetchAndExecute(url, name, function(text) {
console.log(text);
if (name == "wledv032.json" || name == "presets.json") {
if (!confirm('Are you sure to download/overwrite ' + name + '?'))
return;

2
wled00/FX_fcn.cpp
View File

@@ -1865,9 +1865,11 @@ void WS2812FX::deserializeMap(uint8_t n) {
JsonArray map = doc[F("map")];
if (!map.isNull() && map.size()) { // not an empty map
//WLEDMM: if isMatrix then customMap size is whole matrix
#ifndef WLED_DISABLE_2D
if (isMatrix)
customMappingSize = matrixWidth * matrixHeight;
else
#endif
customMappingSize = map.size();
customMappingTable = new uint16_t[customMappingSize];
for (uint16_t i=0; i<map.size(); i++) {

24
wled00/html_ui.h
View File

@@ -7,7 +7,7 @@
*/
// Autogenerated from wled00/data/index.htm, do not edit!!
const uint16_t PAGE_index_L = 32014;
const uint16_t PAGE_index_L = 32004;
const uint8_t PAGE_index[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd4, 0xbd, 0x69, 0x7a, 0xe3, 0x3a,
0xb2, 0x20, 0xfa, 0xdf, 0xab, 0x60, 0x32, 0xab, 0x9c, 0xe2, 0x11, 0x2d, 0x91, 0x9a, 0xac, 0x21,
@@ -1999,15 +1999,15 @@ const uint8_t PAGE_index[] PROGMEM = {
0x12, 0x32, 0x43, 0x8d, 0xd3, 0x86, 0xb8, 0x74, 0xed, 0x09, 0xbb, 0x3e, 0x41, 0x63, 0x87, 0xaa,
0x59, 0xda, 0x5c, 0xea, 0x6b, 0x82, 0xa8, 0x8c, 0x21, 0xaa, 0xdf, 0x8a, 0xf1, 0xed, 0x0e, 0xf7,
0x1d, 0x68, 0xd0, 0x85, 0x30, 0x56, 0xac, 0x96, 0xab, 0x4e, 0x91, 0xda, 0x75, 0x1b, 0x3a, 0x53,
0x65, 0xe9, 0x45, 0xbc, 0x9f, 0xc2, 0x0d, 0x51, 0x06, 0x9a, 0x2b, 0x94, 0x17, 0xb9, 0x22, 0x5d,
0x6b, 0x2c, 0xba, 0x84, 0xc1, 0xe8, 0x9a, 0xe3, 0x82, 0xfd, 0x86, 0xc9, 0x4d, 0x81, 0x3d, 0x0e,
0x3c, 0x17, 0x1a, 0x04, 0xef, 0xa1, 0x38, 0xe5, 0x75, 0x41, 0x17, 0x0f, 0x64, 0x35, 0x77, 0x33,
0x85, 0x1c, 0x49, 0x97, 0xa3, 0x46, 0xca, 0x68, 0xd6, 0xbd, 0xa0, 0x56, 0x6c, 0x28, 0x5d, 0x3c,
0xba, 0x26, 0xcb, 0x7b, 0xf6, 0xf6, 0x65, 0xec, 0xda, 0xf4, 0x15, 0xfb, 0x6b, 0x27, 0x74, 0xb6,
0xfb, 0x35, 0x0b, 0x57, 0x4d, 0xec, 0x65, 0x5a, 0xf8, 0xf2, 0xeb, 0x5d, 0xfc, 0x37, 0xe7, 0xaf,
0x69, 0xbe, 0xc5, 0xdf, 0x0b, 0xfe, 0xce, 0x40, 0x08, 0x4a, 0xcf, 0xe3, 0xe2, 0x0d, 0x72, 0xd2,
0x79, 0x3e, 0xbf, 0x5b, 0x48, 0xb9, 0x25, 0x47, 0xb2, 0xbb, 0x38, 0x61, 0x47, 0x2a, 0x22, 0x52,
0x8a, 0x8b, 0xc0, 0x21, 0x6f, 0x8c, 0x37, 0x45, 0x76, 0x25, 0x6f, 0x85, 0x1a, 0x6f, 0xe8, 0xc1,
0x17, 0x09, 0x51, 0x86, 0xcb, 0xb3, 0xa5, 0xb9, 0x53, 0xda, 0x45, 0x5e, 0x55, 0xfc, 0x7b, 0x59,
0x5d, 0x25, 0x43, 0xe7, 0x7f, 0x01, 0x1f, 0xfa, 0x5c, 0x44, 0x35, 0x8f, 0x01, 0x00
0x65, 0xe9, 0x45, 0xbc, 0x9f, 0x72, 0xad, 0xc1, 0xe7, 0x12, 0xe8, 0xa2, 0x6b, 0x0e, 0x04, 0x76,
0x14, 0x26, 0xbf, 0x04, 0x76, 0x31, 0xf0, 0x5c, 0x68, 0x01, 0xbc, 0x78, 0xe2, 0x94, 0xd7, 0x05,
0xdd, 0x34, 0x90, 0xf5, 0xda, 0xcd, 0x14, 0x54, 0x24, 0xdd, 0x86, 0x1a, 0x29, 0x2b, 0x59, 0xf7,
0x0a, 0x5a, 0xb1, 0x65, 0x74, 0xf1, 0xe8, 0x22, 0x2c, 0x2f, 0xd6, 0xdb, 0xb7, 0xaf, 0x6b, 0xf3,
0x55, 0xec, 0xaf, 0x9d, 0xd0, 0xd9, 0xee, 0xd7, 0x2c, 0x4d, 0x35, 0x39, 0x97, 0x69, 0xe1, 0xcb,
0xaf, 0x77, 0xf1, 0xdf, 0x9c, 0xbf, 0xa6, 0x09, 0x16, 0x7f, 0x2f, 0xf8, 0x3b, 0x03, 0x12, 0x28,
0x3d, 0x8f, 0x8b, 0x37, 0x48, 0x42, 0xe7, 0xf9, 0xfc, 0x6e, 0x21, 0x05, 0x95, 0x3c, 0xc7, 0xee,
0xe2, 0x84, 0x3d, 0xa7, 0x88, 0x39, 0x29, 0x2e, 0x02, 0x87, 0xdc, 0x2f, 0xde, 0x14, 0xd9, 0x95,
0xbc, 0x06, 0x6a, 0xbc, 0xa1, 0x07, 0x5f, 0x24, 0x44, 0x19, 0x2e, 0xcf, 0x96, 0xe6, 0xd6, 0x68,
0x17, 0x89, 0x54, 0xf1, 0xef, 0x65, 0x75, 0x95, 0x0c, 0x9d, 0xff, 0x05, 0x69, 0xee, 0x42, 0x6e,
0x26, 0x8f, 0x01, 0x00
};

2
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2211201
#define VERSION 2211241
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG

2
wled00/ws.cpp
View File

@@ -149,7 +149,7 @@ bool sendLiveLedsWs(uint32_t wsClient)
if (!wsc || wsc->queueLength() > 0) return false; //only send if queue free
uint16_t used = strip.getLengthTotal();
const uint16_t MAX_LIVE_LEDS_WS = strip.isMatrix ? 1024 : 256;
const uint16_t MAX_LIVE_LEDS_WS = strip.isMatrix ? 4096 : 256; //WLEDMM use 4096 as max matrix size
uint16_t n = ((used -1)/MAX_LIVE_LEDS_WS) +1; //only serve every n'th LED if count over MAX_LIVE_LEDS_WS
uint16_t pos = (strip.isMatrix ? 6 : 2); //WLEDMM 6 instead of 4
uint16_t bufSize = pos + (used/n)*3;