From c3c3ff39b5661274b5ca749f143864e76f33e86d Mon Sep 17 00:00:00 2001 From: Ewoud Date: Wed, 9 Nov 2022 12:14:42 +0100 Subject: [PATCH] Change WLEDSR to WLEDMM in comments --- pio-scripts/output_bins.py | 2 +- platformio.ini | 8 ++-- .../usermod_v2_four_line_display.h | 2 +- .../usermod_v2_four_line_display_ALT.h | 2 +- usermods/usermod_v2_games/usermod_v2_games.h | 2 +- wled00/FX.cpp | 8 ++-- wled00/FX.h | 16 ++++---- wled00/FX_2Dfcn.cpp | 6 +-- wled00/FX_fcn.cpp | 40 +++++++++---------- wled00/const.h | 4 +- wled00/data/index.htm | 6 +-- wled00/data/index.js | 18 ++++----- wled00/data/liveviewws2D.htm | 6 +-- wled00/data/settings.htm | 2 +- wled00/data/settings_um.htm | 8 ++-- wled00/data/simple.js | 10 ++--- wled00/data/update.htm | 2 +- wled00/json.cpp | 30 +++++++------- wled00/presets.cpp | 4 +- wled00/usermods_list.cpp | 4 +- wled00/wled.h | 2 +- wled00/wled_server.cpp | 6 +-- wled00/ws.cpp | 6 +-- wled00/xml.cpp | 2 +- 24 files changed, 98 insertions(+), 98 deletions(-) diff --git a/pio-scripts/output_bins.py b/pio-scripts/output_bins.py index 81b0cf41d8..2b047780a9 100644 --- a/pio-scripts/output_bins.py +++ b/pio-scripts/output_bins.py @@ -35,7 +35,7 @@ def bin_rename_copy(source, target, env): if release_name: _create_dirs(["release"]) version = _get_cpp_define_value(env, "WLED_VERSION") - release_file = "{}release{}WLEDMM_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name) #WLEDSR: add MM postfix to WLED + release_file = "{}release{}WLEDMM_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name) #WLEDMM: add MM postfix to WLED shutil.copy(str(target[0]), release_file) # check if new target files exist and remove if necessary diff --git a/platformio.ini b/platformio.ini index 3156a27e2f..38bd705ecd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -242,7 +242,7 @@ default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv lib_deps = ${env.lib_deps} ; https://github.com/lorol/LITTLEFS.git - ; WLEDSR specific: use patched version of lorol LittleFS + ; WLEDMM specific: use patched version of lorol LittleFS https://github.com/softhack007/LITTLEFS-threadsafe.git#master makuna/NeoPixelBus @ 2.6.9 https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 @@ -551,7 +551,7 @@ build_flags_min = -D WLED_USE_MY_CONFIG -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ; use latest (upstream) FFTLib, instead of older library midified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra - -D USERMOD_CUSTOMEFFECTS ; WLEDSR usermod + -D USERMOD_CUSTOMEFFECTS ; WLEDMM usermod ; -D WLED_DEBUG ; lots of generic debug messages ; -D SR_DEBUG ; some extra debug messages from audioreactive @@ -568,9 +568,9 @@ build_flags_max = -D USERMOD_FOUR_LINE_DISPLAY -D USERMOD_ROTARY_ENCODER_UI -D USERMOD_AUTO_SAVE - -D USERMOD_WEATHER ; WLEDSR usermod + -D USERMOD_WEATHER ; WLEDMM usermod -D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG) - -D USERMOD_GAMES ; WLEDSR usermod + -D USERMOD_GAMES ; WLEDMM usermod lib_deps_max = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE diff --git a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h index b4c205aae1..ac65508b9f 100644 --- a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h +++ b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h @@ -177,7 +177,7 @@ class FourLineDisplayUsermod : public Usermod { isHW = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda); //isHW = true; if (isHW) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins - if (ioPin[0] < 0 || ioPin[1] < 0) { type=NONE; return; } //WLEDSR bugfix - ensure that "final" GPIO are valid + if (ioPin[0] < 0 || ioPin[1] < 0) { type=NONE; return; } //WLEDMM bugfix - ensure that "final" GPIO are valid PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } }; if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; } } diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h index e599909e96..19052d5528 100644 --- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h +++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h @@ -339,7 +339,7 @@ class FourLineDisplayUsermod : public Usermod { // isHW = true; if (isHW) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins PinManagerPinType pins[2] = { {ioPin[0], true }, { ioPin[1], true } }; - if (ioPin[0] < 0 || ioPin[1] < 0) { type=NONE; return; } //WLEDSR bugfix - ensure that "final" GPIO are valid + if (ioPin[0] < 0 || ioPin[1] < 0) { type=NONE; return; } //WLEDMM bugfix - ensure that "final" GPIO are valid if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; } } diff --git a/usermods/usermod_v2_games/usermod_v2_games.h b/usermods/usermod_v2_games/usermod_v2_games.h index 6691905d6c..b3895834d7 100644 --- a/usermods/usermod_v2_games/usermod_v2_games.h +++ b/usermods/usermod_v2_games/usermod_v2_games.h @@ -211,7 +211,7 @@ static const char _data_FX_MODE_IMUTest[] PROGMEM = "šŸŽ® IMUTest@;;;2d"; #endif -//WLEDSR 3D to 2D mapping +//WLEDMM 3D to 2D mapping struct Voxel { float x; float y; diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 5dce1edbfe..29ee1fee92 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -1083,7 +1083,7 @@ uint16_t mode_running_random(void) { uint8_t z = it % zoneSize; bool nzone = (!z && it != SEGENV.aux1); - for (int i=SEGLEN-1; i >= 0; i--) { // WLEDSR bugfix + for (int i=SEGLEN-1; i >= 0; i--) { // WLEDMM bugfix if (nzone || z >= zoneSize) { uint8_t lastrand = PRNG16 >> 8; int16_t diff = 0; @@ -1724,7 +1724,7 @@ uint16_t mode_random_chase(void) uint32_t color = SEGENV.step; random16_set_seed(SEGENV.aux0); - for (int i = SEGLEN -1; i >= 0; i--) { // WLEDSR bugfix + for (int i = SEGLEN -1; i >= 0; i--) { // WLEDMM bugfix uint8_t r = random8(6) != 0 ? (color >> 16 & 0xFF) : random8(); uint8_t g = random8(6) != 0 ? (color >> 8 & 0xFF) : random8(); uint8_t b = random8(6) != 0 ? (color & 0xFF) : random8(); @@ -5347,7 +5347,7 @@ static const char _data_FX_MODE_2DPOLARLIGHTS[] PROGMEM = "Polar Lights@Speed,Sc uint16_t mode_2DPulser(void) { // By: ldirko https://editor.soulmatelights.com/gallery/878-pulse-test , modifed by: Andrew Tuline if (!strip.isMatrix) return mode_static(); // not a 2D set-up - const uint16_t cols = SEGMENT.virtualWidth(); // WLEDSR bugfix + const uint16_t cols = SEGMENT.virtualWidth(); // WLEDMM bugfix const uint16_t rows = SEGMENT.virtualHeight(); if (SEGENV.call == 0) { @@ -5358,7 +5358,7 @@ uint16_t mode_2DPulser(void) { // By: ldirko https://edi SEGMENT.fadeToBlackBy(8 - (SEGMENT.intensity>>5)); uint32_t a = strip.now / (18 - SEGMENT.speed / 16); - uint16_t x = (a / 14) % cols; // WLEDSR bugfix + uint16_t x = (a / 14) % cols; // WLEDMM bugfix uint16_t y = map((sin8(a * 5) + sin8(a * 4) + sin8(a * 2)), 0, 765, rows-1, 0); SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, map(y, 0, rows-1, 0, 255), 255, LINEARBLEND)); diff --git a/wled00/FX.h b/wled00/FX.h index 24b0920704..38dc122815 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -317,7 +317,7 @@ #define FX_MODE_WAVESINS 184 #define FX_MODE_ROCKTAVES 185 #define FX_MODE_2DAKEMI 186 -#define FX_MODE_CUSTOMEFFECT 187 //WLEDSR Custom Effects +#define FX_MODE_CUSTOMEFFECT 187 //WLEDMM Custom Effects #define MODE_COUNT 188 @@ -326,9 +326,9 @@ typedef enum mapping1D2D { M12_pBar = 1, M12_pArc = 2, M12_pCorner = 3, - M12_jMap = 4, //WLEDSR jMap - M12_sCircle = 5, //WLEDSR jMap - M12_sBlock = 6 //WLEDSR jMap + M12_jMap = 4, //WLEDMM jMap + M12_sCircle = 5, //WLEDMM jMap + M12_sBlock = 6 //WLEDMM jMap } mapping1D2D_t; // segment, 72 bytes @@ -382,7 +382,7 @@ typedef struct Segment { byte* data; CRGB* leds; static CRGB *_globalLeds; - void *jMap; //WLEDSR jMap + void *jMap; //WLEDMM jMap private: union { @@ -473,7 +473,7 @@ typedef struct Segment { } Segment(uint16_t sStartX, uint16_t sStopX, uint16_t sStartY, uint16_t sStopY) : Segment(sStartX, sStopX) { - Serial.println("Segment"); //WLEDSR jMap + Serial.println("Segment"); //WLEDMM jMap startY = sStartY; stopY = sStopY; } @@ -576,8 +576,8 @@ typedef struct Segment { uint16_t virtualWidth(void) const; uint16_t virtualHeight(void) const; uint16_t nrOfVStrips(void) const; - void createjMap(); //WLEDSR jMap - void deletejMap(); //WLEDSR jMap + void createjMap(); //WLEDMM jMap + void deletejMap(); //WLEDMM jMap #ifndef WLED_DISABLE_2D uint16_t XY(uint16_t x, uint16_t y); // support function to get relative index within segment (for leds[]) void setPixelColorXY(int x, int y, uint32_t c); // set relative pixel within segment with color diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp index 12a4acd059..22b099f3d9 100644 --- a/wled00/FX_2Dfcn.cpp +++ b/wled00/FX_2Dfcn.cpp @@ -109,7 +109,7 @@ void WS2812FX::setUpMatrix() { } // absolute matrix version of setPixelColor() -void IRAM_ATTR_YN WS2812FX::setPixelColorXY(int x, int y, uint32_t col) //WLEDSR: IRAM_ATTR conditionaly +void IRAM_ATTR_YN WS2812FX::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionaly { #ifndef WLED_DISABLE_2D if (!isMatrix) return; // not a matrix set-up @@ -141,13 +141,13 @@ uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) { #ifndef WLED_DISABLE_2D // XY(x,y) - gets pixel index within current segment (often used to reference leds[] array element) -uint16_t IRAM_ATTR_YN Segment::XY(uint16_t x, uint16_t y) { //WLEDSR: IRAM_ATTR conditionaly +uint16_t IRAM_ATTR_YN Segment::XY(uint16_t x, uint16_t y) { //WLEDMM: IRAM_ATTR conditionaly uint16_t width = virtualWidth(); // segment width in logical pixels uint16_t height = virtualHeight(); // segment height in logical pixels return (x%width) + (y%height) * width; } -void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDSR: IRAM_ATTR conditionaly +void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionaly { if (!strip.isMatrix) return; // not a matrix set-up if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return; // if pixel would fall out of virtual segment just exit diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index ec8f808c6d..d3f2a87dc5 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -89,7 +89,7 @@ Segment::Segment(const Segment &orig) { if (orig.data) { if (allocateData(orig._dataLen)) memcpy(data, orig.data, orig._dataLen); } if (orig._t) { _t = new Transition(orig._t->_dur, orig._t->_briT, orig._t->_cctT, orig._t->_colorT); } if (orig.leds && !Segment::_globalLeds) { leds = (CRGB*)malloc(sizeof(CRGB)*length()); if (leds) memcpy(leds, orig.leds, sizeof(CRGB)*length()); } - jMap = nullptr; //WLEDSR jMap + jMap = nullptr; //WLEDMM jMap } // move constructor @@ -101,7 +101,7 @@ Segment::Segment(Segment &&orig) noexcept { orig._dataLen = 0; orig._t = nullptr; orig.leds = nullptr; - orig.jMap = nullptr; //WLEDSR jMap + orig.jMap = nullptr; //WLEDMM jMap } // copy assignment @@ -126,7 +126,7 @@ Segment& Segment::operator= (const Segment &orig) { if (orig.data) { if (allocateData(orig._dataLen)) memcpy(data, orig.data, orig._dataLen); } if (orig._t) { _t = new Transition(orig._t->_dur, orig._t->_briT, orig._t->_cctT, orig._t->_colorT); } if (orig.leds && !Segment::_globalLeds) { leds = (CRGB*)malloc(sizeof(CRGB)*length()); if (leds) memcpy(leds, orig.leds, sizeof(CRGB)*length()); } - jMap = nullptr; //WLEDSR jMap + jMap = nullptr; //WLEDMM jMap } return *this; } @@ -145,7 +145,7 @@ Segment& Segment::operator= (Segment &&orig) noexcept { orig._dataLen = 0; orig._t = nullptr; orig.leds = nullptr; - orig.jMap = nullptr; //WLEDSR jMap + orig.jMap = nullptr; //WLEDMM jMap } return *this; } @@ -465,10 +465,10 @@ uint16_t Segment::nrOfVStrips() const { case M12_pBar: vLen = virtualWidth(); break; - case M12_sCircle: //WLEDSR + case M12_sCircle: //WLEDMM vLen = (virtualWidth() + virtualHeight()) / 6; // take third of the average width break; - case M12_sBlock: //WLEDSR + case M12_sBlock: //WLEDMM vLen = (virtualWidth() + virtualHeight()) / 8; // take half of the average width break; } @@ -477,7 +477,7 @@ uint16_t Segment::nrOfVStrips() const { return vLen; } -//WLEDSR jMap +//WLEDMM jMap struct XandY { uint8_t x; uint8_t y; @@ -609,7 +609,7 @@ class JMapC { } //updatejMapDoc }; //class JMapC -//WLEDSR jMap +//WLEDMM jMap void Segment::createjMap() { if (!jMap) { Serial.println("createjMap"); @@ -617,7 +617,7 @@ void Segment::createjMap() { } } -//WLEDSR jMap +//WLEDMM jMap void Segment::deletejMap() { //Should be called from ~Segment but causes crash (and ~Segment is called quite often...) if (jMap) { @@ -641,15 +641,15 @@ uint16_t Segment::virtualLength() const { case M12_pArc: vLen = max(vW,vH); // get the longest dimension break; - case M12_jMap: //WLEDSR jMap + case M12_jMap: //WLEDMM jMap if (jMap) vLen = ((JMapC *)jMap)->length(); break; - case M12_sCircle: //WLEDSR + case M12_sCircle: //WLEDMM vLen = max(vW,vH); // get the longest dimension // vLen = (virtualWidth() + virtualHeight()) * 3; break; - case M12_sBlock: //WLEDSR + case M12_sBlock: //WLEDMM if (nrOfVStrips()>1) vLen = max(vW,vH) * 4;//0.5; // get the longest dimension else @@ -665,7 +665,7 @@ uint16_t Segment::virtualLength() const { return vLength; } -//WLEDSR used for M12_sBlock +//WLEDMM used for M12_sBlock void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16_t vH, uint16_t vStrip) { float i2; if (i<=SEGLEN*0.25) { //top, left to right @@ -691,7 +691,7 @@ void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16_t vH, } -void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDSR: IRAM_ATTR conditionaly +void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATTR conditionaly { int vStrip = i>>16; // hack to allow running on virtual strips (2D segment columns/rows) i &= 0xFFFF; @@ -723,11 +723,11 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDSR: IRAM_ATT for (int x = 0; x <= i; x++) setPixelColorXY(x, i, col); for (int y = 0; y < i; y++) setPixelColorXY(i, y, col); break; - case M12_jMap: //WLEDSR jMap + case M12_jMap: //WLEDMM jMap if (jMap) ((JMapC *)jMap)->setPixelColor(i, col); break; - case M12_sCircle: //WLEDSR + case M12_sCircle: //WLEDMM if (vStrip > 0) { int x = roundf(sin_t(360*i/SEGLEN*DEG_TO_RAD) * vW * (vStrip+1)/nrOfVStrips()); @@ -737,7 +737,7 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDSR: IRAM_ATT else // pArc -> circle drawArc(vW/2, vH/2, i/2, col); break; - case M12_sBlock: //WLEDSR + case M12_sBlock: //WLEDMM if (vStrip > 0) { //vStrip+1 is distance from centre, i is how much of the square is filled @@ -862,11 +862,11 @@ uint32_t Segment::getPixelColor(int i) // use longest dimension return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i); break; - case M12_jMap: //WLEDSR jMap + case M12_jMap: //WLEDMM jMap if (jMap) return ((JMapC *)jMap)->getPixelColor(i); break; - case M12_sCircle: //WLEDSR + case M12_sCircle: //WLEDMM if (vStrip > 0) { int x = roundf(sin_t(360*i/SEGLEN*DEG_TO_RAD) * vW * (vStrip+1)/nrOfVStrips()); @@ -876,7 +876,7 @@ uint32_t Segment::getPixelColor(int i) else return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i); break; - case M12_sBlock: //WLEDSR + case M12_sBlock: //WLEDMM if (vStrip > 0) { uint16_t x=0,y=0; diff --git a/wled00/const.h b/wled00/const.h index 369c1d4110..33e671ab8c 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -96,7 +96,7 @@ #define USERMOD_ID_ANALOG_CLOCK 33 //Usermod "Analog_Clock.h" #define USERMOD_ID_PING_PONG_CLOCK 34 //Usermod "usermod_v2_ping_pong_clock.h" #define USERMOD_ID_ADS1115 35 //Usermod "usermod_ads1115.h" -//WLEDSR +//WLEDMM #define USERMOD_ID_CUSTOMEFFECTS 36 //Usermod "usermod_v2_customeffects.h" #define USERMOD_ID_WEATHER 37 //Usermod "usermod_v2_weather.h" #define USERMOD_ID_GAMES 38 //Usermod "usermod_v2_games.h" @@ -431,7 +431,7 @@ #define HW_PIN_CSSPI SS #endif -// WLEDSR: IRAM_ATTR for 8266 causes error: section `.text1' will not fit in region `iram1_0_seg' +// WLEDMM: IRAM_ATTR for 8266 causes error: section `.text1' will not fit in region `iram1_0_seg' // error only in MM, not in upstream... tbd: find out why #ifdef ARDUINO_ARCH_ESP32 #define IRAM_ATTR_YN IRAM_ATTR diff --git a/wled00/data/index.htm b/wled00/data/index.htm index 083ceae48c..2cac3fc12a 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -51,7 +51,7 @@ setTimeout(()=>{h.appendChild(l)},100); - + @@ -366,7 +366,7 @@ - + @@ -386,6 +386,6 @@
- + diff --git a/wled00/data/index.js b/wled00/data/index.js index 358a5efc63..1cbe7b554d 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -642,7 +642,7 @@ function populateInfo(i) var cn=""; var heap = i.freeheap/1000; heap = heap.toFixed(1); - var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDSR - total heap is not available on 8266 + var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDMM - total heap is not available on 8266 var pwr = i.leds.pwr; var pwru = "Not calculated"; if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";} @@ -661,7 +661,7 @@ function populateInfo(i) if (i.ver.includes("-bl")) vcn = "Supāku"; if (i.cn) vcn = i.cn; - //WLEDSR: add total heap and total PSRAM, and build number, add bin name + //WLEDMM: add total heap and total PSRAM, and build number, add bin name if (i.ver.includes(".14.1-")) vcn = "Sitting Ducks"; // easter egg if ((i.ver.includes("14.0."))&&(i.ver.includes("_MM"))) vcn = "Lupo"; cn += `v${i.ver}  "${vcn}"

