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

1830 Commits

Author SHA1 Message Date
reloxx13 17c71055e3 Merge branch 'arendst/development' into development 2018-09-28 21:06:21 +02: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
Jason2866 3bb8b2fe26
Update de-DE.h 2018-09-26 22:10:32 +02:00
Theo Arends 0eac385b04
Merge pull request #3908 from emontnemery/fix_hass_forced_light 
Fix logic for forced light discovery
 2018-09-26 20:54:52 +02:00
Erik 9acbcc805f Fix logic for forced light discovery 2018-09-26 20:35:39 +02:00
Theo Arends 172219de42
Merge pull request #3907 from znanev/patch-3 
Update Bulgarian language file
 2018-09-26 19:32:42 +02:00
znanev 8022bca19c
Update Bulgarian language file 2018-09-26 18:27:23 +01:00
Theo Arends 66890e7e69
Merge pull request #3905 from curzon01/development 
'decode-config.py' version bugfixes & json output enhancements
 2018-09-26 15:26:54 +02:00
Norbert Richter 76d203d5aa 'decode-config.py' version bugfixes & json output enhancements 
- add new arguments '--json-indent' and '--json-compact'
- fix poblem with invalid string chars when having garbadge in flash
- fix errors using configs for Tasmota < v6.2.1
- fix setting definition for v5.13.1/v5.14.0
 2018-09-26 15:18:01 +02:00
Theo Arends 6939d6eead Fix Shelly Ghost and Rule sensors 
* Change pinmode for no-pullup defined switches to pullup when configured as switchmode PUSHBUTTON (=3 and up) (#3896)
 * Add delay after restart before processing rule sensor data (#3811)
 2018-09-26 11:56:58 +02:00
Theo Arends bac33345a0 6.2.1.8 Extent status JSON 
6.2.1.8 20180926
 * Change status JSON message providing more switch and retain information
 2018-09-26 10:13:44 +02:00
Theo Arends 77a27d4383
Merge pull request #3899 from localhost61/development 
Update fr-FR.h
 2018-09-26 09:00:02 +02:00
Theo Arends 6f38dd83a9
Merge pull request #3901 from ascillato/patch-1 
Update Spanish Translation
 2018-09-26 08:59:20 +02:00
localhost61 8ff696b34b Correct the OoR translation (thanks Adrian ;-) ) 2018-09-26 02:37:27 +02:00
Adrian Scillato 6798eb5854
Updated Spanish Translation 2018-09-25 21:00:56 -03:00
localhost61 71964e0aa4 Update French localization 2018-09-26 00:59:00 +02:00
Theo Arends b78626fd48 Updated with Shelly 2018-09-25 17:08:16 +02:00
Theo Arends eb53605fc1 Fix VEML6070 compile errors 2018-09-25 17:03:22 +02:00
Theo Arends 80833ca0d5
Merge pull request #3894 from mike2nl/development 
Added missing text
 2018-09-25 16:53:41 +02:00
Mike 63dbd6d0c9
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:42:09 +02:00
Mike a47467704e
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:42:07 +02:00
Mike 85692d6f38
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:42:01 +02:00
Mike e719cfbf43
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:41:51 +02:00
Mike 65dbf4c709
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:38:40 +02:00
Mike dc937ed792
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:38:27 +02:00
Mike 6b070e08cf
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:38:04 +02:00
Mike a7495af9ed
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:35:48 +02:00
Mike 55db6530ec
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:35:29 +02:00
Mike a1d5032993
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:35:17 +02:00
Mike 9ad0bc149f
Added text 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:32:46 +02:00
Mike cdc7b90652
Added text 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:32:36 +02:00
Mike 3fd8b8f7f8
Added text 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:32:17 +02:00
Mike b15a29c046
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:29:27 +02:00
Mike a7d59f03fa
Added text 
Forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:28:34 +02:00
Mike abd5cb23fe
Added text 
forgot the 
#define D_UNIT_INCREMENTS "inc" and #define D_UV_INDEX_1 "Low"
 2018-09-25 16:27:10 +02:00
Mike e6ae87fd82
added text 
forgot the #define D_UNIT_INCREMENTS "inc"
 2018-09-25 16:24:44 +02:00
Mike baf81daaa2
added text 
forgot the #define D_UNIT_INCREMENTS "inc"
 2018-09-25 16:23:38 +02:00