Commit Graph

350 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
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
0d0f6b5e30 refactor resetSegments to work properly
add boundsOnly
2023-02-13 15:54:18 +01:00
Ewoud
d215633578 enumerateLedmaps and deserializeMap bugfix
Also xOffset and yOffset 8 instead of 16 bit
2023-02-13 14:22:45 +01:00
Blaz Kristan
821f320347 Add user selectable Gamma
Add panel visualisation (@ewoudwijma, #3090)

Bugfix:
- PIR onStateChange() ignored until inited
- remove matrix orientation
- ignore removing ledmap 0 if 2D
- _globalLeds size
2023-02-12 13:18:30 +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
Blaz Kristan
eee9274098 Bugfix.
- compiler warnings
- loading nonexistent default ledmap in 2D will revert to built ledmap
- making autosements after 2D set up change
2023-02-11 18:41:30 +01:00
Ewoud
26f97f4dc6 Fix resetsegments on 2D change: only change width and height 2023-02-07 13:27:30 +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
Ewoud
9894ae725b Merge remote-tracking branch 'upstream/main' into mdev 2023-01-24 20:57:08 +01:00
Ewoud
41c8a1003b Merge remote-tracking branch 'upstream/main' into mdev 2023-01-20 12:03:19 +01:00
Blaz Kristan
17543535e3 FX update
- Dynamic & Dynamic Smooth
- Dissolve & Dissolve Rnd
- Juggles
- Game of Life
- Colorful
- Fireworks & Rain
2023-01-18 22:56:49 +01:00
Blaz Kristan
c6db901051 Added gradient to drawCharacter()
Ability to select gradient text on Scrolling Text FX.
2023-01-17 19:54:44 +01:00
Ewoud
b289b63f13 Merge remote-tracking branch 'upstream/main' into mdev 2023-01-13 11:40:20 +01:00
Blaz Kristan
c71d378eab New FX Distortion Waves
Updated FX Lissajous
2023-01-12 21:58:54 +01:00
Ewoud
437bfc825c Merge remote-tracking branch 'upstream/main' into mdev 2023-01-10 15:39:17 +01:00
Blaž Kristan
c7eccfb714 FX updates:
- Ripple (2D & no Bg)
- Glitter (no Bg)
- Sparkle (no Bg)
- Scan (no Bg)
- Two dots (no Bg)
- ICU (no Bg)
- Lightning (no Bg)
- Halloween eyes (no Bg)
- Spots (no Bg)
- Bouncing Balls (no BG)
- Popcorn (no Bg)
- Starburst (no Bg)
- Drip (no Bg)
- Whitespace cleanup
- draw_circle()

"no Bg" will allow overlapping segments if checked.
2023-01-06 09:10:39 +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
49b8bf389d Merge remote-tracking branch 'upstream/main' into mdev 2023-01-02 21:28:58 +01:00
Blaz Kristan
983aca515d Compile fix for disabled 2D. 2023-01-02 21:24:02 +01:00
Ewoud
930d79f4e8 Merge remote-tracking branch 'upstream/main' into mdev 2023-01-02 21:23:23 +01:00
Ewoud
4409ceb3ec Merge remote-tracking branch 'origin/ac_main' into mdev 2023-01-02 21:05:03 +01:00
Caleb Marting
187ecf511f 2d Mapping with Matrix Gaps (#2892)
* New 2d mapping
* panel matrix generator
* add todos, fix vert/horz swap
* Fix 2d mapping to matrix in settings 2D
* add correct index mapping to pixels per panel
* fix panel bug in led layout
* formatting and change max panels
* add per panel width and height
* fix using length instead of custom mapping size
* fix: panel dimensions location

* panel[] implemented as a vector.
Removed matrixWidth & matrixHeight.
Panel structure update.
* Fixes.

Co-authored-by: Blaz Kristan <blaz@kristan-sp.si>
2023-01-02 20:56:00 +01:00
Blaz Kristan
22b2503839 Bugfix & code optimisation. 2022-12-22 18:13:32 +01:00
Ewoud
3139f5228d Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-19 14:00:52 +01:00
Blaz Kristan
3c5838cafd Remove "strip" dependency in Segment class 2022-12-16 22:31:07 +01:00
Ewoud
91c2ce0d8f Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-28 19:58:51 +01:00
Blaz Kristan
8899684092 Select custom palette bugfix. 2022-11-25 17:33:29 +01:00
Ewoud
f1088a6ed7 Reinstate ledmap on 2D
FX.h / FX_2Dfcn.cpp: 
- setUpMatrix with reset option (create 1:1 matrix) and customMappingTable[customMappingTable[x]] 

FX_fcn.cpp: 
- deserializeMap: also for 2D, use setUpMatrix
2022-11-22 10:00:53 +01:00
Will Tatam
389d0047bc Use targetPalette.loadDynamicGradientPalette 2022-11-18 21:42:44 +00:00
Will Tatam
359ef875de Add second audio responsive palette 2022-11-18 12:10:20 +00:00
Ewoud
181f8c546b Add audio responsive pallette by Netmindz
const.h: increase GRADIENT_PALETTE_COUNT
fcn_declare: add getCRGBForBand
FX.h: add getAudioPalette
FX_fcn.cpp: call and getAudioPalette, add Audio Responsive palette
palettes.h: add audio_responsive_gp
util.cpp: add getCRGBForBand
2022-11-18 12:09:47 +01:00
Ewoud
017f0267a2 Increase 0.13 backwards compatibility
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
2022-11-17 15:41:12 +01:00
Ewoud
ede08cedf2 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-15 12:47:32 +01:00
Ewoud
740316ae2b Effect ID's back to 0.13 numbering (#2856)
* Effect ID's back to 0.13 numbering

Needed for sync between versions and allow 0.13 presets to work in 0.14

* Effect ID's back to 0.13 numbering (part2)
2022-11-14 02:29:59 +01:00
Blaz Kristan
5f4199183c Bugfix for color transitioning.
Return palette option for Candle.
Fix for "* Color..." palette hiding.
Comment out debug output.
2022-11-09 20:09:01 +01:00
Ewoud
c3c3ff39b5 Change WLEDSR to WLEDMM in comments 2022-11-09 12:14:42 +01:00
Ewowi
f5718b67d4 expand1D: add Circles and Block and show virtualStrip effects with ⋮⋮
index.js: add Circles and Block, add 1.5d
FX.h: add Circles and Block
FX.cpp: add 1.5d to virtualStrip effects
FX_fcn.cpp: add Circles and Block
2022-10-21 12:05:57 +02:00
Ewowi
ad7769c0ab Merge branch 'custom-effects' into mdev 2022-10-16 14:43:04 +02:00
Ewowi
8447f7399f Add FX_MODE_CUSTOMEFFECT = 187 (fixed!!) 2022-10-16 14:40:24 +02:00
Ewowi
1ebff2e546 Merge remote-tracking branch 'origin/dev' into custom-effects 2022-10-16 14:38:20 +02:00
Ewowi
3377b7644e Merge branch 'expand-1DEffects' into mdev 2022-10-16 11:04:23 +02:00
Ewowi
e0078ceb9c Effect numbering back to SR 0.13 !!
For compatibility with 0.13 presets and sync between 0.13 and 0.14 modules
2022-10-16 11:00:45 +02:00
Blaž Kristan
f385af595a Add setMode() and setPalette() methods
- automatically start transition
Implement load FX defaults for HTTP API (FXD)
2022-09-29 12:49:12 +02:00
Ewowi
cd3fa2464a Merge remote-tracking branch 'origin/dev' into mdev 2022-09-27 14:59:57 +02:00
Blaz Kristan
dc700c41fb Invalid FX bugfix. 2022-09-26 21:26:00 +02:00
Ewowi
3455da98c4 Merge remote-tracking branch 'origin/dev' into custom-effects 2022-09-20 11:02:59 +02:00
Ewowi
4922c42b25 Merge remote-tracking branch 'origin/dev' into mdev 2022-09-10 14:21:36 +02:00
Blaz Kristan
c9fd69ceb7 Preset loading tuning.
Multi-relay toggle support.
Fire2012 tuning.
2D functions tuning.
Global SPI comments & tuning.
Bugfix in 4LD usermod.
2022-09-09 17:21:13 +02:00
Blaz Kristan
e4fbf70568 Preset loading tuning.
Multi-relay toggle support.
Fire2012 tuning.
2D functions tuning.
Global SPI comments & tuning.
Bugfix in 4LD usermod.
On & bri support fix.
2022-09-09 17:16:52 +02:00