fishbone-git
37827cdd6c
another manual merge
2019-12-24 15:20:38 +01:00
fishbone-git
58f41a1f9b
manual merge #2
2019-12-24 15:12:54 +01:00
fishbone-git
7712faca0a
manual merge
2019-12-24 15:11:04 +01:00
fishbone-git
805fe1d47e
Revert "more effects to FRAMETIME"
...
This reverts commit f3371c443e
2019-12-24 15:05:12 +01:00
fishbone-git
0d4d1eff94
Revert "Merge branch 'master' into framerate"
...
This reverts commit 38cc4603588600360173
2019-12-24 14:58:22 +01:00
fishbone-git
38cc460358
Merge branch 'master' into framerate
2019-12-24 14:51:33 +01:00
fishbone-git
8600360173
more effects to FRAMETIME
2019-12-24 14:50:35 +01:00
fishbone-git
f3371c443e
more effects to FRAMETIME
2019-12-24 14:46:07 +01:00
fishbone-git
a86f750473
Merge remote-tracking branch 'upstream/master'
2019-12-24 01:09:00 +01:00
Aircoookie
92b532ce9a
Merge pull request #510 from fishbone-git/framerate
...
Sizing for scan and dual_scan
2019-12-24 00:53:46 +01:00
cschwinne
924f97cbe8
Improvements to scan and segment fixes
2019-12-24 00:48:51 +01:00
cschwinne
8817dc6d73
Add tertiary color to presets ( #509 )
2019-12-24 00:06:23 +01:00
fishbone-git
7324d59e08
Merge branch 'master' of https://github.com/Aircoookie/WLED
2019-12-23 23:24:10 +01:00
fishbone-git
dcd8e9250f
Merge branch 'master' of https://github.com/Aircoookie/WLED into framerate
2019-12-23 23:08:25 +01:00
fishbone-git
f07578e0cb
add sizing to scan mode
2019-12-23 22:49:29 +01:00
Aircoookie
cabcf8b7b2
Merge pull request #344 from ericyanush/tz-sask
...
Add support for Saskatchewan Timezone
2019-12-23 21:03:04 +01:00
cschwinne
a90a07f46d
Put new timezone to end of list
2019-12-23 20:54:00 +01:00
Aircoookie
9839bab8dc
Merge pull request #507 from fishbone-git/framerate
...
More framerate conversions, etc
2019-12-23 20:47:40 +01:00
Aircoookie
b9dd3de63b
Merge branch 'master' into framerate
2019-12-23 20:07:32 +01:00
cschwinne
194aa90aee
Noise 4 fix
2019-12-23 19:28:37 +01:00
fishbone-git
9bc72df1b5
meteor with framerate
2019-12-23 19:23:57 +01:00
fishbone-git
b2439ca0af
Merge branch 'master' of https://github.com/Aircoookie/WLED into framerate
2019-12-23 19:06:49 +01:00
fishbone-git
70d04d807b
cleanup
2019-12-23 18:48:01 +01:00
fishbone-git
2372675c79
combine larson scanners
2019-12-23 18:38:54 +01:00
cschwinne
cb66900575
More effects using FRAMETIME
2019-12-23 13:06:14 +01:00
Aircoookie
de4be44728
Merge pull request #502 from gwaland/oled-work
...
modify /usermods/ssd1306_i2c_oled_u8g2/ to be slightly more robust.
2019-12-22 23:56:03 +01:00
fishbone-git
21dc037848
Merge branch 'master' of https://github.com/Aircoookie/WLED
2019-12-22 17:55:40 +01:00
fishbone-git
9fe5e69503
Merge branch 'master' of https://github.com/Aircoookie/WLED into framerate
2019-12-22 17:47:28 +01:00
fishbone-git
c0ac381f6f
rework effects to frametime
2019-12-22 17:41:32 +01:00
Bobby Walker
5f235c121d
correction form ifdef to if defined
2019-12-21 18:59:12 -06:00
Bobby Walker
6b8e9a63f3
define to make knownSsid compatible with esp32
2019-12-21 18:53:37 -06:00
Bobby Walker
3dcda08735
Corrected ip and ssid to be knownIp and knownSsid
2019-12-21 18:50:33 -06:00
Bobby Walker
f92ee8e762
Break out SDA and SCL pins into defines.
2019-12-21 18:49:25 -06:00
cschwinne
94200dd3a4
Fixed effects ( #466 )
2019-12-21 03:17:54 +01:00
Aircoookie
512c4dd6f1
Merge pull request #487 from Aircoookie/pr/481
...
Add Analog/Solid RGB(W) strip support
2019-12-20 00:07:12 +01:00
cschwinne
6d43854557
Fix PIO
2019-12-19 23:43:18 +01:00
cschwinne
112ba7ac5c
Fix compile for analog
2019-12-19 21:31:14 +01:00
cschwinne
4c58929dd4
Fix compile
2019-12-19 21:08:21 +01:00
Aircoookie
2188509d2c
Merge branch 'master' into solidRgbwLedStrips
2019-12-19 20:59:36 +01:00
Def3nder
263ef14822
bracket error
2019-12-18 15:41:13 +01:00
Def3nder
ed24f72cf9
Changes for 4CH and 5CH LED stripes
...
ESP32 fixes for Solid RGBW (...not implemented for ESP32 yet)
Use 5CH solid RGB stripes
adapt the logic to use CW and WW for different CT-values
change from Opt-out to Opt-In for analog LEDs
Added new boards
Alexa color changes to match white values with 4Ch and 5Ch LED stripes
bracket error
Device definitions
2019-12-18 15:35:32 +01:00
Def3nder
c1197d06fe
Changes for 4CH and 5CH LED stripes
...
ESP32 fixes for Solid RGBW (...not implemented for ESP32 yet)
Use 5CH solid RGB stripes
adapt the logic to use CW and WW for different CT-values
change from Opt-out to Opt-In for analog LEDs
Added new boards
Alexa color changes to match white values with 4Ch and 5Ch LED stripes
2019-12-18 13:35:05 +01:00
cschwinne
bd4d1cdd41
Fix preset cycle
2019-12-18 00:47:24 +01:00
cschwinne
2c70d66d4a
Fix TypeError ( #453 )
2019-12-18 00:41:45 +01:00
fishbone-git
97ecace40e
Merge remote-tracking branch 'upstream/master'
2019-12-17 12:07:50 +01:00
cschwinne
6ef988549d
Fix compile
...
facepalm
2019-12-13 14:16:42 +01:00
cschwinne
9088d79390
Add tertiary color to sync ( #451 )
2019-12-13 14:14:36 +01:00
cschwinne
0c9bcb2445
Update readme
2019-12-13 01:31:48 +01:00
cschwinne
c98c54bd6b
Release of WLED v0.9.0-b1
...
Timebase reset when turned off
Added Aurora paletta
2019-12-13 01:23:07 +01:00
fishbone-git
225e66a522
Merge remote-tracking branch 'upstream/master'
2019-12-12 20:59:31 +01:00
