From bf45d55b4a394c0a1348c21f41f223b0f7e4ff54 Mon Sep 17 00:00:00 2001 From: Ruslan Gainutdinov Date: Mon, 26 Oct 2020 23:31:35 +0200 Subject: [PATCH 1/4] Use html-minifer-terser for ES6+ support --- package-lock.json | 171 +++++++++++++++++++++++++++++++++------------- package.json | 2 +- tools/cdata.js | 4 +- 3 files changed, 128 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11973fa927..7462b5d8a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -239,6 +239,11 @@ "fill-range": "^7.0.1" } }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + }, "cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -268,15 +273,6 @@ } } }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", @@ -566,6 +562,34 @@ "domelementtype": "1" } }, + "dot-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz", + "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==", + "requires": { + "no-case": "^3.0.3", + "tslib": "^1.10.0" + }, + "dependencies": { + "lower-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", + "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "requires": { + "tslib": "^1.10.0" + } + }, + "no-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", + "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "requires": { + "lower-case": "^2.0.1", + "tslib": "^1.10.0" + } + } + } + }, "dot-prop": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", @@ -818,26 +842,41 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, - "html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "html-minifier-terser": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", + "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", + "camel-case": "^4.1.1", + "clean-css": "^4.2.3", + "commander": "^4.1.1", "he": "^1.2.0", - "param-case": "^2.1.1", + "param-case": "^3.0.3", "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" + "terser": "^4.6.3" }, "dependencies": { - "uglify-js": { - "version": "3.9.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.3.tgz", - "integrity": "sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==", + "camel-case": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz", + "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", + "requires": { + "pascal-case": "^3.1.1", + "tslib": "^1.10.0" + } + }, + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + }, + "param-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz", + "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==", "requires": { - "commander": "~2.20.3" + "dot-case": "^3.0.3", + "tslib": "^1.10.0" } } } @@ -1248,11 +1287,6 @@ "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -1330,14 +1364,6 @@ "inherits": "~2.0.1" } }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, "nodemon": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz", @@ -1609,12 +1635,32 @@ "registry-url": "^3.0.0" } }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "pascal-case": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz", + "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", "requires": { - "no-case": "^2.2.0" + "no-case": "^3.0.3", + "tslib": "^1.10.0" + }, + "dependencies": { + "lower-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", + "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "requires": { + "tslib": "^1.10.0" + } + }, + "no-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", + "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "requires": { + "lower-case": "^2.0.1", + "tslib": "^1.10.0" + } + } } }, "performance-now": { @@ -1893,6 +1939,22 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -2004,6 +2066,23 @@ "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" }, + "terser": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", + "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, "then-fs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz", @@ -2047,6 +2126,11 @@ "punycode": "^2.1.1" } }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2119,11 +2203,6 @@ "string-length": "^1.0.0" } }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", diff --git a/package.json b/package.json index 11613d8fb0..b0aa7ceb20 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "homepage": "https://github.com/Aircoookie/WLED#readme", "dependencies": { "clean-css": "^4.2.3", - "html-minifier": "^4.0.0", + "html-minifier-terser": "^5.1.1", "inliner": "^1.13.1", "nodemon": "^2.0.4", "zlib": "^1.0.5" diff --git a/tools/cdata.js b/tools/cdata.js index 00055e50a9..584dbdad5b 100644 --- a/tools/cdata.js +++ b/tools/cdata.js @@ -105,7 +105,7 @@ ${array} } const CleanCSS = require("clean-css"); -const MinifyHTML = require("html-minifier").minify; +const MinifyHTML = require("html-minifier-terser").minify; function filter(str, type) { str = adoptVersionAndRepo(str); @@ -119,7 +119,7 @@ function filter(str, type) { collapseWhitespace: true, maxLineLength: 80, minifyCSS: true, - minifyJS: true, + minifyJS: true, continueOnParseError: false, removeComments: true, }); From 373d12be64cf8fb51f14c7f2ba45ec097218431e Mon Sep 17 00:00:00 2001 From: cschwinne Date: Thu, 29 Oct 2020 01:23:04 +0100 Subject: [PATCH 2/4] Realtime max. brightness now honors brightness factor (fixes #1271) - Colorful effect now supports palettes - Added C9 2 palette (#1291) - Improved C9 palette brightness by 12% - Disable onboard LED if LEDs are off (PR #1245) - Added optional status LED (PR #1264) - Realtime max. brightness now honors brightness factor (fixes #1271) - Updated ArduinoJSON to 6.17.0 --- CHANGELOG.md | 10 ++++++++++ wled00/FX.cpp | 44 +++++++++++++++++++------------------------- wled00/FX.h | 2 +- wled00/fcn_declare.h | 1 + wled00/led.cpp | 15 +++++++++++---- wled00/palettes.h | 31 ++++++++++++++++++++++--------- wled00/udp.cpp | 2 +- wled00/wled.h | 2 +- 8 files changed, 66 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9acec9914b..464e928813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ ### Development versions after the 0.10.2 release +#### Build 2010290 + +- Colorful effect now supports palettes +- Added C9 2 palette (#1291) +- Improved C9 palette brightness by 12% +- Disable onboard LED if LEDs are off (PR #1245) +- Added optional status LED (PR #1264) +- Realtime max. brightness now honors brightness factor (fixes #1271) +- Updated ArduinoJSON to 6.17.0 + #### Build 2010020 - Fixed interaction of `T` and `NL` HTTP API commands (#1214) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index b388848884..ae59d80190 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -802,46 +802,40 @@ uint16_t WS2812FX::mode_chase_rainbow_white(void) { * Red - Amber - Green - Blue lights running */ uint16_t WS2812FX::mode_colorful(void) { - uint32_t cols[]{0x00FF0000,0x00EEBB00,0x0000EE00,0x000077CC,0x00FF0000,0x00EEBB00,0x0000EE00}; - if (SEGMENT.intensity < 127) //pastel (easter) colors + uint8_t numColors = 4; //3, 4, or 5 + uint32_t cols[9]{0x00FF0000,0x00EEBB00,0x0000EE00,0x000077CC}; + if (SEGMENT.intensity > 160 || SEGMENT.palette) { //palette or color + if (!SEGMENT.palette) { + numColors = 3; + for (uint8_t i = 0; i < 3; i++) cols[i] = SEGCOLOR(i); + } else { + uint16_t fac = 80; + if (SEGMENT.palette == 52) {numColors = 5; fac = 61;} //C9 2 has 5 colors + for (uint8_t i = 0; i < numColors; i++) { + cols[i] = color_from_palette(i*fac, false, true, 255); + } + } + } else if (SEGMENT.intensity < 80) //pastel (easter) colors { cols[0] = 0x00FF8040; cols[1] = 0x00E5D241; cols[2] = 0x0077FF77; cols[3] = 0x0077F0F0; - for (uint8_t i = 4; i < 7; i++) cols[i] = cols[i-4]; } + for (uint8_t i = numColors; i < numColors*2 -1; i++) cols[i] = cols[i-numColors]; - uint32_t cycleTime = 50 + (15 * (uint32_t)(255 - SEGMENT.speed)); + uint32_t cycleTime = 50 + (8 * (uint32_t)(255 - SEGMENT.speed)); uint32_t it = now / cycleTime; if (it != SEGENV.step) { if (SEGMENT.speed > 0) SEGENV.aux0++; - if (SEGENV.aux0 > 3) SEGENV.aux0 = 0; + if (SEGENV.aux0 >= numColors) SEGENV.aux0 = 0; SEGENV.step = it; } - uint16_t i = 0; - for (i; i < SEGLEN -3; i+=4) - { - setPixelColor(i, cols[SEGENV.aux0]); - setPixelColor(i+1, cols[SEGENV.aux0+1]); - setPixelColor(i+2, cols[SEGENV.aux0+2]); - setPixelColor(i+3, cols[SEGENV.aux0+3]); - } - if(i < SEGLEN) + for (uint16_t i = 0; i < SEGLEN; i+= numColors) { - setPixelColor(i, cols[SEGENV.aux0]); - - if(i+1 < SEGLEN) - { - setPixelColor(i+1, cols[SEGENV.aux0+1]); - - if(i+2 < SEGLEN) - { - setPixelColor(i+2, cols[SEGENV.aux0+2]); - } - } + for (uint16_t j = 0; j < numColors; j++) setPixelColor(i + j, cols[SEGENV.aux0 + j]); } return FRAMETIME; diff --git a/wled00/FX.h b/wled00/FX.h index 622bda2271..e884455107 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -729,7 +729,7 @@ const char JSON_palette_names[] PROGMEM = R"=====([ "Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64", "Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn", "Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura", -"Aurora","Atlantica" +"Aurora","Atlantica","C9 2" ])====="; #endif diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h index 4c22152bec..bd0f78d926 100644 --- a/wled00/fcn_declare.h +++ b/wled00/fcn_declare.h @@ -102,6 +102,7 @@ void colorUpdated(int callMode); void updateInterfaces(uint8_t callMode); void handleTransitions(); void handleNightlight(); +byte scaledBri(byte in); //lx_parser.cpp bool parseLx(int lxValue, byte* rgbw); diff --git a/wled00/led.cpp b/wled00/led.cpp index 395cd84933..8dfcea28e2 100644 --- a/wled00/led.cpp +++ b/wled00/led.cpp @@ -34,13 +34,20 @@ void toggleOnOff() } +//scales the brightness with the briMultiplier factor +byte scaledBri(byte in) +{ + uint32_t d = in*briMultiplier; + uint32_t val = d/100; + if (val > 255) val = 255; + return (byte)val; +} + + void setAllLeds() { if (!realtimeMode || !arlsForceMaxBri) { - double d = briT*briMultiplier; - int val = d/100; - if (val > 255) val = 255; - strip.setBrightness(val); + strip.setBrightness(scaledBri(briT)); } if (useRGBW && strip.rgbwMode == RGBW_MODE_LEGACY) { diff --git a/wled00/palettes.h b/wled00/palettes.h index 1b95e64b24..4fca9525ba 100644 --- a/wled00/palettes.h +++ b/wled00/palettes.h @@ -13,7 +13,7 @@ #ifndef PalettesWLED_h #define PalettesWLED_h -#define GRADIENT_PALETTE_COUNT 39 +#define GRADIENT_PALETTE_COUNT 40 const byte ib_jul01_gp[] PROGMEM = { 0, 194, 1, 1, @@ -551,14 +551,14 @@ const byte Orangery_gp[] PROGMEM = { //inspired by Mark Kriegsman https://gist.github.com/kriegsman/756ea6dcae8e30845b5a const byte C9_gp[] PROGMEM = { - 0, 184, 4, 0, //red - 60, 184, 4, 0, - 65, 144, 44, 2, //amber - 125, 144, 44, 2, - 130, 4, 96, 2, //green - 190, 4, 96, 2, - 195, 7, 7, 88, //blue - 255, 7, 7, 88}; + 0, 255, 5, 0, //red + 60, 255, 5, 0, + 60, 196, 57, 2, //amber (start 61?) + 120, 196, 57, 2, + 120, 6, 126, 2, //green (start 126?) + 180, 6, 126, 2, + 180, 4, 30, 114, //blue (start 191?) + 255, 4, 30, 114}; const byte Sakura_gp[] PROGMEM = { 0, 196, 19, 10, @@ -582,6 +582,18 @@ const byte Atlantica_gp[] PROGMEM = { 150, 12, 95, 82, //#0C5F52 200, 25,190, 95, //#19BE5F 255, 40,170, 80};//#28AA50 + + const byte C9_2_gp[] PROGMEM = { + 0, 6, 126, 2, //green + 45, 6, 126, 2, + 45, 4, 30, 114, //blue + 90, 4, 30, 114, + 90, 255, 5, 0, //red + 135, 255, 5, 0, + 135, 196, 57, 2, //amber + 180, 196, 57, 2, + 180, 137, 85, 2, //yellow + 255, 137, 85, 2}; // Single array of defined cpt-city color palettes. @@ -628,6 +640,7 @@ const byte* const gGradientPalettes[] PROGMEM = { Sakura_gp, //49-36 Sakura Aurora_gp, //50-37 Aurora Atlantica_gp, //51-38 Atlantica + C9_2_gp //52-39 C9 2 }; #endif diff --git a/wled00/udp.cpp b/wled00/udp.cpp index f0f7df9fad..7c9a1839d2 100644 --- a/wled00/udp.cpp +++ b/wled00/udp.cpp @@ -85,7 +85,7 @@ void realtimeLock(uint32_t timeoutMs, byte md) if (timeoutMs == 255001 || timeoutMs == 65000) realtimeTimeout = UINT32_MAX; realtimeMode = md; - if (arlsForceMaxBri && !realtimeOverride) strip.setBrightness(255); + if (arlsForceMaxBri && !realtimeOverride) strip.setBrightness(scaledBri(255)); } diff --git a/wled00/wled.h b/wled00/wled.h index c6f80731fc..4df774037b 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2010020 +#define VERSION 2010280 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS). From 907be77ef4c08f10ecaf8567850ba825a0f2d413 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Thu, 29 Oct 2020 10:14:21 +0100 Subject: [PATCH 3/4] Include minified JS --- wled00/html_other.h | 41 +--------- wled00/html_settings.h | 168 ++--------------------------------------- 2 files changed, 9 insertions(+), 200 deletions(-) diff --git a/wled00/html_other.h b/wled00/html_other.h index e78f6d1852..4531c6b14f 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -71,44 +71,9 @@ content="width=device-width,initial-scale=1,minimum-scale=1"> WLED Live Preview
)====="; +
)====="; // Autogenerated from wled00/data/favicon.ico, do not edit!! diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 98e0c922ac..e17deb117b 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -68,7 +68,7 @@ Save & Connect)====="; // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const char PAGE_settings_leds[] PROGMEM = R"=====(LED Settings