mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
2,437 Commits 3 Branches 119 Tags 270 MiB
24ef9ab6b8
Commit Graph

2437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Scillato
24ef9ab6b8
Fix Compilation issue with STAGE Core 
Now the Stage core has the the same STR macro defined in sonoff.h.
 2018-12-03 17:38:31 -03:00
Theo Arends
fd8af87c80
Merge pull request #4518 from andrethomas/patch-1 
Add GPIO2 for Sonoff Basic Template
 2018-12-03 20:02:16 +01:00
andrethomas
dcaf6164d4
Add support for GPIO02 for newer Sonoff Basic 
Add support for GPIO02 for newer Sonoff Basic
 2018-12-03 17:34:35 +02:00
andrethomas
b148c8bbe5
Add GPIO2 for Sonoff Basic Template 
Add GPIO2 for Sonoff Basic Template
 2018-12-03 17:30:06 +02:00
Theo Arends
f5f75ae9b7
Merge pull request #4514 from curzon01/development 
decode-config.py: add new settings
 2018-12-03 08:51:45 +01:00
Norbert Richter
3cd89330aa decode-config.py: add new settings 
- add 6.3.0.15 setting change
- adapt 6.3.0.13 setting change
 2018-12-03 08:33:21 +01:00
andrethomas2
a2e865bb44
Add dummy soft_spi_flg to satisfy compiler 
@arendst Just adding this, for now, to satisfy the compiler until you get time to merge the rest of the Software SPI support.
 2018-12-02 18:53:49 +02:00
Theo Arends
b1a9de5a80
Merge pull request #4510 from emontnemery/hass_rework_light_status 
Further improve Hass integration
 2018-12-02 17:11:05 +01:00
Erik
74172f14d3 Further improve Hass auto discovery 2018-12-02 16:39:59 +01:00
andrethomas2
f3d625d06d
Update _changelog.ino 2018-12-02 11:18:29 +02:00
andrethomas2
2e950c589a
Update README.md 2018-12-02 11:00:01 +02:00
Theo Arends
f4348f19dc
Merge pull request #4488 from winstona/hc-sr04-newping 
HC-SR04: switch to using NewPing libraries directly
 2018-12-02 09:50:35 +01:00
Theo Arends
09835cc354
Merge pull request #4501 from ascillato/patch-1 
Delete duplicated min and max functions
 2018-12-02 08:49:10 +01:00
Adrian Scillato
7e09195083
Delete duplicated min and max functions 2018-12-01 19:16:32 -03:00
Theo Arends
4ced9c0647
Merge pull request #4500 from ascillato/patch-1 
RULES: Added BREAK as an alternative ENDON
 2018-12-01 23:06:08 +01:00
Adrian Scillato
c68fe7e7ad
RULES: Added BREAK as an alternative ENDON 2018-12-01 19:00:34 -03:00
andrethomas2
e37dbd1f6a
Update xsns_22_sr04.ino 2018-12-01 23:15:19 +02:00
Adrian Scillato
7f2b3643f5
RULES: Added BREAK as an alternative ENDON 
RULES: Added BREAK as an alternative ENDON that will stop the execution of the following rules.

If a rule that ends with BREAK, is triggered, then the following rules of that set will not be executed. This is useful for cases like: https://github.com/arendst/Sonoff-Tasmota/issues/4477
 2018-12-01 18:12:33 -03:00
Theo Arends
2e1af64020
Merge pull request #4498 from ascillato/patch-1 
KNX: Add Support for ButtonN and SwitchN
 2018-12-01 20:29:51 +01:00
