Commit Graph

451 Commits

Author SHA1 Message Date
Ewoud
4a5cbc9879 Merge remote-tracking branch 'upstream/main' into mdev
Some additions:

pio.ini: add debug entries
cfg.cpp, set.cpp, xml/cpp: keep storing basic 2D setup

index.js: use ledmapFileNames

settings_2D.htm: keep using basic and advanced

FX_2Dfcn.cpp: use gaptable and also MM ledmaps

FX_fcn.cpp: extend enumerateledmaps with AC ledmapNames (but not used in UI)
2023-02-22 16:09:27 +01:00
Ewoud
d0c57c8c26 Merge remote-tracking branch 'upstream/main' into mdev 2023-02-15 22:23:49 +01:00
Ewoud
57b8157e41 Bugfix 2023-02-15 21:38:01 +01:00
Blaz Kristan
3ffc58d442 Bugfix
- segment capabilities on 2D segments and ledmaps
- UI segment update
- auto segment creation 2D + 1D
2023-02-15 20:36:54 +01:00
Ewoud
ab8b260608 Segment visualization fix show fx name 2023-02-15 18:13:30 +01:00
Ewoud
6e187dd5aa Peek in segment tab
Move peek 2D functionality to peek.js

FX_fcn.cpp: always erase customMappingTable if non existent ledmap

wled_server.cpp: add peek.js

index.js:
- add canvasPeek
- change resize of canvas
2023-02-15 12:41:15 +01:00
Ewoud
4ed1473bcc Ledmap not found no toast 2023-02-14 22:17:11 +01:00
Ewoud
def3cde8b8 Bugfix 2D without ledmap
index.js: remove showToast when ledmap not found

FX_2DFCN: Check on ledmapsize >0 for doing logical and physical mapping
2023-02-14 21:47:25 +01:00
Ewoud
d8f625beea show only ledmap pixels, show bus lengths in segment visualization
index.js: segment visualization:
- max width if no pc
- don't show nr if only one segment
- Ledmap nr color depending on bus output

FX_2Dfcn.cpp / FX_fcn.cpp
- don't show ledmap -1 pixels

json.cpp: add busses.length to outputs

