Skip to content

Commit 0c5cf7a

Browse files
troyhackstroyhacks
authored
Merge branch 'MoonModules:mdev' into downsample4x
2 parents 0401878 + 889e27f commit 0c5cf7a

File tree

13 files changed

+399
-360
lines changed

13 files changed

+399
-360
lines changed

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ body:
4848
attributes:
4949
label: What version/release of MM WLED?
5050
description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
51-
placeholder: "e.g. build 2312290, WLEDMM_0.14.0-b28.35_esp32_4MB_M.bin"
51+
placeholder: "e.g. build 2401030, WLEDMM_0.14.0-b29.35_esp32_4MB_M.bin"
5252
validations:
5353
required: true
5454
- type: dropdown

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wled",
3-
"version": "0.14.0-b28.35",
3+
"version": "0.14.0-b29.35",
44
"description": "Tools for WLED project",
55
"main": "tools/cdata.js",
66
"directories": {

‎platformio.ini‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,11 +1185,16 @@ build_flags = ${esp32_4MB_M_base.build_flags}
11851185
extends = esp32_4MB_XL_base
11861186
build_flags = ${esp32_4MB_XL_base.build_flags}
11871187
-D WLED_RELEASE_NAME=esp32_4MB_XL
1188+
;-D WLED_DISABLE_ALEXA
1189+
;-D WLED_DISABLE_HUESYNC ;; Over the limits ?
11881190
-D WLED_DISABLE_LOXONE ;; Over the limits
1191+
;-D WLED_DISABLE_MQTT
1192+
;-D WLED_DISABLE_INFRARED
11891193
-D WLEDMM_SAVE_FLASH ;; a humble attempt to save a few extra bytes
11901194
build_unflags = ${esp32_4MB_XL_base.build_unflags}
11911195
-D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
11921196
-D USERMOD_BUZZER ;; Over the limits, and steals GPIO 32
1197+
-D USERMOD_SN_PHOTORESISTOR ;; Over the limits
11931198
-D WLEDMM_FASTPATH ;; Over the limits
11941199
; RAM: [== ] 24.4% (used 80060 bytes from 327680 bytes)
11951200
; Flash: [==========] 95.3% (used 1499037 bytes from 1572864 bytes)

‎wled00/FX.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ uint16_t mode_fireworks(void) { return mode_fireworks_core(false); }
12801280
static const char _data_FX_MODE_FIREWORKS[] PROGMEM = "Fireworks@,Frequency;!,!;!;12;ix=192,pal=11";
12811281

12821282
uint16_t mode_fireworks_audio(void) { return mode_fireworks_core(true); }
1283-
static const char _data_FX_MODE_FIREWORKS_AR[] PROGMEM = "🎉 audio Fireworks@,Frequency;!,!;!;12;ix=192,pal=11";
1283+
static const char _data_FX_MODE_FIREWORKS_AR[] PROGMEM = "Fireworks audio ☾@,Frequency;!,!;!;1v,12;ix=192,pal=11";
12841284

12851285
//Twinkling LEDs running. Inspired by https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Rain.h
12861286
uint16_t mode_rain() {
@@ -3276,7 +3276,7 @@ uint16_t mode_popcorn(void) { return mode_popcorn_core(false); }
32763276
static const char _data_FX_MODE_POPCORN[] PROGMEM = "Popcorn@!,!,,,,,Overlay;!,!,!;!;1.5d;m12=1"; //bar WLEDMM 1.5d
32773277

32783278
uint16_t mode_popcorn_audio(void) { return mode_popcorn_core(true); }
3279-
static const char _data_FX_MODE_POPCORN_AR[] PROGMEM = "🎉 audio Popcorn@!,!,,,,,Overlay;!,!,!;!;1.5d;m12=1"; //bar WLEDMM 1.5d
3279+
static const char _data_FX_MODE_POPCORN_AR[] PROGMEM = "Popcorn audio ☾@!,!,,,,,Overlay;!,!,!;!;1v,1.5d;m12=1"; //bar WLEDMM 1.5d
32803280

32813281
//values close to 100 produce 5Hz flicker, which looks very candle-y
32823282
//Inspired by https://github.com/avanhanegem/ArduinoCandleEffectNeoPixel
@@ -3534,7 +3534,7 @@ uint16_t mode_starburst(void) { return mode_starburst_core(false); }
35343534
static const char _data_FX_MODE_STARBURST[] PROGMEM = "Fireworks Starburst@Chance,Fragments,,,,,Overlay;,!;!;;pal=11,m12=0";
35353535

35363536
uint16_t mode_starburst_audio(void) { return mode_starburst_core(true); }
3537-
static const char _data_FX_MODE_STARBURST_AR[] PROGMEM = "🔨 audio Fw Starburst@Chance,Fragments,,,,,Overlay;,!;!;;pal=11,m12=0";
3537+
static const char _data_FX_MODE_STARBURST_AR[] PROGMEM = "Fw Starburst audio ☾@Chance,Fragments,,,,,Overlay;,!;!;1v;pal=11,m12=0";
35383538

35393539
/*
35403540
* Exploding fireworks effect

‎wled00/data/cpal/cpal.htm‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4+
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
45
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
56
<meta http-equiv="Pragma" content="no-cache">
67
<meta http-equiv="Expires" content="0">
@@ -45,6 +46,7 @@
4546
width: 7px;
4647
top: 50%;
4748
transform: translateY(-50%);
49+
touch-action: none;
4850
}
4951
.color-picker-marker {
5052
height: 7px;
@@ -94,9 +96,14 @@
9496
line-height: 1;
9597
}
9698
.wrap {
97-
width: 800px;
99+
width: 100%;
98100
margin: 0 auto;
99101
}
102+
@media (min-width: 800px) {
103+
.wrap {
104+
width: 800px;
105+
}
106+
}
100107
.palette {
101108
height: 20px;
102109
}
@@ -136,6 +143,9 @@
136143
.sendSpan, .editSpan{
137144
cursor: pointer;
138145
}
146+
h1 {
147+
font-size: 1.6rem;
148+
}
139149
</style>
140150
</head>
141151
<body>
@@ -349,24 +359,31 @@ <h1 style="display: flex; align-items: center;">
349359
var gradientLength = maxX - minX + 1;
350360

351361
elmnt.onmousedown = dragMouseDown;
362+
elmnt.ontouchstart = dragMouseDown;
352363

353364
function dragMouseDown(e) {
354365
removeTrashcan(event)
355366
e = e || window.event;
356-
e.preventDefault();
367+
var isTouch = e.type.startsWith('touch');
368+
if (!isTouch) e.preventDefault();
357369
// get the mouse cursor position at startup:
358-
mousePos = e.clientX;
370+
mousePos = isTouch ? e.touches[0].clientX : e.clientX;
359371
d.onmouseup = closeDragElement;
372+
d.ontouchcancel = closeDragElement;
373+
d.ontouchend = closeDragElement;
360374
// call a function whenever the cursor moves:
361375
d.onmousemove = elementDrag;
376+
d.ontouchmove = elementDrag;
362377
}
363378

364379
function elementDrag(e) {
365380
e = e || window.event;
366-
e.preventDefault();
381+
var isTouch = e.type.startsWith('touch');
382+
if (!isTouch) e.preventDefault();
367383
// calculate the new cursor position:
368-
posNew = mousePos - e.clientX;
369-
mousePos = e.clientX;
384+
var clientX = isTouch ? e.touches[0].clientX : e.clientX;
385+
posNew = mousePos - clientX;
386+
mousePos = clientX;
370387
mousePosInGradient = mousePos - (minX + 1)
371388

372389
truePos = Math.round((mousePosInGradient/gradientLength)*256);
@@ -393,7 +410,10 @@ <h1 style="display: flex; align-items: center;">
393410
function closeDragElement() {
394411
/* stop moving when mouse button is released:*/
395412
d.onmouseup = null;
413+
d.ontouchcancel = null;
414+
d.ontouchend = null;
396415
d.onmousemove = null;
416+
d.ontouchmove = null;
397417
}
398418
}
399419

‎wled00/data/settings_leds.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
// success event
2828
scE.addEventListener("load", () => {
2929
GetV();
30-
setABL();
3130
checkSi();
31+
setABL();
3232
if (d.um_p[0]==-1) d.um_p.shift();
3333
});
3434
// error event

0 commit comments

Comments
 (0)