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

Increase 0.13 backwards compatibility

Browse Source 
global LED buffer default true (0.13 backward compatibility)

Restore effects back to 0.13 (
- mode_wavesins
- mode_2DLissajous (uses segment setUpLeds)
- mode_2Dsquaredswirl (custom3<<3)
- mode_2DAkemi (uses segment setUpLeds)

setSegment implements setUpLeds if globalleds
This commit is contained in:
Ewoud
2022-11-17 15:41:12 +01:00
parent d3af3446f7
commit 017f0267a2
10 changed files with 660 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX.cpp
View File

@@ -4537,7 +4537,7 @@ uint16_t mode_wavesins(void) {
for (int i = 0; i < SEGLEN; i++) {
uint8_t bri = sin8(millis()/4 + i * SEGMENT.intensity);
uint8_t index = beatsin8(SEGMENT.speed, SEGMENT.custom1, SEGMENT.custom1+SEGMENT.custom2, 0, i * (SEGMENT.custom3));
uint8_t index = beatsin8(SEGMENT.speed, SEGMENT.custom1, SEGMENT.custom1+SEGMENT.custom2, 0, i * (SEGMENT.custom3<<3));
//SEGMENT.setPixelColor(i, ColorFromPalette(SEGPALETTE, index, bri, LINEARBLEND));
SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0, bri));
}
@@ -5080,8 +5080,6 @@ uint16_t mode_2DLissajous(void) { // By: Andrew Tuline
const uint16_t cols = SEGMENT.virtualWidth();
const uint16_t rows = SEGMENT.virtualHeight();
if (SEGENV.call == 0) SEGMENT.setUpLeds();
SEGMENT.fadeToBlackBy(SEGMENT.intensity);
//for (int i=0; i < 4*(cols+rows); i ++) {
@@ -5422,7 +5420,7 @@ uint16_t mode_2Dsquaredswirl(void) { // By: Mark Kriegsman. https://g
SEGMENT.fadeToBlackBy(24);
uint8_t blurAmount = SEGMENT.custom3>>1; // reduced resolution slider
uint8_t blurAmount = SEGMENT.custom3<<3; // reduced resolution slider
SEGMENT.blur(blurAmount);
// Use two out-of-sync sine waves
@@ -7243,7 +7241,7 @@ uint16_t mode_2DAkemi(void) {
const uint16_t cols = SEGMENT.virtualWidth();
const uint16_t rows = SEGMENT.virtualHeight();
if (SEGENV.call == 0) SEGMENT.setUpLeds();
// if (SEGENV.call == 0) SEGMENT.setUpLeds();
uint16_t counter = (strip.now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
counter = counter >> 8;

3
wled00/FX.h
View File

@@ -467,7 +467,6 @@ typedef struct Segment {
}
Segment(uint16_t sStartX, uint16_t sStopX, uint16_t sStartY, uint16_t sStopY) : Segment(sStartX, sStopX) {
Serial.println("Segment"); //WLEDMM jMap
startY = sStartY;
stopY = sStopY;
}
@@ -756,7 +755,7 @@ class WS2812FX { // 96 bytes
hasCCTBus(void),
// return true if the strip is being sent pixel updates
isUpdating(void),
useLedsArray = false;
useLedsArray = true; //WLEDMM default true as recommended for overlapping segments
inline bool isServicing(void) { return _isServicing; }
inline bool hasWhiteChannel(void) {return _hasWhiteChannel;}

1
wled00/FX_fcn.cpp
View File

@@ -1591,6 +1591,7 @@ void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping,
seg.stop = i2 > matrixWidth ? matrixWidth : i2;
if (startY < matrixHeight) seg.startY = startY;
seg.stopY = stopY > matrixHeight ? matrixHeight : MAX(1,stopY);
if (Segment::_globalLeds) seg.setUpLeds(); //WLEDMM force all effects to use globalleds
#endif
} else {
if (i1 < _length) seg.start = i1;

1
wled00/data/settings_leds.htm
View File

@@ -608,6 +608,7 @@ Length: <input type="number" name="XC${i}" id="xc${i}" class="l" min="1" max="65
Make a segment for each output: <input type="checkbox" name="MS"><br>
Custom bus start indices: <input type="checkbox" onchange="tglSi(this.checked)" id="si"><br>
Use global LED buffer: <input type="checkbox" name="LD"><br>
<i>Recommended for overlapping segments (0.13 style)</i><br>
<hr class="sml">
<div id="color_order_mapping">
Color Order Override:

2
wled00/data/update.htm
View File

@@ -17,7 +17,7 @@
<h2>MoonMod WLED Software Update</h2>
<form method='POST' action='/update' id='uf' enctype='multipart/form-data' onsubmit="U()">
<span class="sip">##VERSION##</span><br> <!--WLEDMM: show bin name-->
Download the latest binary: <a href="https://github.com/MoonModules/WLED/releases" target="_blank">
Download the latest release: <a href="https://github.com/MoonModules/WLED/releases" target="_blank">
<img src="https://img.shields.io/github/release/MoonModules/WLED.svg?style=flat-square"></a><br>
<input type='file' name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->
<button type="submit">Update!</button><br>

78
wled00/html_other.h
View File

@@ -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 = 607;
const uint16_t PAGE_update_length = 603;
const uint8_t PAGE_update[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0x4d, 0x6f, 0xd4, 0x30,
0x14, 0xbc, 0xe7, 0x57, 0xb8, 0x3e, 0xed, 0x4a, 0xd4, 0x29, 0x1f, 0x17, 0x4a, 0x92, 0xa2, 0xa5,
0x15, 0x42, 0xa2, 0x6a, 0xa5, 0xb6, 0x20, 0x4e, 0xc8, 0x89, 0x5f, 0x12, 0xb3, 0x8e, 0x9d, 0xda,
0x2f, 0xbb, 0x8a, 0x50, 0xff, 0x3b, 0xcf, 0xce, 0x2e, 0x20, 0x15, 0x2e, 0xd1, 0x3a, 0x9e, 0x37,
0x3b, 0x6f, 0x66, 0x52, 0x9c, 0x5c, 0xde, 0x7c, 0xb8, 0xff, 0x76, 0x7b, 0xc5, 0x7a, 0x1c, 0x4c,
0x55, 0x1c, 0x9e, 0x20, 0x55, 0x55, 0x0c, 0x80, 0x92, 0x35, 0xce, 0x22, 0x58, 0x2c, 0xf9, 0x5e,
0x2b, 0xec, 0x4b, 0x05, 0x3b, 0xdd, 0xc0, 0x69, 0x3a, 0x70, 0x66, 0xe5, 0x00, 0x25, 0xdf, 0x69,
0xd8, 0x8f, 0xce, 0x23, 0xaf, 0xb2, 0x02, 0x35, 0x1a, 0xa8, 0xbe, 0x7e, 0xbe, 0xba, 0x64, 0x0f,
0xa3, 0x92, 0x08, 0x45, 0xbe, 0xbc, 0x2a, 0x42, 0xe3, 0xf5, 0x88, 0x55, 0xd6, 0x4e, 0xb6, 0x41,
0xed, 0x2c, 0xdb, 0xac, 0xd6, 0x3f, 0xf7, 0xda, 0x2a, 0xb7, 0x17, 0xbd, 0x0e, 0xe8, 0xfc, 0x2c,
0x6a, 0xd9, 0x6c, 0x57, 0xeb, 0xa7, 0xdf, 0x90, 0x07, 0x82, 0x28, 0xd7, 0x4c, 0x03, 0x29, 0x10,
0x1d, 0xe0, 0x95, 0x81, 0xf8, 0x73, 0x33, 0x7f, 0x52, 0x2b, 0x3e, 0xb5, 0x7c, 0x2d, 0x02, 0xce,
0x06, 0x84, 0xd2, 0x61, 0x34, 0x72, 0x2e, 0xb9, 0x75, 0x16, 0xf8, 0x8b, 0xff, 0x8e, 0x0c, 0xa1,
0x7b, 0x3e, 0x53, 0x1b, 0xd7, 0x6c, 0xf9, 0x53, 0x56, 0xe4, 0x07, 0x89, 0x07, 0xa9, 0x2c, 0xf8,
0xa6, 0xe4, 0x79, 0x00, 0x44, 0x6d, 0xbb, 0x90, 0x07, 0xf1, 0x23, 0x5c, 0x8c, 0xe5, 0x5b, 0x5e,
0xfd, 0x85, 0x8c, 0x54, 0x55, 0xf6, 0x5e, 0x0f, 0xd1, 0x00, 0x36, 0x79, 0xb3, 0xe2, 0x0b, 0x7d,
0x13, 0x02, 0x5f, 0xbf, 0x23, 0x64, 0x42, 0x14, 0xf9, 0x62, 0x69, 0xed, 0xd4, 0xcc, 0x9c, 0x35,
0x4e, 0xaa, 0x92, 0x7f, 0x04, 0xfc, 0xb2, 0x5a, 0x13, 0x5d, 0xff, 0xaa, 0xca, 0xae, 0x9d, 0xb3,
0xd7, 0x4e, 0xb1, 0x64, 0xdd, 0x9d, 0x6b, 0x71, 0x2f, 0x3d, 0xfc, 0xf6, 0x90, 0x10, 0x45, 0xeb,
0xfc, 0xc0, 0x28, 0x93, 0xde, 0xd1, 0xec, 0xed, 0xcd, 0xdd, 0x3d, 0x67, 0x32, 0xd9, 0x44, 0x22,
0xa7, 0x84, 0xe3, 0x4c, 0xd3, 0x15, 0xf9, 0xc2, 0x32, 0x20, 0x07, 0xe7, 0x91, 0xc2, 0x19, 0x26,
0x83, 0x7a, 0x94, 0x1e, 0xf3, 0x38, 0x7f, 0x4a, 0x30, 0xc9, 0x49, 0x41, 0x98, 0xea, 0x41, 0x53,
0xaa, 0x0f, 0x49, 0x40, 0x18, 0xa5, 0x65, 0x8d, 0x91, 0x21, 0x94, 0x3c, 0xe8, 0x91, 0x57, 0x67,
0xe2, 0xe5, 0x1b, 0x71, 0x26, 0x5e, 0x8b, 0x33, 0xda, 0x80, 0x2e, 0x29, 0xd9, 0xda, 0x57, 0x97,
0x6e, 0x9f, 0xa4, 0x33, 0xec, 0x81, 0x19, 0xfa, 0xc3, 0x80, 0xac, 0xd6, 0x56, 0xfa, 0xf9, 0x9c,
0x15, 0x92, 0x65, 0xbd, 0x87, 0xb6, 0xe4, 0x3d, 0xe2, 0x18, 0xce, 0xf3, 0xbc, 0xd3, 0xd8, 0x4f,
0xb5, 0x68, 0xdc, 0x90, 0x1f, 0x96, 0x9b, 0x0c, 0x84, 0x3c, 0x2e, 0x98, 0x7b, 0x30, 0x20, 0x03,
0x04, 0xce, 0x50, 0x7a, 0x4a, 0xa9, 0xe4, 0xdf, 0x6b, 0x23, 0xed, 0x96, 0xb4, 0xe8, 0xa1, 0x63,
0x59, 0xb2, 0xfe, 0x48, 0x44, 0x6f, 0x44, 0xe8, 0x35, 0x18, 0x15, 0x84, 0x76, 0x07, 0xde, 0x23,
0xc5, 0x33, 0x6e, 0x11, 0x76, 0xdd, 0x45, 0x72, 0xbd, 0x6c, 0x49, 0xe3, 0x69, 0x78, 0x9c, 0xc8,
0xc9, 0xd8, 0xcd, 0x5c, 0x56, 0x71, 0x8b, 0x42, 0xdb, 0x71, 0x42, 0xb6, 0xd8, 0xd3, 0x6a, 0x03,
0xc7, 0x1e, 0x1f, 0x4d, 0xf4, 0xf0, 0x38, 0x69, 0x0f, 0x6a, 0x41, 0xd7, 0x13, 0x22, 0x55, 0x71,
0x81, 0x2f, 0xb6, 0x11, 0xd9, 0x12, 0xcc, 0x49, 0x91, 0x2f, 0xd7, 0xff, 0x80, 0x2e, 0x87, 0xe8,
0x75, 0x63, 0x74, 0xb3, 0x2d, 0xf9, 0x26, 0x5a, 0xbd, 0xa1, 0x86, 0xff, 0x19, 0x4a, 0x99, 0x54,
0x85, 0xd2, 0xbb, 0x2c, 0x45, 0x17, 0xfb, 0x49, 0x34, 0x55, 0x62, 0xa7, 0xd2, 0x09, 0x21, 0x08,
0x9c, 0xc8, 0x6f, 0xd3, 0xb6, 0x4c, 0x39, 0x66, 0x1d, 0x52, 0x56, 0x8e, 0x0e, 0xce, 0x93, 0xd6,
0xd6, 0x43, 0xe8, 0x53, 0x22, 0xa3, 0xec, 0x80, 0x9d, 0xaf, 0x8b, 0x9c, 0xf8, 0xe2, 0xba, 0xb1,
0x6c, 0xb1, 0x79, 0xf1, 0x93, 0xfe, 0x05, 0xec, 0x51, 0x2e, 0xff, 0xe8, 0x03, 0x00, 0x00
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
};

1218
wled00/html_settings.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/wled.h
View File

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