Adrian Scillato
98a2e6e175
Added Support for ButtonN and SwitchN 2018-12-01 16:26:15 -03:00
Theo Arends
2367834a64 Update with dynamic sleep flag 2018-12-01 18:58:30 +01:00
Theo Arends
eb3c1a327d 6.3.0.15 Update dynamic sleep 
6.3.0.15 20181201
 * Removed command SetOption36 (#4497)
 * Add command SetOption60 0/1 to select dynamic sleep (0) or sleep (1) (#4497)
 2018-12-01 18:53:42 +01:00
Theo Arends
980e8c3401
Merge pull request #4497 from andrethomas/sleep 
Merge sleep command
 2018-12-01 18:24:11 +01:00
andrethomas
0bd4ac8eea
Update support_wifi.ino 2018-12-01 18:58:26 +02:00
andrethomas
a1c464d34c
Bump version to 0x0603000F 
Bump version to 0x0603000F to make sure new sleep command takes effect on 50 as default for upgrades where sleep is < 50.
 2018-12-01 18:55:06 +02:00
andrethomas
6050cd40f3 Merge sleep command 2018-12-01 18:47:25 +02:00
Theo Arends
694c29508d
Merge pull request #4492 from localhost61/development 
Update fr-FR.h
 2018-12-01 10:26:39 +01:00
Theo Arends
4729d0e6c7
Merge pull request #4491 from andrethomas/development 
Fix sleep->SetOption36 transition
 2018-12-01 10:24:44 +01:00
Xavier MULLER
be86811628
Update fr-FR.h 
Synced with changes since  v6.2.1.7
 2018-12-01 02:48:10 +01:00
andrethomas
5f402c8f34 Fix sleep->SetOption36 transition 2018-12-01 00:18:08 +02:00
Theo Arends
2969b29378
Merge pull request #4490 from andrethomas/patch-1 
Prevent sleep and SetOption36 Conflict
 2018-11-30 19:36:12 +01:00
andrethomas
3613946f18
Prevent sleep and SetOption36 being used concurrently 
Prevent sleep and SetOption36 being used concurrently
 2018-11-30 20:00:20 +02:00
andrethomas
33f85b2023
Upd settings.ino - set sleep=0 when SetOption36>0 
Update settings.ino - set sleep=0 when SetOption36>0
 2018-11-30 19:55:22 +02:00
Theo Arends
d7df73784f Housekeeping 2018-11-30 12:04:17 +01:00
Winston Ametsitsi
b03c761eee switch to using NewPing lib directly for sr04 
add NewPing-1.9.1 lib
 2018-11-29 19:45:40 -08:00
Theo Arends
8b5bbd773e Update display and epaper drivers 
Update display and epaper drivers
 2018-11-29 17:50:45 +01:00
Theo Arends
4d556d159f Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2018-11-29 15:13:33 +01:00
Theo Arends
7383ab4f45 Add support for Teckin US 
Add support for Teckin US Wifi Smart Switch with Energy Monitoring (#4481)
 2018-11-29 15:13:28 +01:00
Theo Arends
20480cee47
Merge pull request #4478 from emontnemery/hass_fix_light 
Small improvements to Hass MQTT discovery
 2018-11-28 20:54:20 +01:00
Erik
259d9f5f6c Small improvements to Hass MQTT discovery 2018-11-28 20:43:36 +01:00
Theo Arends
e3bff56092 Fix possible overflow situation 
Fix possible overflow situation
 2018-11-28 14:06:02 +01:00
Theo Arends
9738f640cf
Merge pull request #4473 from chaosmaster/patch-1 
PS_16_DZ: cleanup/optimize
 2018-11-28 09:21:15 +01:00
Joel Stein
0ce7537371 PS_16_DZ: cleanup 2018-11-28 00:04:06 +01:00
Theo Arends
8b08a3d9bc
Merge pull request #4471 from emontnemery/hass_fix_topic 
Hass: Restart if topic is changed
 2018-11-27 19:42:32 +01:00
Erik
6d3223f962 Hass: Restart if topic is changed 2018-11-27 19:31:45 +01:00
Joel Stein
f75c4a27ad PS_16_DZ: leave space for trailing 0-byte 2018-11-27 19:01:06 +01:00
Joel Stein
49403243d5 PS_16_DZ: further optimization 2018-11-27 18:02:00 +01:00
Joel Stein
6825b78153 PS_16_DZ: optimize for size 2018-11-27 17:18:41 +01:00
Joel Stein
5099d8f20d PS_16_DZ: reduce buffer-size and actually check for overflow 2018-11-27 16:52:09 +01:00
Joel Stein
7a2c5154aa PS_16_DZ: only update brightness if it actually changed 2018-11-27 16:11:14 +01:00