Commit Graph

184 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
TroyHacks
410baa9cae Art-Net transmit support for network LEDs 2023-02-16 12:54:32 -05: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
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
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
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
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
892861c20e Segment graphics bug fix
Disable for 1D (until we have a 1D graphic)
2023-02-06 22:39:26 +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
6235dc86cc Fixing 2D ledmap
FX_2Dfcn.cpp.setUpMatrix:
- move upstream code to reset==true
- temp table for ledmaps (Idea by By @Troy#2642)

FX_2Dfcn.cpp: init loadedLedmap
2023-01-27 17:11:49 +01:00
Blaz Kristan
c9c55fe0c9 Bump version to 0.14.0-b2 2023-01-24 21:08:26 +01:00
Ewoud
41c8a1003b Merge remote-tracking branch 'upstream/main' into mdev 2023-01-20 12:03:19 +01:00
Frank
efd72f44d8 chores: build number, npm run build 2023-01-19 17:47:40 +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
10f006ef18 Small changes on pin dropdowns / usermod help
platformio.ini: add wemos_shield_esp32_4MB_all_base

usermods:
- rename disableROPins to disableRO
- bme280: add appendConfigData, info and disableRO
- PWM Fan: add appendConfigData

Settings_um.htm
- add 🟢
2023-01-16 15:07:41 +01:00
Frank
d87e6a6dcd npm run build
yo-man
2023-01-15 23:09:04 +01:00
Ewoud
9944f8dc72 global I2C and SPI pins and mpu6050 interrupt pin default to -1
As can otherwise cause conflicts, must be set in platformio explicitly to the right values

Set in platform io for _max configs
2023-01-11 17:32:19 +01:00
Dustin Miller
36fb262fa0 Fixes tooltip interfering with pointer events 2023-01-09 18:38:00 -06:00
Ewoud
9bc6451145 appendConfigData only for usermod + optimizations
- rename replaceOption to rOption
- rename removeOptions to dOptions
- set oAppend buffer size back to 3096
- WLEDMM warning on settings2D Populate
- add AppendConfig per usermod
- add request parameter to getSettinsJS
- add lookupName
2023-01-03 13:08:14 +01:00
Frank
e4789cbedd post-merge actions
* fix compilation bug in UM_Battery
* fix bad format string in UM_Battery
* npm run build, build number up
2023-01-02 22:25:08 +01:00
Ewoud
4409ceb3ec Merge remote-tracking branch 'origin/ac_main' into mdev 2023-01-02 21:05:03 +01:00
Frank
eb184d3c68 build number, npm run build 2023-01-02 21:01:39 +01:00
Frank
df63ba1dcc npm run build
and version up
2023-01-02 20:05:17 +01:00
Blaz Kristan
b436a660f1 Merge branch 'main' into hex-palette 2022-12-23 21:35:52 +01:00
cschwinne
0e236f9d88 0.14.0-b1 2022-12-23 04:38:30 +01:00
Ewoud
2af9fc3755 Add mm.kno.wled.ge
Change https://kno.wled.ge to https://mm.kno.wled.ge
Change help to ?  button in usermods
Change WeatherUserMod to Weather
2022-12-21 12:30:40 +01:00
Ewoud
949373df91 Add usermod help links for AR, 4LD and weather
Other usermods: 

void appendConfigData()
{
... 
 oappend(SET_F("addInfo('<modname>:help',0,'<a href=\"https:// \">Help</a>');"));
   ...
}
2022-12-19 16:42:07 +01:00
Ewoud
3139f5228d Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-19 14:00:52 +01:00
Ewoud
3160a0b090 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-12-06 14:38:49 +01:00
Frank
73d491eb40 MM version 0.14.0.9 2022-12-04 20:14:37 +01:00
Ewoud
fc4170292a Very small updates 2022-11-30 19:53:10 +01:00
Frank
125017f57d small updates
- colors: add clarification that alternative table does not affect NeopPixelBus colors
- npm run build
- build number up
2022-11-29 22:20:37 +01:00
Ewoud
bf51b0bdf1 addInfo fix and simpler version numbering system
- addInfo: revert back to initial solution to fix mixing up pre and post
- new version: 0.14.0.7 (stop using 2 digits at the end
2022-11-28 20:34:42 +01:00
Ewoud
1fa903ad81 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-24 16:25:27 +01:00
Frank
8899704f91 Mic Profile for SPM1423
* added mic profile for SPM1423 (a new microphone board with PDM interface).
* npm run build (yo-man).
2022-11-24 12:28:11 +01:00
Ewoud
544eeacfc9 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-24 10:59:44 +01:00
Ewoud
e5b54c947b Grouping um settings, add pre and post Info, update SR & 4LD settings
Settings_um.htm: 
- modify addField (grouping)
- addInfo (pre and post texts)
2022-11-20 13:53:47 +01:00
Frank
9a0bc6ad87 build number up, npm run build
yo-man
2022-11-19 20:01:30 +01:00
Ewoud
7946c745d4 Fix ledmap code
Index.js: fix ledmap bug
json.cpp: remove old ledmap checks
presets.cpp: remove loadledmap call
2022-11-19 14:15:29 +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
f2ad2db43a npm run build 2022-11-17 10:45:23 +01:00
Ewoud
fa5f50529f Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-17 10:42:58 +01:00
Blaz Kristan
c47d6cffa8 Missing presets.json on factory reset bugfix.
Clarification on loading ledmaps in UI.
Added manual ledmap loading.
2022-11-16 20:55:21 +01:00
Frank
fb21b3b038 bring back two "not build into this FW" messages
two more "Not build into this firmware" messages, that are not yet included in upstream.
2022-11-15 18:34:00 +01:00
Ewoud
ede08cedf2 Merge remote-tracking branch 'origin/ac_main' into mdev 2022-11-15 12:47:32 +01:00
Ewoud
3b21f02442 Fix Ledmap dropdown in presets
platformio: cosmetic updates
index.js: ledmap: show filename instead of nr
update.htm: remove installed bin prompt
json.cpp: deserializeState: assign loadLedmap from root, serializeState: assign loadLedmap to root / remove from root
presets.cpp: savePreset: assign loadLedmap from sObj
util.cpp: init ledMaps to 0
2022-11-15 11:42:25 +01:00
Frank
2aaa4a2cc4 Lupo fix 2022-11-09 21:07:03 +01:00
Ewoud
f2adc5eff4 Add bin name in info tab, bin name starts with WLEDMM
package.json: Version from 0.14.0.2.0 to 0.14.0.2.1
output_bins.py and xml.cpp: MM postfix after WLED in bin name
index.js and json.cpp: Add bin name in info tab
2022-11-09 11:56:03 +01:00
Frank
9fdc176a9e two more "not included in this firmware"
- DMX output
- Loxone Lighting
2022-11-08 21:39:48 +01:00
Ewoud
492fd294de Merge remote-tracking branch 'origin/main' into mdev 2022-11-08 18:12:43 +01:00