mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
10,308 Commits 3 Branches 119 Tags 270 MiB
8e3061ba6f
Commit Graph

10308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Theo Arends
5f75a4c354 Fix future compile error ;-) 2020-04-24 15:50:27 +02:00
Theo Arends
56e756602e
Merge pull request #8265 from Theosakamg/upstream_sparkfun 
APDS-9960 - Resync with sparkfun
 2020-04-24 11:34:49 +02:00
Theo Arends
1ebdc818c7
Merge pull request #8264 from Theosakamg/debug_symbol 
APDS-9960 - Add Debug Chip ID And Fifo
 2020-04-24 11:33:10 +02:00
Theo Arends
0212d51d3d
Merge pull request #8269 from Jason2866/patch-3 
Use RC candidate of core v.2.7
 2020-04-24 11:32:05 +02:00
Theo Arends
8332bdebef
Merge pull request #8268 from Jason2866/patch-2 
Use latest Arduino git version for Tasmota...
 2020-04-24 11:31:25 +02:00
Jason2866
97f89f98a8
Core changed and ESP32 added 2020-04-24 11:30:03 +02:00
Jason2866
06841bbdff
Use RC candidate of core v.2.7 2020-04-24 11:27:30 +02:00
Jason2866
f8f654c9de
Use latest Arduino git version for Tasmota... 
feature stage. -> rc v.7.0
 2020-04-24 10:57:39 +02:00
Theo Arends
3dafeae4c7
Merge pull request #8267 from Jason2866/patch-1 
NimBLE ESP32 warning suppression
 2020-04-24 10:43:53 +02:00
Jason2866
3c6d4ef56b
NimBLE ESP32 warning suppression 
needs to work a entry in build_unflags
 2020-04-24 09:18:52 +02:00
Mickael Gaillard
bb0d4387ff Resync at commit 258bea2da 
Signed-off-by: Mickael Gaillard <mick.gaillard@gmail.com>
 2020-04-23 23:04:25 +02:00
Javier Arigita
6915346048 Fix merge 2020-04-23 22:51:13 +02:00
Javier Arigita
6225298353 Fix merge 2020-04-23 22:50:51 +02:00
Javier Arigita
bbb4fbd24b Fix merge 2020-04-23 22:49:16 +02:00
Javier Arigita
7c336a1105 Fix merge 2020-04-23 22:48:44 +02:00
Javier Arigita
88e0af98db Fix merge 2020-04-23 22:47:58 +02:00
Javier Arigita
7ea961953f Fix merge 2020-04-23 22:47:18 +02:00
Javier Arigita
29ec129a05 Fix merge 2020-04-23 22:44:06 +02:00
Javier Arigita
f325a436ba Fix merge 2020-04-23 22:43:20 +02:00
Javier Arigita
ab04f416ad Fix merge 2020-04-23 22:41:20 +02:00
Javier Arigita
058d23fa00 Heating structure aligned and unneeded defines removed 2020-04-23 22:39:28 +02:00
Mickael Gaillard
6d8fab10f3 Add Debug Chip ID And Fifo 
Signed-off-by: Mickael Gaillard <mick.gaillard@gmail.com>
 2020-04-23 21:56:23 +02:00
Theo Arends
567770ef4c
Merge pull request #8261 from Jason2866/patch-1 
Use cmd extends for ESP32 Env definition...
 2020-04-23 16:55:52 +02:00
Jason2866
ed07a63c6f
Use cmd extends for ESP32 Env definition... 
to declutter
 2020-04-23 15:10:06 +02:00
Theo Arends
009c55238f
Merge pull request #8259 from Jason2866/patch-1 
Credits for ESP32 port by Jörg Schüler-Maroldt
 2020-04-23 09:44:14 +02:00
Jason2866
cba271cb7d
Credits for ESP32 port by Jörg Schüler-Maroldt 2020-04-23 08:59:10 +02:00
dermm
809a377154 Add Option to Activate PWM CT mode without select module 48 
Hello,

