mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,585 Commits 6 Branches 113 Tags 1.2 GiB
Commit Graph

1585 Commits

Author SHA1 Message Date
andrethomas 9ea3e7d80e Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2018-07-24 20:06:42 +02:00
andrethomas 5149b3cd23 Merge branch 'development' of https://github.com/andrethomas/Sonoff-Tasmota into development 2018-07-24 19:37:28 +02:00
andrethomas bd536d2d95 Opto'd MCP230xx_Show() shaving off another 92 bytes of flash 2018-07-24 19:36:30 +02:00
Theo Arends 99e81ba86e Fix CCS811 env compensation 
Fix CCS811 temperature and humidity compensation
 2018-07-24 18:41:50 +02:00
Theo Arends d7e6f6114a Fix possible WDT 
Fix possible WDT due to long MQTT publish handling (#3313)
 2018-07-24 18:40:13 +02:00
Theo Arends ad949eba9d
Merge pull request #3310 from andrethomas/development 
Optimize MCP230xx_CheckForInterrupt() and MCP230xx_ApplySettings() save 352 bytes flash
 2018-07-23 22:52:44 +02:00
andrethomas 068a42c4f3 Optimize MCP230xx_CheckForInterrupt() and MCP230xx_ApplySettings() 2018-07-23 19:46:41 +02:00
Theo Arends cdae4f3f46 Add support for CCS811 
Add support for CCS811 sensor (#3309)
 2018-07-23 17:42:12 +02:00
Theo Arends b7b87f5524 Add CCS811 library version 
Add CCS811 library version
 2018-07-23 17:25:50 +02:00
Theo Arends dd960acd0b
Merge pull request #3309 from gemu2015/new_CCS811 
ccs811
 2018-07-23 17:19:49 +02:00
Theo Arends 07f70f890f
Update xsns_31_ccs811.ino 2018-07-23 17:19:09 +02:00
Theo Arends 5493766bda
Update xsns_31_ccs811.ino 2018-07-23 17:17:40 +02:00
gemu2015 d21a04e872 ccs811 
completely new from arends/development
 2018-07-23 16:27:15 +02:00
Theo Arends adc781b8fc Remove Travis deploy 
Removed Travis deploy as it fails to properly byte align resulting in corrupted binaries.
 2018-07-23 12:11:04 +02:00
Theo Arends d62cb11227
Merge pull request #3306 from ascillato/patch-1 
KNX: Add new event and new commands
 2018-07-23 10:24:45 +02:00
Theo Arends bf0d0dcd94
Merge pull request #3307 from ascillato/patch-2 
Move subStr() Function to Support.ino
 2018-07-23 10:22:58 +02:00
Adrian Scillato 3373fff9eb
Added Commands KNX_GA and KNX_CB 
* Added command KNX_GA so as to setup Group Address to Send Data/Commands

Usage:

KNX_GA
(return the amount of GA configured)

KNX_GA 1
(return the configuration of the GA#1

KNX_GAx option, area, line, member
(Set the configuration of the GA#x)

example: KNX_GA3 1, 2,2,4

For the GA#3, the status of Relay 1 is sent to 2.2.4

* Added command KNX_CB so as to setup Group Address to Receive Data/Commands

KNX_CBx option, area, line, member

example: KNX_CB2 1, 2,2,4

For the CB#2, listen to 2.2.4 to set the status of the Relay 1


Posible values of the parameter OPTION:

1 - Relay 1
2 - Relay 2
3 - Relay 3
4 - Relay 4
5 - Relay 5
6 - Relay 6
7 - Relay 7
8 - Relay 8
9 - Button 1
10 - Button 2
11 - Button 3
12 - Button 4
13 - Button 5
14 - Button 6
15 - Button 7
16 - Button 8
17 - TEMPERATURE        
18 - HUMIDITY           
19 - ENERGY_VOLTAGE     
20 - ENERGY_CURRENT     
21 - ENERGY_POWER       
22 - ENERGY_POWERFACTOR 
23 - ENERGY_DAILY       
24 - ENERGY_START       
25 - ENERGY_TOTAL       
26 - KNX_SLOT1              
27 - KNX_SLOT2              
28 - KNX_SLOT3              
29 - KNX_SLOT4              
30 - KNX_SLOT5              
255 - EMPTY
 2018-07-23 04:03:57 -03:00
Adrian Scillato a294a9179d
Added Command KNX_PA 
Added Command KNX_PA for changing the device KNX Physical Address
 2018-07-23 02:15:44 -03:00
Adrian Scillato 754955cd48
Move subStr Function to Support.ino 2018-07-23 01:32:54 -03:00
Adrian Scillato 96fb23737d
Move subStr Function to Support.ino 2018-07-23 01:29:50 -03:00
Adrian Scillato 77181854a7
Added KNX commands 
* KNX_ENABLED 0/1
* KNX_ENHANCED 0/1
 2018-07-23 01:01:52 -03:00
Adrian Scillato 99eb3362aa
Make KNX WEB MENU optional 2018-07-23 00:54:25 -03:00
Adrian Scillato 552ac7d545
Make KNX WEB MENU Optional 2018-07-22 23:16:46 -03:00
Adrian Scillato 9c5d3f501d
Make KNX WEB MENU Optional 2018-07-22 23:16:05 -03:00
Adrian Scillato a6f27db910
Make KNX WEB MENU optional 2018-07-22 23:14:33 -03:00
Adrian Scillato bc6195e492
KNX: Added the EVENT knxrx_val1..5 
Added the EVENT KNXRX_VAL1...5 when receiving values from the KNX Network or another Tasmota with KNX

Now, sensor values (for example) can be sent from one device to another.
 2018-07-22 22:40:28 -03:00
Adrian Scillato 29c7e409ee
ESP-KNX-IP Library - Correct invalid keywords.txt KEYWORD_TOKENTYPE 2018-07-22 22:37:22 -03:00
Theo Arends f945c0926f
Merge pull request #3304 from andrethomas/development 
MCP23008/MCP23017 bugfix - Only check for interrupts if enabled
 2018-07-22 22:45:55 +02:00
andrethomas 7285aa356f MCP23008/MCP23017 bugfix - Only check for interrupts if enabled on at least one pin 2018-07-22 22:40:26 +02:00
Theo Arends 55ea02bd3a
Merge pull request #3291 from andrethomas/development 
MCP23008/MCP23017 - Remove web config & extend sensor29 command
 2018-07-22 10:45:57 +02:00
andrethomas 4d1981dca3 Simplify MCP230xx_ApplySettings 2018-07-21 22:04:18 +02:00
andrethomas 6a4d4503f6 Changed mcp230xx_config structure 2018-07-21 18:06:24 +02:00
andrethomas 9731b13fd6 Removed WEB CONFIG option and extended sensor29 commands 2018-07-21 18:04:36 +02:00
Theo Arends a4eddcb518 Add global timer cntrl to webpage 
Add command Timers 0/1 to globally disable or enable armed timers (#3270)
 2018-07-21 16:47:44 +02:00
Theo Arends a8d373dd2c
Merge pull request #3285 from andrethomas/development 
Bugfix MCP230xx driver
 2018-07-21 15:23:37 +02:00
andrethomas 55691affaa Bugfix on MCP230xx driver 2018-07-21 14:24:34 +02:00
andrethomas 4f86c5d6f1 Bugfix on MCP230xx driver 2018-07-21 14:17:48 +02:00
andrethomas e6f67997af
Merge pull request #7 from arendst/development 
Revisit Timers off/on
 2018-07-20 20:05:51 +02:00
Theo Arends 612374cfbf Revisit Timers off/on 
6.1.1c
 * Add command Timers 0/1 to globally disable or enable armed timers (#3270)
 2018-07-20 16:12:37 +02:00
andrethomas 820e592058
Merge pull request #5 from arendst/development 
Update andrethomas/Sonoff-Tasmota from arendst/Sonoff-Tasmota
 2018-07-20 15:10:02 +02:00
Theo Arends 33c552a72d
Merge pull request #3256 from andrethomas/push2arendst 
Move LM75ADDetect and MCP230xx_Detect
 2018-07-20 14:17:24 +02:00
Theo Arends 3002ce95eb
Merge pull request #3269 from renne/development 
Visual Studio specific compiler warning fixed.
 2018-07-20 14:16:41 +02:00
Rene 'Renne' Bartsch c3c4f89efd
Visual Studio specific compiler warning fixed. 
This commit fixes the Visual Studio compiler warning
```
D:/Sonoff-Tasmota-development.6.1.1b/sonoff/xsns_30_mpr121.ino:192:2: warning: 'typedef' was ignored in this declaration [enabled by default] }; ^
```
 2018-07-19 21:18:20 +02:00
andrethomas b7b8156926
Merge pull request #3 from andrethomas/patch-1 
Move LM75ADDetect() to FUNC_EVERY_SECOND
 2018-07-18 14:26:53 +02:00
andrethomas 370cbf064c
Move LM75ADDetect() to FUNC_EVERY_SECOND 
Move LM75ADDetect() from FUNC_PREP_BEFORE_TELEPERIOD to FUNC_EVERY_SECOND to comply with FUNC_PREP_BEFORE_TELEPERIOD marked as deprecated.
 2018-07-18 09:43:49 +02:00
andrethomas e6c5553059 Move MCP230xx_Detect() from FUNC_PREP_BEFORE_TELEPERIOD to FUNC_EVERY_SECOND 2018-07-17 21:18:26 +02:00
Theo Arends dbf84d7813 Add checks 
Add checks
 2018-07-17 16:07:03 +02:00
Theo Arends 9cab37e0f3
Merge pull request #3242 from localhost61/patch-1 
Update fr-FR.h
 2018-07-17 15:27:40 +02:00
Theo Arends cdb4a0612b
Update fr-FR.h 2018-07-17 15:27:19 +02:00
Xavier MULLER 9a3a834d1b
Update fr-FR.h 2018-07-17 15:14:25 +02:00