mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,791 Commits 12 Branches 111 Tags 1.1 GiB
Commit Graph

1791 Commits

Author SHA1 Message Date
Theo Arends 8091dfca11
Merge pull request #3958 from curzon01/development 
v1.5.0012: 'decode-config.py' add args, 6.2.1.x settings, fix filename using @v
 2018-10-02 13:47:12 +02:00
Norbert Richter 7dcb10a911 v1.5.0012: 'decode-config.py' add args, add 6.2.1.x settings, fix filename with @ 
- add: developer version settings 6.2.1.2, 6.2.1.3, 6.2.1.6, 6.2.1.10
- add: args '--raw-keys', '--no-raw-keys', '--raw-values', '--no-raw-values', '--hide-pw'
- add: value -1 for arg '--json-indent' to disable indent if default is enabled
- changed: json output to file use always raw values
- fix: add again removed return code desc
- fix: needless dot . in filename for @v
- fix: rule(123) none-raw outputs
 2018-10-02 13:42:21 +02:00
Theo Arends 3ed06695ba Fix Teckin energy monitoring 
Fix Teckin energy monitoring (#3950)
 2018-10-02 09:38:36 +02:00
Theo Arends c0117e5315
Merge pull request #3955 from zuckschwerdt/feat-w1parasite 
Add W1_PARASITE_POWER optimization for DS18X20
 2018-10-01 21:31:36 +02:00
Theo Arends 2f429e5a44
Merge pull request #3954 from andrethomas/development 
PCA9685 - bugfix for telemetry + status command
 2018-10-01 21:30:20 +02:00
Christian W. Zuckschwerdt 3280c7d177 Add W1_PARASITE_POWER optimization for DS18X20 2018-10-01 20:26:27 +02:00
andrethomas 2f85a4728b PCA9685 - bugfix for telemetry + status command 2018-10-01 19:32:55 +02:00
Theo Arends d9a0c0e4ae
Merge pull request #3953 from ascillato/patch-1 
Add Dimmer Trigger for Rules
 2018-10-01 18:25:10 +02:00
Theo Arends 6d00489043
Merge pull request #3952 from mike2nl/development 
Fixed wrong sensor name
 2018-10-01 18:23:45 +02:00
Adrian Scillato bcc9432214
Added Dimmer Trigger for Rules 
For example

rule on Dimmer#state<30 do ... endon
rule on Dimmer#boot<10 do ... endon
 2018-10-01 13:13:47 -03:00
Mike 13d37a144a
Fixed wrong sensor name 
Fixed a wrong sensor name in line 23. It's not the SPG30, it's the CSS811
 2018-10-01 18:06:25 +02:00
Mike 81439e834a
Merge pull request #4 from arendst/development 
update tasmota
 2018-10-01 18:04:03 +02:00
Theo Arends 9e5aaef51f Add OBI/Teckin Socket support 
* Add support for OBI Power Socket (#1988, #3944)
 * Add support for Teckin Power Socket with Energy Monitoring (#3950)
 2018-10-01 12:19:58 +02:00
Theo Arends e4363eae42
Merge pull request #3949 from andrethomas/development 
PCA9685 - Add #define USE_PCA9685_FREQ
 2018-10-01 11:18:13 +02:00
andrethomas 047f430ad8
PCA9685 - Remove unused callbacks in Xdrv15() 2018-10-01 00:27:16 +02:00
andrethomas da0b283fe7 PCA9685 - Add telemetry output 2018-10-01 00:18:37 +02:00
andrethomas 068211cae9
Add #define USE_PCA9685_FREQ 50 if not defined 
Add #define USE_PCA9685_FREQ 50 if not defined in user_config.h
 2018-09-30 23:33:14 +02:00
andrethomas ee0ef227dc Add ability to set default PWM Freq using #define #define USE_PCA9685_FREQ 2018-09-30 23:07:46 +02:00
Theo Arends f62b911159
Merge pull request #3944 from florianschroen/development 
Add support for OBI smart socket
 2018-09-30 19:35:02 +02:00
Florian Schroen 89825907d0 Add support for OBI smart socket 
Model tested: WFG-1
Models maybe working: WFF-1, WFE-1, WFI-1, WFD-1, WFR-1, WFA-1, WFU-1
Manufactured by: Cixi Yidong Electronics Co. Ltd - http://www.cn-yidong.com/
Sold by: OBI DIY market in Germany - https://www.obi.de/
 2018-09-30 19:16:55 +02:00
Theo Arends b9b6d132f5 Fix timer offset -00:00 
Fix timer offset -00:00 causing 12:00 hour offset (#3923)
 2018-09-30 17:52:41 +02:00
Theo Arends 191df17b13 Add support for EXS Relay V5.0 
Add support for EXS Relay V5.0 (#3810)
 2018-09-30 16:52:25 +02:00
Theo Arends 2fd42446e9 Add ESP Switch support 
Add support for Michael Haustein ESP Switch
 2018-09-30 14:33:26 +02:00
Theo Arends 6a1a21f03a 6.2.1.10 Add RGBWWTable 
6.2.1.10 20180930
 * Add command RGBWWTable to support color calibration (#3933)
 2018-09-30 11:02:47 +02:00
Theo Arends c77d9f39bd
Merge pull request #3933 from emontnemery/color_calibration 
Add basic support for color calibration
 2018-09-30 10:55:17 +02:00
Theo Arends cdc8a4d9eb
tiny change 2018-09-30 10:54:52 +02:00
Erik 87dc6fe20e Add basic support for color calibration 2018-09-29 16:55:53 +02:00
Theo Arends 53acb34279
Merge pull request #3932 from curzon01/development 
v1.5.0011: 'decode-config.py' fixes & enhancements
 2018-09-29 14:00:21 +02:00
Norbert Richter 3997792429 v1.5.0011: 'decode-config.py' fixes & enhancements 
- add configuration data header to json and binary outputs
--add template @v and @f for output filename
- add output of crc values on crc error
- add '--exit-on-error-only' arg make it possible to process partly valid data
- replaced '--sort <word>' by '--unsort'
- changed data size and data crc error into warnings
- changed output always in json format
- removed arg '--format' (obsolete)
- removed collections module (obsolete)

v1.5.0010: 'decode-config.py' add more detailed outputs

- add bit structure for struct TimeRule, Timer, Mcp230xxCfg
- add program return code desc
- add error handling for additonal python modules
- changed 'Settings' definition to handle array of struct
- changed field conversion string to formular evaluation for values
- fix and enhance output values
 2018-09-29 13:56:02 +02:00
Theo Arends 302d524367 Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2018-09-29 13:09:57 +02:00
Theo Arends 3b3579f1db Fix config crc errors 
Fix invalid configuration restores and decode_config.py crc error when savedata = 0 (#3918)
 2018-09-29 13:09:51 +02:00
Theo Arends 9406431563
Merge pull request #3926 from znanev/patch-1 
Fix dead links to wiki pages
 2018-09-29 12:37:02 +02:00
Theo Arends 2252be521a Fix I2CScan invalid JSON 
Fix I2CScan invalid JSON error message (#3925)
 2018-09-29 12:34:24 +02:00
Theo Arends 3d6b9859bd
Merge pull request #3929 from emontnemery/fix_hass_colors 
Use color2 command (HASS sends normalized RGB)
 2018-09-29 10:27:02 +02:00
Erik 8255c001b6 Use color2 command (HASS sends normalized RGB) 2018-09-29 10:12:32 +02:00
znanev aa04074937
Fix dead links to wiki pages 2018-09-28 23:21:17 +01:00
Theo Arends 66fce8bd5f
Merge pull request #3921 from mike2nl/development 
Udated the driver veml6070
 2018-09-28 17:50:38 +02:00
Mike 41e6939a81
outline corrections of // comments 2018-09-28 17:38:06 +02:00
Mike e8a56755d9
Updated the driver 
Updated the driver and changed a lot. 
- Starting with switch(function) and the end of it. 
- Changed the json output code a lot to more visibility and a better way of working. 
- Changed the web sever outout so that we need less code.

In #ifdef USE_DOMOTICZ i have changed nothing because i don't have a domotica system.
Therefor someone with a stable running system can build it further or we can work together on it.

Dirver version changed to v1.0.0.2
Theo, i hope the if (11 == (uptime %100)) { .. part is ok. Please have a look on it.
 2018-09-28 17:34:25 +02:00
Mike 36d6ae0803
Added D_JSON_UV_INDEX_TEXT 
Added D_JSON_UV_INDEX_TEXT for more info on json output
 2018-09-28 17:26:13 +02:00
Theo Arends 8f95f07b51 Add RF to MagicHome / LC10 
Add RF Receiver control to module MagicHome to be used on Arilux LC10 (#3792)
 2018-09-28 17:26:08 +02:00
Mike aa45f164f0
Merge pull request #3 from arendst/development 
Update my fork
 2018-09-28 17:23:15 +02:00
Theo Arends f05a471e48 Fix KNX compile error 2018-09-28 17:02:55 +02:00
Theo Arends 4b7c797fb7 6.2.1.9 Apparent/Reactive Power 
6.2.1.9 20180928
 * Add Apparent Power and Reactive Power to Energy Monitoring devices (#251)
 2018-09-28 15:48:42 +02:00
Theo Arends 1a0d630da2 Removed debug code 
Removed unavailable debug code (#3917)
 2018-09-28 11:48:55 +02:00
Theo Arends 1a4458528e Add Neo Coolcam support 
Add support for Neo Coolcam Wifi Smart Power Plug
 2018-09-27 18:36:42 +02:00
Theo Arends c433bbc7eb
Merge pull request #3910 from ascillato/patch-1 
Add new triggers for rules on boot time
 2018-09-27 09:07:53 +02:00
Adrian Scillato a67efa0ab2
Added new triggers for rules on boot time 
To make it possible to trigger a rule at boot time with the state of the switches or relays (in order to take decisions), 2 new trigger types has been added: 

* SWITCH1#BOOT

to be used like:

ON SWITCH1#BOOT DO ...  %value% ENDON
ON SWITCH1#BOOT=0 DO .... ENDON
ON SWITCH1#BOOT=1 DO .... ENDON

and

* POWER1#BOOT

to be used like:

ON POWER1#BOOT DO ...  %value% ENDON
ON POWER1#BOOT=0 DO .... ENDON
ON POWER1#BOOT=1 DO .... ENDON
 2018-09-26 23:02:55 -03:00
Theo Arends 56dd5b21b8
Merge pull request #3909 from Jason2866/patch-1 
Update de-DE.h
 2018-09-26 22:23:40 +02:00
Jason2866 86b3ccf609
Update de-DE.h 2018-09-26 22:20:19 +02:00