I would like to share with you my extension of the code.
I have some new lamps that have 2 PWM channels that are not classically wired. The first one is for brightness and the other channel is for color temperature.
Tasmota has already integrated the possibility to switch between CWWW and CTBRI. I only built the possibility to set it up manually.

greetings,
Jens

PS: This is my first commit. If I did something wrong, please report it.
 2020-04-22 19:43:57 +02:00
Theo Arends
717f3b9d47 Fix compile error (#8256) 
Fix compile error (#8256)
 2020-04-22 17:48:42 +02:00
Theo Arends
1af24ddcf5 Update changelog 2020-04-22 16:36:27 +02:00
Theo Arends
be1fb3756c Change ESP32 freeHeap to MaxAllocHeap 2020-04-22 16:07:52 +02:00
Theo Arends
d013fbbab8
Merge pull request #8255 from s-hadinger/pwm_freq_223 
Change default PWM Frequency to 223 Hz instead of 880 Hz
 2020-04-22 16:03:53 +02:00
Stephan Hadinger
e06425b57f Change default PWM Frequency to 223 Hz instead of 880 Hz for less interrupt pressure 2020-04-22 15:15:42 +02:00
Theo Arends
f72be91f98
Merge pull request #8246 from s-hadinger/pwm_7231 
Change PWM implementation to Arduino #7231
 2020-04-22 15:13:26 +02:00
Theo Arends
f08ce9aa5b
Merge pull request #8221 from Theosakamg/clean_code 
Format code with cpplint
 2020-04-22 15:01:35 +02:00
Stephan Hadinger
d1beb59332 Fix compilation 2020-04-22 15:00:38 +02:00
Theo Arends
9ae0300a0d Fix ESP32 compile errors 2020-04-22 14:47:59 +02:00
Theo Arends
ac15179e21
Merge pull request #8252 from Bettman66/development 
Support for setting the time in the Tuya MCU
 2020-04-22 14:17:14 +02:00
Walter Zengel
8abe45f7a2
USE_TUYA_TIME deactivated by default 2020-04-22 13:52:06 +02:00
Theo Arends
6e8f2bb57b Fix ESP32 SCD30 compile error 2020-04-22 12:42:08 +02:00
Theo Arends
1aeff1900c
Merge pull request #8253 from s-hadinger/pwm_2ch_8120 
Fix wrong setting of free_range after reset or restart (#8120)
 2020-04-22 12:23:43 +02:00
Stephan Hadinger
a948a8f4b3 Fix wrong setting of free_range after reset or restart (#8120) 2020-04-22 12:13:53 +02:00
Walter Zengel
550f079f6a
Support for setting the time in the Tuya MCU 
Switch on with USE_TUYA_TIME
 2020-04-22 11:07:45 +02:00
Theo Arends
14e19b7cde
Merge pull request #8251 from pcdiem/device-groups-9 
Add DGR Command item and message logging
 2020-04-22 09:06:02 +02:00
Paul C Diem
50cdede658 Fix pwm_dimmer compiler error w/o USE_DEVICE_GROUPS, Slight code cleanup 2020-04-21 21:56:26 -05:00
Paul C Diem
0f4b85ee51 Add DGR Command item and message logging, Restructure to reduce new code size 2020-04-21 16:33:07 -05:00
Stephan Hadinger
32dfa7856b Change PWM implementation to Arduino #7231 2020-04-21 18:38:43 +02:00
Ingo Flaschberger
d9ff42f5b7 Add ShutterSetOpen command 2020-04-21 16:20:20 +02:00
Ingo Flaschberger
4518abaf32 Update Position / Trigger only active shutter 2020-04-21 16:19:42 +02:00
Ingo Flaschberger
2b1a9845d7 Fix: update position for all shutter types 2020-04-21 16:18:18 +02:00
Theo Arends
0196c70a40 Fix initial config version 2020-04-21 15:53:45 +02:00