Commit Graph

83 Commits

Author SHA1 Message Date
Blaz Kristan
db632ae847 Merge branch 'master' into dev 2021-07-06 16:38:13 +02:00
Louis Beaudoin
8c44147a45
Usermod Settings polishing/documentation (#2061)
* Testing new wrapper functions to read Usermod config

* Usermod Settings polishing
- remove getBoolFromJsonKey() (no longer needed), fix getValueFromJsonKey(element, destination, defaultvalue)
- Update Usermod Settings html "number" field to use step="any", and make wider to make maximum values fully visible
  - step="any" allows viewing/submitting full 7/8-digit float values, and the arrow buttons step by 1 now, instead of .00001 (which wasn't good for integers or floats)
  - html wasn't generated/compressed yet

* Update usermod_v2_example.h with more complete example and documentation for Usermod Settings
- readFromConfig() has three options for how to load values from the config JSON, we need to pick one

* Update/rename usermode_rotary_brightness_color, to be used as an example of more robust parsing Usermod Settings values

* Update Usermod example, rename getValueFromJsonKey() to getJsonValue()
- chose single readFromConfig() pattern
- demonstrating 3-argument getJsonValue()
- remove leftover printf in getJsonValue()

Co-authored-by: Louis Beaudoin <louis@embedded-creations.com>
2021-07-05 23:14:57 +02:00
Christian Schwinne
c4f084a991
Merge JSON ircodes (#2048)
* add decodeIRJson and JSON remote option

* handle JSON API commands also

* removed code that forced IR codes in a certain range to be decoded by decodeIR24. Generate default ir.json files for currently supported remotes.

* comment out printing API commands in IR handling

* refactor decodeIRJson to change how ir.json is loaded add support for calling several c functions

* Handle setting palette when effect is still on default solid and will not display it

* remove colorUpdated notifier that was pasted in accidentally

* Update to handle both 24-key and 24-key old remotes (#1969)

* Update readme.md

* Update ir.cpp

Handle both 24-key and 24-key old in decodeIR switch statement

* Re-add JSON remote option

Co-authored-by: Scott Bailey <scottrbailey@gmail.com>
Co-authored-by: Artacus <40248830+scottrbailey@users.noreply.github.com>
2021-07-01 00:17:07 +02:00
Blaz Kristan
2424df0d18 Merge branch 'master' into dev 2021-06-25 15:52:59 +02:00
cschwinne
1e5420e6a7 readFromConfig() update 2021-06-25 01:26:15 +02:00
Blaz Kristan
14ac66ff4e Minor optimisations.
Removed all traces of v2 JSON API.
2021-06-19 23:16:40 +02:00
Blaz Kristan
75bf758042 Incerased max segments.
Removed v2 JSON API.
Replaced col[] array handling.
Settings UI optimisations.
Increased DEBUG output period to 60s.
2021-06-19 18:06:30 +02:00
Blaz Kristan
1a80439825 Merge branch 'master' into dev 2021-06-15 23:36:12 +02:00
cschwinne
623694ab73 Playlist additions 2021-06-10 02:52:20 +02:00
Blaz Kristan
024ec86dc5 Unloading playlist on effect change. 2021-06-07 23:45:11 +02:00
Christian Schwinne
9f13763637
Merge branch 'master' into toki 2021-05-30 13:22:42 +02:00
cschwinne
c2892d7887 Add UDP sync of system time 2021-05-27 02:02:02 +02:00
cschwinne
6c8bf090fe Small optimizations 2021-05-27 00:09:52 +02:00
Blaz Kristan
1ba70706c2 Bugfixes.
- multi-relay brightness check
- temperature no reading delay
- analog button fix & noise reduction
- IR removed custom
2021-05-25 23:00:21 +02:00
Blaz Kristan
2fdbc88d8c Bugfixes.
- PWM bus not loading on boot
- analog 0 not turning Off
- conditional compile for Blynk
- segment name
2021-05-23 01:11:35 +02:00
Blaz Kristan
69099fcdd7 Multi button support. 2021-05-20 19:54:07 +02:00
Blaz Kristan
95df91a03b Multi button implementation. 2021-05-19 18:39:16 +02:00
Blaz Kristan
a5a25f02e3 Merge JSON IR code into master changes. 2021-05-18 22:04:51 +02:00
Blaz Kristan
bfd7be543a Merge branch 'master' of https://github.com/aircoookie/WLED into dev
Conflicts:
	tools/cdata.js
	usermods/PIR_sensor_switch/readme.md
	usermods/Temperature/readme.md
	wled00/FX.h
	wled00/FX_fcn.cpp
	wled00/bus_manager.h
	wled00/bus_wrapper.h
	wled00/cfg.cpp
	wled00/const.h
	wled00/data/settings.htm
	wled00/data/settings_leds.htm
	wled00/data/settings_um.htm
	wled00/html_settings.h
	wled00/json.cpp
	wled00/mqtt.cpp
	wled00/set.cpp
	wled00/wled.cpp
	wled00/wled.h
	wled00/wled_eeprom.cpp
	wled00/wled_server.cpp
	wled00/xml.cpp
2021-05-18 15:45:34 +02:00
Blaž Kristan
17eeb22971 JSON IR remote 2021-05-18 09:48:58 +02:00
Blaz Kristan
742d580eae Removed Usermod child/parent relationship. 2021-05-13 16:19:53 +02:00
cschwinne
d94d3d4bc5 Added experimental /json/cfg endpoint for changing settings from JSON 2021-05-11 01:11:16 +02:00
cschwinne
6ab95ed4ef Remove Usermod inheritance from UsermodManager 2021-05-09 22:54:04 +02:00
Blaz Kristan
136a00a301 User configurable usermods.
- Utilizing addToConfig() & readFromConfig()
- UM configuration Settings page
- MQTT support for usermods
- A few sample usermods including rewritten Temparature and new Multi-Relay
2021-05-07 12:41:39 +02:00
Blaz Kristan
04c4451f7d Usermods MQTT processing.
Multi-relay usermod with MQTT/HTML control.
Minor bugfixes.
2021-05-06 22:58:03 +02:00
Blaz Kristan
9bfe27dd5e Sunrise and sunset calculation and sunrise/sunset triggered presets. 2021-04-12 21:53:22 +02:00
Blaz Kristan
93cefb88f5 CRLF madness. :( 2021-03-25 20:00:08 +01:00
Blaz Kristan
e70e1b8ad7 Adding backwards compatibility. 2021-03-25 17:07:03 +01:00
Blaz Kristan
77d8a8e43d Reducing JSON buffer size requirements.
Increasing maximum number of segments.
2021-03-24 23:55:39 +01:00
Aircoookie
ba4c3e3852
Merge pull request #1724 from blazoncek/playlist-fix
Playlist handling.
2021-03-13 22:46:32 +01:00
Blaz Kristan
cb38976162 Merge branch 'dev' of https://github.com/aircoookie/WLED into dev
Conflicts:
	wled00/NodeStruct.h
	wled00/data/index.htm
	wled00/data/index.js
	wled00/fcn_declare.h
	wled00/html_ui.h
	wled00/json.cpp
	wled00/udp.cpp
	wled00/wled.cpp
	wled00/wled.h
2021-03-10 13:23:03 +01:00
Aircoookie
20bebe98b1
Merge branch 'dev' into autodiscovery 2021-03-09 17:24:57 +01:00
cschwinne
91d885eae4 Fix node type 2021-03-09 17:21:19 +01:00
Blaz Kristan
e3fabe92bd Fixed slow NTP respone for calculating sunrise.
Fixed saving/loading only sunset trigger.
2021-03-09 13:24:20 +01:00
Blaz Kristan
34eee005a8 Add comment & update fcn_declare. 2021-03-07 12:43:13 +01:00
Blaz Kristan
f74a45a33e Sunris/sunset detection. 2021-03-05 23:05:09 +01:00
Blaz Kristan
90808ac67e Power off playlist unload. 2021-02-28 15:34:18 +01:00
Blaz Kristan
77dee439e6 1st attempt at 'blazoncek' 0.12 2021-02-24 20:23:32 +01:00
Aircoookie
5c6cb41124
Merge pull request #1742 from WJCFerguson/geometric_IR_brightness_steps
IR: change to non-linear brightness steps
2021-02-17 23:59:38 +01:00
James Ferguson
2bc38e3784 IR: change to non-linear brightness steps
Prior Incrementing/decrementing by fixed steps (typically 10) means large
perceptual jumps at low brightness and small jumps at high brightness.  This
change moves to a geometric progression, closer at the bottom of the range and
widely spaced at the top.

While it could be done as a relative jump (incrementing by bri/4 and
decrementing bri/5 works quite well), it makes for irregular behavior when
moving back and forth.
2021-02-13 18:29:56 -05:00
cschwinne
aa0f4c9985 Update dev branch (resolve conflicts) 2021-02-13 01:43:16 +01:00
Kevin Dorff
8e71c3ae17
Rotary Encoder, Four Line Display, and Auto Save Usermods (#1722)
* Ability to lookup Usermod by id so Usermods can use other Usermods.

* Rotary Encoder UI using two Usermods

* Updates. More to come, probably.

* Updated rotary usermod to honor USE_FOUR_LINE_DISPLAY if you want to use four line display. It should be truly optional, now.

* minor logic improvement to showing the current time in clock mode.

* improved 24 hour display foratting and ability to use the FourLineDisplayUsermod without the RotaryEncoderUIUsermod (option disable sleep and clock modes).

* Improved ordering of defines in the FourLineDisplayUsermod to put options people might need to change together toward the top.

* relocate plugins. add mention of the Wire requirement.

* usermod filenames changed, updating comment in const.h

* fix usermod locations.

* fix usermods_list to include changed folder.

* Improved for both usermods: install, config, and docs. Included sample platform_override.ini.

* Updated name of SDA and SCL defines for config of display

* update docs.

* Wrong year. Fixed.

* Fix youtube link, improve config of sleep/clock when the rotary usermod isn't installed.

* Minor fixes to four line display. Addition of Auto Save v2 usermod.

* Allow config for auto-save to set the preset number to use. Load preset at startup (so brightness is set correctly).

* Updated docs for Auto Save.

* Updated docs for Auto Save.

Co-authored-by: Kevin Dorff <kevin@macbookpro-kevin-wifi.local>
2021-02-09 17:15:43 +01:00
Blaz Kristan
dd433d8af0 Auto node discovery. 2021-01-22 16:17:18 +01:00
cschwinne
b934634159 First light from busmanager! (still not usable though) 2021-01-16 00:50:43 +01:00
Aircoookie
88c0a9e30a
Merge branch 'dev' into mergedev-210115 2021-01-15 11:07:21 +01:00
cschwinne
9551519a35 First working multisegment transitions 2021-01-09 00:35:48 +01:00
cschwinne
0df6826c91 Fixed HTTP changing segments uncommanded (#1618)
Replaced Red & Blue effect with Aurora effect (PR #1589)
Updated copyright year and contributor page link
2021-01-05 21:35:07 +01:00
Aircoookie
2005a2abd4
Merge branch 'dev' into mergedev-201226 2020-12-26 14:23:14 +01:00
Mike
068c5851ef
Add fields for customization Blynk host (#1543)
* Add fields for customization Blynk host

Add fields to 'Sync Interfaces' for customization Blynk host.
Now you can set you own Blynk server.
All you needs its set custom host and port to local Blync server.

* Lower blynk host length (memory usage)

Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2020-12-22 00:44:16 +01:00
cschwinne
03516e11f7 Various fixes 2020-12-10 16:27:23 +01:00