ws.cpp: peek back to strip.gPC only
2023-02-14 17:22:58 +01:00
Blaz Kristan
92d2be3f5e Add ledmap names
Bugfix
- reset segments upon 2D ledmap allocation error
- fix invlid 2D segments
2023-02-14 17:11:58 +01:00
Blaž Kristan
a7cded21f7 Merge branch 'main' into led-gaps 2023-02-14 14:28:10 +01:00
Christian Schwinne
74156b7ed8 Support white addressable LED strips (#3073)
* Support white addressable LED strips

* Various white handling tweaks

Allow RGB controls for white-only busses depending on AWM (makes palette-only FX work on non-RGB addressable busses)
Fixed RGB controls hidden if segment contained any non-RGB bus (even though there is also an RGB bus in that segment)
New Max auto white mode
Added hasCCT() bus method
Rename methods to be clearer
WS2811 White getPixelColor fix()

* Fix merge conflict (bus manager cpp)
2023-02-14 01:33:06 +01:00
Ewoud
9ba9a61af5 Add support for default ledmap.json + peek with ledmap if default panel
Thx to @Troy#2642
2023-02-13 19:09:02 +01:00
Ewoud
6c52a3d940 Segment name for ledmap names
index.js:
- add ledmapFileNames array and fill with lm.segmentname.json names
- use name in dropdowns and in loadmap

fcn_declare and util.cpp: move enumerateLedmaps to FX.h and FX_fcn.cpp
FX_fcn.cpp: deserializemap: use segment name lednames
2023-02-12 11:28:38 +01:00
Ewoud
b02192e359 Ledmaps improvements
index.js:
- add global ledmap variable
- updateLen conditional draw parameter
- draw black out not mapped

json.cpp: 
- add "ledmap" in (de)serializeState (not info)
- use loadedLedmap

wled.cpp/h:
- loadLedMap is boolean, use loadedLedmap for ledmap
- show * password

liveviewws2D: colorAmp
settings2D: add id and name, change max to 255
2023-02-11 20:45:21 +01:00
Blaz Kristan
8dd1f89225 Update.
- allow ledmap selection in UI
- upload gap file
- expand matrix generator
2023-02-10 19:49:43 +01:00
Ewoud
40e82166bc Ledmap persistent/consistent and showing in segment graph +small changes
pio.ini: remove ping pong clock from _all
ce.js: change on error handling
liveviewws2D: add colorAdjust
json.cpp: ledmaps will be stored in json/info 
settings_2D: fieldChange at loadJS

FX_(2D)fcn.cpp:
- loadedLedmap default 0 (default)
- loadedLedmap active then only use if index <size

index.js:
- global ledmap set to active value
- draw to drawSegments
- gradient colored leds
- add ledmaps to graphics
- add fetchAndExecute (from custom effects), used by drawSegments to get ledmap contents
- graphics bigger in non pc mode
2023-02-10 16:26:35 +01:00
Ewoud
26f97f4dc6 Fix resetsegments on 2D change: only change width and height 2023-02-07 13:27:30 +01:00
Ewoud
38cd794563 Segment graphics: add grouping and spacing 2023-02-07 10:17:26 +01:00
Ewoud
8a8e834ace Segment graphics: bug fix to support (mixed) 1D 2023-02-07 08:52:58 +01:00
Ewoud
892861c20e Segment graphics bug fix
Disable for 1D (until we have a 1D graphic)
2023-02-06 22:39:26 +01:00
Ewoud
3cf35f85f3 Merge remote-tracking branch 'upstream/main' into mdev 2023-02-06 21:06:13 +01:00
Ewoud
2a890f5e1e Segments: add graphical display of segments part 1
Custom Effects: Add 🥚🥚 for HBaas effect presons

Index.js/htm:
- add ctx (context)
- add hidden input field fx
- add draw() function for graphics (segment bounds, mirror/reverse/transpose/leds/Nr/FX

settings2D
- move ctx init to draw
- set space 0
- center text
2023-02-06 19:57:25 +01:00
Ewoud
f71e6262f6 2D setup: add graphical display of panels
FX.h, cfg.cpp, set.cpp, xml.cpp:
- add basic or advanced: bOrA / ba (mpv, mph done earlier)
- add 1st led: panelO / pbl, prl, pvl, psl

settings_2D.htm
- add canvas / context
- addPanel: 1st LED: copy from Matrix setup and draw() on all fields
2023-02-05 16:22:40 +01:00
Blaž Kristan
dca8a47da8 Dual mode 2D + 1D with auto segment creation. (#3060)
* Dual mode 2D + 1D with auto segment creation.

* Bugfix.
- stop when seglen
2023-02-01 19:30:56 +01:00
Ewoud
b01893e8fe Random Cycle ☾, ☾ symbol on MM specific features
Adding ☾ symbol on MM specific features
- Custom Effect
- Games
- Generate presets
- Adjusted effects (Stream, Stream 2, GoL, Lissajous, Waverly, GEQ
- Palettes: Random Cycle, Audio Responsive

Bugfix ledmap 2D: delete table
Adding Random Cycle ☾: continues tranisition
2023-01-31 10:40:41 +01:00
Ewoud
9894ae725b Merge remote-tracking branch 'upstream/main' into mdev 2023-01-24 20:57:08 +01:00
Blaz Kristan
178c4d15b7 Bugfix.
- missing Transpose (seglen)
- reduce flickering for static text (ScrollingText FX #3050)
2023-01-24 16:35:31 +01:00
Blaz Kristan
57323af167 Reset segments on 2D set-up change. #3028
Bugfix for 2D segment creation.
2023-01-22 11:29:31 +01:00
Ewoud
34e93c6361 Merge remote-tracking branch 'upstream/main' into mdev 2023-01-17 15:24:32 +01:00
Ewoud
9065b684b3 genPreset bugfixes 2023-01-16 22:04:54 +01:00
Ewoud
69345df28a setMode and genPresets changes
version 0.14.0-b1.16

FX_fcn.cpp: setMode: map, sound, rev, mir reset to oldvars

index.js: refactor genPresets (fx id as preset id), reset to defaults

fx.cpp: fire flicker and firenoise pal=0 as default
2023-01-16 18:31:17 +01:00
Ewoud
91aed65f99 Generate presets !
Fix 1d/2d default in customeffect, games and weather

index.htm: add buttons and text area for genPresets

index.js: add genPresets, uploadFileWithText and savePresetsGen

fx,cpp: set fire 2012 default palette 0 (fire colors)

Bonus: battery USERMOD_BATTERY_MEASUREMENT_PIN default -1
2023-01-12 17:32:11 +01:00
Ewoud
6cc62c59ad Merge remote-tracking branch 'upstream/main' into mdev
- removed !isM checks on ledmap cause supported in WLED MM
2023-01-12 09:27:20 +01:00
Blaz Kristan
8dc262b415 Bugfixes.
- faster random palette blends
- remove UI ledmap selection for 2D
- FX updates (DNA Spiral, Colored bursts, Metaballs)
2023-01-11 23:08:08 +01:00
Ewoud
ab22beb0c3 Minor changes 2023-01-07 15:10:21 +01:00
Ewoud
545a4c820c quick fix 2d config hor/ver/panel issues + battery usermod
- Add battery usermod
- set segexp default true
- quick fix 2d config hor/ver/panel issues
2023-01-03 14:45:01 +01:00
Ewoud
4409ceb3ec Merge remote-tracking branch 'origin/ac_main' into mdev 2023-01-02 21:05:03 +01:00
Ewoud
d1bf3b4690 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-24 15:27:43 +01:00
Blaz Kristan
b436a660f1 Merge branch 'main' into hex-palette 2022-12-23 21:35:52 +01:00
cschwinne
72eb61951b Dynamically show hidden color slots for * palettes
Disable Blynk by default in release builds
Single quote strings everywhere for classList
2022-12-23 02:59:24 +01:00
Blaz Kristan
4322d195d3 Smooth random palette changes
Bugfix loading string palettes
JS optimization.
2022-12-21 21:00:28 +01:00
Ewoud
3139f5228d Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-19 14:00:52 +01:00
Blaz Kristan
bfbc1ebb13 Fix all segments checkbox 2022-12-16 23:20:49 +01:00
Blaz Kristan
a802bb2736 Merge branch 'main' into selall-bugfix 2022-12-16 22:32:15 +01:00
Ewoud
ffe52fcbf5 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-16 11:43:27 +01:00
Blaz Kristan
a7bad5df61 Bugfix. #2945 2022-12-13 14:40:41 +01:00
Christian Schwinne
f50c9e855c Use "pd" JSON API call for direct preset apply (#2946) 2022-12-13 14:27:44 +01:00
Blaz Kristan
b637398a9c Optimisations. 2022-12-09 18:37:53 +01:00
Blaž Kristan
37af48f3fb Bugfix.
- missing selall with maximum segments reached
2022-12-09 08:15:14 +01:00