post merge fix, build 2512291
This commit is contained in:
@@ -1373,9 +1373,9 @@ uint8_t Segment::differs(Segment& b) const {
|
|||||||
if (custom1 != b.custom1) d |= SEG_DIFFERS_FX;
|
if (custom1 != b.custom1) d |= SEG_DIFFERS_FX;
|
||||||
if (custom2 != b.custom2) d |= SEG_DIFFERS_FX;
|
if (custom2 != b.custom2) d |= SEG_DIFFERS_FX;
|
||||||
if (custom3 != b.custom3) d |= SEG_DIFFERS_FX;
|
if (custom3 != b.custom3) d |= SEG_DIFFERS_FX;
|
||||||
if (a.check1 != b.check1) d |= SEG_DIFFERS_FX;
|
if (check1 != b.check1) d |= SEG_DIFFERS_FX;
|
||||||
if (a.check2 != b.check2) d |= SEG_DIFFERS_FX;
|
if (check2 != b.check2) d |= SEG_DIFFERS_FX;
|
||||||
if (a.check3 != b.check3) d |= SEG_DIFFERS_FX;
|
if (check3 != b.check3) d |= SEG_DIFFERS_FX;
|
||||||
if (startY != b.startY) d |= SEG_DIFFERS_BOUNDS;
|
if (startY != b.startY) d |= SEG_DIFFERS_BOUNDS;
|
||||||
if (stopY != b.stopY) d |= SEG_DIFFERS_BOUNDS;
|
if (stopY != b.stopY) d |= SEG_DIFFERS_BOUNDS;
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2512171
|
#define VERSION 2512291
|
||||||
|
|
||||||
// WLEDMM - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
|
// WLEDMM - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
|
||||||
#define _MoonModules_WLED_
|
#define _MoonModules_WLED_
|
||||||
|
|||||||
Reference in New Issue
Block a user