(WLEDMM_${i.ver}_${i.rel}.bin)

build ${i.vid}

@@ -672,7 +672,7 @@ ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")} ${inforow("Uptime",getRuntimeStr(i.uptime))} ${inforow("Estimated current",pwru)} ${inforow("Average FPS",i.leds.fps)} - + ${inforow("MAC address",i.mac)} ${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")} @@ -688,7 +688,7 @@ ${i.e32model?inforow(i.e32model,i.e32cores +" core(s)"," "+i.e32speed+" Mhz"):"" ${i.e32flash?inforow("Flash "+i.e32flash+" MB"+", mode "+i.e32flashmode+i.e32flashtext,i.e32flashspeed," Mhz"):""} ${i.e32core0code?inforow("Core0 rst reason",i.e32core0code, " "+i.e32core0text):""} ${i.e32core1code?inforow("Core1 rst reason",i.e32core1code, " "+i.e32core1text):""} - +
`; gId('kv').innerHTML = cn; // update all sliders in Info @@ -732,7 +732,7 @@ function populateSegments(s) rvYck = ``; miYck = ``; } - // WLEDSR: jMap + // WLEDMM: jMap let map2D = `
Expand 1D FX
`; - //WLEDSR Custom Effects + //WLEDMM Custom Effects let fxName = eJson.find((o)=>{return o.id==selectedFx}).name; let cusEff = `
`; cn += `
@@ -854,7 +854,7 @@ function populateEffects() }); for (let ef of effects) { - // WLEDSR: add slider and color control to setFX (used by requestjson) + // WLEDMM: add slider and color control to setFX (used by requestjson) let id = ef.id; let nm = ef.name+" "; let fd = ""; @@ -1366,7 +1366,7 @@ function readState(s,command=false) return true; } -// WLEDSR: control HTML elements for Slider and Color Control +// WLEDMM: control HTML elements for Slider and Color Control // Technical notes // =============== // If an effect name is followed by an @, slider and color control is effective. @@ -1623,7 +1623,7 @@ function toggleSync() function toggleLiveview() { - //WLEDSR adding liveview2D support + //WLEDMM adding liveview2D support if (isInfo && isM) toggleInfo(); if (isNodes && isM) toggleNodes(); isLv = !isLv; diff --git a/wled00/data/liveviewws2D.htm b/wled00/data/liveviewws2D.htm index 92a4754b87..585a6bc891 100644 --- a/wled00/data/liveviewws2D.htm +++ b/wled00/data/liveviewws2D.htm @@ -46,10 +46,10 @@ if (leds[0] != 76 || leds[1] != 2 || !ctx) return; //'L', set in ws.cpp let mW = leds[2]; // matrix width let mH = leds[3]; // matrix height - let pPL = Math.min(c.width / mW, (c.height-10) / mH); // pixels per LED (width of circle) WLEDSR -10 for prompts + let pPL = Math.min(c.width / mW, (c.height-10) / mH); // pixels per LED (width of circle) WLEDMM -10 for prompts let lOf = Math.floor((c.width - pPL*mW)/2); //left offeset (to center matrix) var i = 6; - ctx.clearRect(0, 0, c.width, c.height); //WLEDSR + ctx.clearRect(0, 0, c.width, c.height); //WLEDMM for (y=0.5;y diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm index 6115702ee4..8398ec3bde 100644 --- a/wled00/data/settings_um.htm +++ b/wled00/data/settings_um.htm @@ -55,7 +55,7 @@ } } ldS(); - if (!numM) gId("um").innerHTML = ""; //WLEDSR: Do not display no usermods installed + if (!numM) gId("um").innerHTML = ""; //WLEDMM: Do not display no usermods installed } // https://stackoverflow.com/questions/3885817/how-do-i-check-that-a-number-is-float-or-integer function isF(n) { return n === +n && n !== (n|0); } @@ -200,7 +200,7 @@ getPins(json); urows=""; if (isO(umCfg)) { - //WLEDSR: read url parameter. e.g. um=AudioReactive and if set only add the usermod with the same name + //WLEDMM: read url parameter. e.g. um=AudioReactive and if set only add the usermod with the same name const queryString = window.location.search; const urlParams = new URLSearchParams(queryString); const userMod = urlParams.get('um') @@ -214,7 +214,7 @@ } if (userMod != null && urows==="") urows = "Usermods configuration not found.
Press Save to initialize defaults."; } - //WLEDSR: only show globalGPIOs if no usermod info is shown (url without um parameter) + //WLEDMM: only show globalGPIOs if no usermod info is shown (url without um parameter) gId("globalGPIOs").style.display = urows===""?"block":"none"; gId("um").innerHTML = urows; @@ -242,7 +242,7 @@
-