Blaz Kristan
156b499f93
Merge branch 'master' of https://github.com/aircoookie/WLED into dev
2021-12-07 17:18:38 +01:00
Christian Schwinne
66bad2b6f8
Single json buffer ( #2336 )
...
* Single/static JSON buffer for all requests.
* Missing json.cpp changes.
* Async fix.
* Added conditional compile (WLED_USE_DYNAMIC_JSON).
* Advanced locking with time-out.
* Missing releaseJSONBufferLock() on error response.
* Fix for config saving.
* Fixes and optimisations.
Dadded debugging information.
* Fix for ledmaps.
* No unsolicited serial sending if GPIO1 allocated
* Stray semicolons
* Fix JSON ledmap
Co-authored-by: Blaz Kristan <blaz@kristan-sp.si>
2021-12-04 01:05:01 +01:00
Blaz Kristan
5c7e3c6bab
Bugfixes.
2021-12-03 21:09:53 +01:00
cschwinne
46ec504743
Various fixes
...
Fixed ESP32 crash on Colortwinkles brightness change
Fixed setting picker to black resetting hue and saturation
Fixed auto white mode not saved to config
2021-12-03 20:36:37 +01:00
Blaž Kristan
37ec058572
Merge conflict resolvement.
2021-12-02 13:09:53 +01:00
Blaž Kristan
aa34df7a4c
Merge branch 'master' of https://github.com/Aircoookie/WLED into new-CCT
2021-12-01 14:51:45 +01:00
Christian Schwinne
f6e5b67f0d
Merge pull request #2285 from Aircoookie/CCT-support
...
CCT (color white balance support)
2021-11-30 23:41:13 +01:00
Jeff Cooper
9547ac353d
Save and load the e131 Proxy Universe setting in the DMX menu ( #2365 )
2021-11-30 23:10:23 +01:00
Christian Schwinne
16d97d3c63
Merge branch 'master' into CCT-support
2021-11-28 01:21:57 +01:00
cschwinne
3e6728fedb
Only do auto white calc for busses with white channel
...
Revert auto white to global setting
Rounded /settings buttons by blazoncek
Removed obsolete script from /settings
2021-11-28 01:21:17 +01:00
cschwinne
3e9aea072d
CCT blending setting
2021-11-27 16:49:42 +01:00
Blaz Kristan
fcfb73c755
Merge branch 'master' into dev
2021-11-27 15:05:32 +01:00
cschwinne
ba8a00764a
cctFromRgb option
2021-11-26 20:18:38 +01:00
cschwinne
ea0f37f5b9
CCT bus manager logic simplification
...
CCT from RGB if none set (-1)
2021-11-24 11:02:25 +01:00
cschwinne
b97b6dc144
Remove F macro for "ps"
2021-11-23 13:17:33 +01:00
Christian Schwinne
0465298507
Merge branch 'master' into CCT-support
2021-11-18 16:50:24 +01:00
Blaz Kristan
312cbc86e9
Bugfix.
...
Debugging info added.
2021-11-14 16:56:34 +01:00
Blaz Kristan
85ded6e500
Advanced locking with time-out.
...
Bugfixes.
2021-11-12 23:33:10 +01:00
Blaz Kristan
ff84f2b2f7
Merge branch 'master' into dev
2021-11-10 16:50:39 +01:00
Jeff Cooper
6df64d0d31
Fix a bug which prevents DMX channel mappings from loading correctly. ( #1525 ) ( #2328 )
2021-11-10 00:29:04 +01:00
Blaz Kristan
f8da8f6929
Added conditional compile for dynamic JSON buffer.
...
- WLED_USE_DYNAMIC_JSON
Minor fixes.
2021-11-07 11:58:16 +01:00
Blaz Kristan
d590e01a58
Merge branch 'master' into CCT-support
2021-11-05 21:27:52 +01:00
Blaž Kristan
5cf26af9f0
Merge branch 'dev' into single-doc
2021-11-04 10:05:02 +01:00
Blaž Kristan
04c9646e05
Merge branch 'master' into dev
2021-11-04 10:04:21 +01:00
Blaž Kristan
bd521f858e
Single JSON buffer.
2021-11-03 14:52:22 +01:00
Christian Schwinne
7e1920dc4b
Remove ledCount ( #2300 )
...
Bus initialization on reading from eeprom
2021-10-31 11:57:41 +01:00
Blaz Kristan
cde497c94e
Fixing conflict merge errors.
2021-10-26 06:29:49 +02:00
Blaz Kristan
090e29effd
Moved auto white calculation to bus manager.
...
Other minor fixes.
2021-10-25 20:15:42 +02:00
Blaz Kristan
b8013a57e2
Moved auto white calcualtion into bus manager.
2021-10-24 21:07:05 +02:00
Blaz Kristan
39b7b3ad53
CCT (color white balance support)
2021-10-20 20:29:13 +02:00
Blaz Kristan
c2e6d1c6bf
Squashed commit of the white-balance branch.
...
Updated simple UI.
Minor change in ST7789 display.
2021-10-16 15:13:30 +02:00
Blaž Kristan
539125ff47
Merge branch 'master' into dev
2021-10-11 10:56:25 +02:00
Blaž Kristan
8b2145bd88
Add strip off refresh option in LED settings. ( #2259 )
...
* Add strip off refresh option in LED settings.
New strip initialization logic.
Minor code clen-up.
* Dev code removal.
* Missing ethernet include
* Renamed mainseg to selseg
* Fix for preset cycling bounds.
* "Preset 0" bugfix.
* Auto segments only if segments were not modified
Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2021-10-11 02:19:33 +02:00
Blaz Kristan
4fdf85bbdb
Add off override.
2021-10-07 22:57:07 +02:00
Blaž Kristan
bddd22cfab
Merge branch 'master' into dev
2021-10-07 13:47:36 +02:00
Blaz Kristan
caa9cc32d7
Removed double buffer.
...
Moved bri scaling into UDP function.
Prevent double DDP port allocation.
2021-10-04 19:41:20 +02:00
Blaž Kristan
6db2240f8a
Merge branch 'master' into dev
...
(mostly ignored index.js)
2021-09-22 06:58:49 +02:00
Christian Schwinne
b8e8028eb9
Merge pull request #2184 from Aircoookie/fx-mods
...
FX optimisations and segment names
2021-09-19 15:16:23 +02:00
Blaz Kristan
7463be862f
Merge branch 'master' into dev
2021-09-18 22:43:26 +02:00
Christian Schwinne
3d51d1e345
Merge pull request #2175 from henrygab/revert_pr1902
...
Revert changes from PR1902
2021-09-14 00:29:59 +02:00
cschwinne
c8610b8ad2
Small improvements to segment names
2021-09-12 01:15:51 +02:00
Blaz Kristan
d4beb2f79b
Merge branch 'master' into dev
...
Excluded modifications to ir.cpp
Changed default segment creation logic.
2021-09-12 01:00:54 +02:00
Christian Schwinne
c24ab1b21d
Auto create segments setting ( #2183 )
2021-09-11 01:17:42 +02:00
Henry Gabryjelski
021c4ba68a
Revert changes from PR1902
2021-08-29 11:49:06 -07:00
Blaz Kristan
849bdc52f6
Ethernet modifications.
...
Added fixed Ethernet pins to cfg.json and settings page
2021-08-27 19:48:55 +02:00
Blaž Kristan
63bb05b2d4
Fix compile for ethernet.
2021-08-26 09:32:06 +02:00
Blaž Kristan
916ad0a58e
Merge branch 'master' into dev
2021-08-26 09:09:41 +02:00
Blaž Kristan
b481c13829
Sync groups ( #2150 )
...
* Added UDP sync groups.
* Shortened string.
* Changed sync default to group 1 only.
* Make packets with version < 9 group 1
* Send sync group options as bytes, parse in JS
Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2021-08-25 16:39:12 +02:00
Henry Gabryjelski
1d4487b6cd
Ethernet configuration fix, improve PinManager ( #2123 )
...
* Improved pin manager, ethernet config
* Ethernet is configured prior even to LED pins
* Pin Manager allocation / deallocation functions
now take an "ownership" tag parameter, helping
avoid accidentally free'ing pins that were allocated
by other code
* Pin Manager now has ability to allocate multiple
pins at once; Simplifies error handling
* Fix operator precedence error
Bitwise AND has lower precedence than the
relational "greater than" operator.
* PinManager update for some user modules
* don't build everything...
* Final step to reduce RAM overhead
* update comment
* remove macros
* Remove leftover allocated
* Init ethernet after settings saved
Co-authored-by: Christian Schwinne <dev.aircoookie@gmail.com>
2021-08-23 14:14:48 +02:00
Blaz Kristan
f921d9a1f8
Added UDP sync groups.
2021-08-21 12:28:22 +02:00