Commit Graph

1607 Commits

Author SHA1 Message Date
reloxx13 6d80213657 Merge branch 'arendst/development' into development 2018-09-04 17:07:33 +02:00
Theo Arends 07dafe1631 6.2.0.2 - Energy monitoring
6.2.0.2 20180904
 * Rewrite energy monitoring using energy sensor driver modules
 * Fix lost today and total energy value after power cycle (#3689)
2018-09-04 16:22:34 +02:00
reloxx13 7a43a40455 Merge branch 'arendst/development' into development 2018-09-03 20:48:49 +02:00
Theo Arends 56ce45b32d
Merge pull request #3682 from znanev/patch-2
Update Bulgarian translations
2018-09-03 17:05:54 +02:00
znanev 41999a0afc
Update bg-BG.h 2018-09-03 13:49:49 +01:00
Theo Arends ca87357c19
Merge pull request #3676 from ascillato/patch-1
Update Spanish Translation
2018-09-03 08:40:53 +02:00
Adrian Scillato d557fdbe7b
Updated Spanish Translation 2018-09-03 00:28:03 -03:00
Theo Arends 44ecdaf952 Add support for Shelly
Add support for Shelly 1 and basic support for Shelly 2 - No energy monitoring yet (#2789)
2018-09-02 16:17:49 +02:00
Theo Arends 2210bda2e6 Replace APMac with BSSId
Replace APMac with BSSId in state and status 11
2018-09-02 15:54:26 +02:00
Theo Arends 9ff3233b97 Revert "Remove obsolete linker file"
This reverts commit 5ff735e4e7.
2018-09-02 15:23:11 +02:00
Theo Arends 5ff735e4e7 Remove obsolete linker file
Remove obsolete linker file as platformio now supports 1m0 out of the box
2018-09-02 15:21:58 +02:00
Theo Arends 4b4b0dff85 Fix compile error
Fix compile error
2018-09-02 14:46:06 +02:00
Theo Arends 0ac8c73938 Fix Wemo emulation
Fix Wemo emulation to select the first relay when more than one relay is present (#3657)
2018-09-02 14:26:00 +02:00
Theo Arends a60876378f Show AP channel on webpage
Show channel number on webpage and wifiscan debug info. Add BSSid to wifiscan debug info
2018-09-02 13:01:08 +02:00
Theo Arends 5623924813 Add Wifi channel number
Add Wifi channel number to state message (#3664)
2018-09-02 12:10:22 +02:00
Theo Arends c6a14c5fe7 Fix possible exception
Fix possible exception due to buffer overflow (#3659)
2018-09-02 11:52:24 +02:00
Theo Arends 48b5f9117a 6.2.0.1 - Fix StateText ambiguity
Fix possible ambiguity on command parameters if StateText contains numbers only (#3656)
2018-09-02 11:11:49 +02:00
Theo Arends d57dad2499
Merge pull request #3668 from kubroid/revert-3666-development
Revert "Fix ccs811 begin result check"
2018-09-02 08:17:53 +02:00
Alexey Kubrinsky 6a57882829
Revert "Fix ccs811 begin result check" 2018-09-02 00:47:35 +02:00
Theo Arends 52af61b278
Merge pull request #3666 from kubroid/development
Fix ccs811 begin result check
2018-09-01 20:02:56 +02:00
alex e5186e602e Fix ccs811 begin result check 2018-09-01 19:57:10 +02:00
Theo Arends 6d640cbd78
Merge pull request #3665 from andrethomas/development
Update README.md
2018-09-01 18:36:34 +02:00
andrethomas 17496d002e
Update README.md 2018-09-01 17:46:45 +02:00
Theo Arends 2e8864effd 6.2.0 - Released 2018-08-31 16:53:40 +02:00
Theo Arends 5e927000d8 Prep for release
Prep for release
2018-08-31 14:47:49 +02:00
Theo Arends fb6640e94b Update display drivers
Add features to and provide more stable display drivers
2018-08-31 12:17:09 +02:00
Theo Arends 67db78b759
Merge pull request #3644 from Jason2866/patch-1
Update xsns_27_apds9960.ino
2018-08-31 10:13:32 +02:00
Jason2866 bd4048143e
Update xsns_27_apds9960.ino
New Version from Staars https://github.com/Staars/Sonoff-Tasmota/tree/development/sonoff
2018-08-30 18:12:21 +02:00
Theo Arends 2212af4860 Clear GPIO on multi boot loop
Clear GPIO on multi boot loop
2018-08-30 14:47:48 +02:00
Theo Arends f7c38f24f3 6.1.1.14 Add boot loop detection
Add boot loop detection and try to fix
2018-08-30 14:27:33 +02:00
Theo Arends 3abdaaffb7 Revert "6.1.1.14 Add boot loop detection"
This reverts commit b9a875d6fb.
2018-08-30 13:19:09 +02:00
Theo Arends b9a875d6fb 6.1.1.14 Add boot loop detection
Add boot loop detection and try to fix
2018-08-30 12:22:24 +02:00
Theo Arends 1fad13dc91
Merge pull request #3638 from ascillato/patch-1
Add command TIMERS 2 to toggle global timers enable flag
2018-08-30 11:44:58 +02:00
Theo Arends 19f55b1ec8
Merge pull request #3640 from andrethomas/patch-1
Update README.md
2018-08-30 08:42:05 +02:00
andrethomas 452ad6c72e
Update README.md 2018-08-30 00:03:56 +02:00
reloxx13 b4ec62e803 Merge branch 'arendst/development' into development 2018-08-29 23:18:31 +02:00
Adrian Scillato ee8a698ca5
Added command TIMERS 2 to toggle global timers enable flag
#3308
2018-08-29 14:21:13 -03:00
Theo Arends 7d00289c02 Update Releasenotes
Update Releasenotes
2018-08-29 17:46:05 +02:00
Theo Arends 7b18436179 Update changelog
Update changelog
2018-08-29 17:39:10 +02:00
Theo Arends fc25706714
Merge pull request #3635 from arendst/release-6.2
Merge pull request #3620 from arendst/development
2018-08-29 16:14:34 +02:00
Theo Arends ebb7f929a0 Fix HsbColor
Fix HsbColor (#3430) and enable multiple DS18X20 sensors as default
2018-08-29 16:05:27 +02:00
reloxx13 0199f55452 Merge branch 'arendst/development' into development 2018-08-28 21:45:19 +02:00
Theo Arends 3efd969350
Merge pull request #3623 from ascillato/patch-3
Add Compiled Development Binaries Link to ReadMe
2018-08-28 21:40:45 +02:00
Adrian Scillato c7d8cced6c
Added Compiled Development Binaries Link to ReadMe
@andrethomas automated binaries from development. Explained at #3397.
2018-08-28 16:17:13 -03:00
Theo Arends 19a8113cf4 Revert "Merge branch 'release-6.2' into development"
This reverts commit 433dc8d9d1, reversing
changes made to 6c61cdead7.
2018-08-28 18:13:14 +02:00
Theo Arends ba9b4d9fd1
Merge pull request #3620 from arendst/development
Prep for release
2018-08-28 18:01:24 +02:00
Theo Arends 433dc8d9d1
Merge branch 'release-6.2' into development 2018-08-28 17:45:28 +02:00
Theo Arends 6c61cdead7 Prep for release
Prep for release
2018-08-28 17:34:51 +02:00
Theo Arends d9af68d72c Update README
Update README
2018-08-28 16:50:16 +02:00
Theo Arends ea53e930e1 Remove files not to release
Remove files not to release
2018-08-28 16:39:17 +02:00