Skip to content

Commit

Permalink
Merge branch 'stable' into esp-now-search
Browse files Browse the repository at this point in the history
  • Loading branch information
blazoncek committed Dec 30, 2024
2 parents 2c1899c + 178f05f commit 9af6444
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wled",
"version": "0.15.0-b7",
"version": "0.15.1-b1",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {
Expand Down
2 changes: 2 additions & 0 deletions wled00/FX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6648,6 +6648,8 @@ uint16_t mode_matripix(void) { // Matripix. By Andrew Tuline.

const bool overlay = SEGMENT.check2;

const bool overlay = SEGMENT.check2;

if (SEGENV.call == 0) {
for (unsigned i = 0; i < SEGLEN; i++) pixels[i] = BLACK; // may not be needed as resetIfRequired() clears buffer
}
Expand Down
4 changes: 2 additions & 2 deletions wled00/wled.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
/*
Main sketch, global variable declarations
@title WLED project sketch
@version 0.15.0-b7
@version 0.15.1-b1
@author Christian Schwinne
*/

// version code in format yymmddb (b = daily build)
#ifndef AUTOBUILD
#define VERSION 2412250
#define VERSION 2412300
#else
#define VERSION BUILD
#endif
Expand Down

0 comments on commit 9af6444

Please sign in to comment.