Commit Graph

4230 Commits

Author SHA1 Message Date
srodgers e620f75785 Remove extra space 2019-09-05 08:25:03 -07:00
srodgers 553c5e4a9c Sync to testing branch 2019-09-05 08:20:40 -07:00
Theo Arends ea0fb65845 Refactor Sendmail
Refactor Sendmail
2019-09-05 17:19:19 +02:00
Theo Arends aaf542bf97
Merge pull request #6352 from gemu2015/sendmail
sendmail support
2019-09-05 16:56:30 +02:00
Theo Arends a01de9a9b2 Remove obsolete Tuya code
Remove obsolete Tuya code
2019-09-05 16:56:02 +02:00
Theo Arends db51e516b6 Fix core 2.3.0 compilation error due to missing std::swap
Fix core 2.3.0 compilation error due to missing std::swap (#6356)
2019-09-05 16:34:03 +02:00
Theo Arends c9df1d6942
Merge pull request #6355 from shantur/tuya-mcu
TuyaMCU: Cleanup unused tuya_disable_dimmer
2019-09-05 12:58:10 +02:00
Shantur Rathore e0f5ed38af TuyaMCU: Cleanup unused tuya_disable_dimmer 2019-09-05 11:32:39 +01:00
Theo Arends db44b058e2 Add command Reset 99 to reset bootcount to zero
Add command Reset 99 to reset bootcount to zero (#684, #6351)
2019-09-05 12:32:28 +02:00
Theo Arends d1ca5d1bde Fix exception on AddLogBuffer
Fix exception on AddLogBuffer (#6282)
2019-09-05 12:22:06 +02:00
gemu2015 1d92436877 sendmail core 2.3 fix 2019-09-05 11:14:33 +02:00
Theo Arends 282591a0b2 Bump version to 6.6.0.10
Redesign Tuya support by Shantur Rathore (#6353)
2019-09-05 10:41:08 +02:00
Theo Arends 2aedfc6a86
Merge pull request #6353 from shantur/tuya-mcu
Tuya mcu support
2019-09-05 10:03:02 +02:00
Theo Arends 0145c86fe0
Update settings.h 2019-09-05 10:02:42 +02:00
Shantur Rathore dad5b0ffc2 Tuya MCU: Implement support for Inverted Relays 2019-09-04 22:42:32 +01:00
gemu2015 ca52a38bc1 sendmail 2019-09-04 20:58:17 +02:00
Shantur Rathore c4c8fab42f Tuya MCU: Fix Switch ids are 1 incremented in MQTT 2019-09-04 17:29:46 +01:00
Shantur Rathore 982f0b9573 TuyaMCU: Rename Tuya Dimmer to Tuya MCU to make it more clear. 2019-09-04 17:29:45 +01:00
Shantur Rathore 1d7a058155 Tuya MCU: Add support for Switches1 to 4 FunctionIDs 1 to 4 2019-09-04 17:29:45 +01:00
Shantur Rathore efd1870d5e Tuya: Make Tuya Mcu implementation more configurable.
More and more Tuya MCU based devices are coming in the market and people requesting to support them. This patch makes Tuya module more configurable and easier to add new functionalities. Its not just a dimmer or a switch anymore.

After this Patch Tuya MCU module has a list of supported functions and the user would need to map the functionId to dpId of their device. Once mapped correctly the Tuya module will take care for handling proper function for dpId.

Currently functions supported are

1. Relays1 to 8 : FunctionID 11 to 18
2. Dimmer : FunctionID 21
3. Power ( Deca Watt )  : Function ID 31
4. Current ( milli Amps ) : Function ID 32
5. Voltage ( deca Volts ) : Function ID 33

The changes are

- Use a TuyaMCU command to map DPs to Functions instead of many different SetOptions. SetOption41, 44, 45, 46, 65 won't be needed after this patch.
- TuyaMCU command takes argument like `11,1` which means Map Function id 11 (Relay1) to DPID 1
- Migrates old settings flags and options to new TuyaMap command
2019-09-04 17:29:44 +01:00
Theo Arends af1edb0cdb Add command Time 1/2/3 to select JSON time format ISO + Epoch, ISO or Epoch
* Add time to more events (#6337)
 * Add command Time 1/2/3 to select JSON time format ISO + Epoch, ISO or Epoch
2019-09-04 18:06:34 +02:00
Theo Arends 138ed6def9 Refactoring
Refactoring
2019-09-04 12:58:37 +02:00
Theo Arends 1304252d08 Refactor sonoff.ino
Refactor sonoff.ino
2019-09-04 12:47:58 +02:00
Theo Arends f88e87cfde Refactor and document power control
Refactor and document power control
2019-09-04 12:20:04 +02:00
Theo Arends 636e842545 Restore initial energy total default behaviour regression from yesterday
Restore initial energy total default behaviour regression from yesterday
2019-09-04 10:10:25 +02:00
Theo Arends 34eed717fa Add command Power0 0/1/2/Off/On/Toggle to control all power outputs at once
Add command Power0 0/1/2/Off/On/Toggle to control all power outputs at once (#6340)
2019-09-03 23:04:49 +02:00
Theo Arends 41f76c5128 Add restore power state when limit is restored
Add restore power state when limit is restored (#6340)
2019-09-03 22:27:54 +02:00
Theo Arends 1478f1624a Add restore power state when limiit restored
Add restore power state when limiit restored (#6340)
2019-09-03 22:22:36 +02:00
Theo Arends 8e4dd169f3 Init Energy Total on energy monitoring devices with Energy Total Register
Init Energy Total on energy monitoring devices with Energy Total Register (#6282)
2019-09-03 21:56:17 +02:00
Theo Arends b3562e030e Init Energy Total on energy monitoring devices with Energy Total Register
Init Energy Total on energy monitoring devices with Energy Total Register (#6282)
2019-09-03 21:53:20 +02:00
Theo Arends 3ee83ae147 Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2019-09-03 21:15:40 +02:00
Theo Arends d44104135e Fix turning on/off all power when limit is reached
Fix turning on/off all power when limit is reached (#6340)
2019-09-03 21:15:36 +02:00
Theo Arends 3470e458cd
Merge pull request #6344 from gemu2015/sml-update
Sml update
2019-09-03 18:59:37 +02:00
gemu2015 d5005e29d9 sml update (add modus , optimizations) 2019-09-03 10:54:01 +02:00
gemu2015 d6560e89bd sml update modbus decoder 2019-09-03 10:39:51 +02:00
srodgers 407be4075f Add ina226 driver 2019-09-02 14:53:12 -07:00
Theo Arends 04debb5305 Fix USE_SDM120_2 issues
Fix USE_SDM120_2 issues (#6282)
2019-09-02 16:41:18 +02:00
Theo Arends cb1d99bd82
Merge pull request #6256 from eddyhub/development
Container to build all or custom builds with one run.
2019-09-01 17:58:41 +02:00
Theo Arends f4b5e565ef Add driver USE_SDM120_2 with Domoticz P1 Smart Meter functionality as future replacement for USE_SDM120 - Pls test and report
Add driver USE_SDM120_2 with Domoticz P1 Smart Meter functionality as future replacement for USE_SDM120 - Pls test and report (#6282)
2019-09-01 17:51:25 +02:00
Theo Arends 7edcb84eab
Merge pull request #6332 from s-hadinger/zigbee_phase_2
Add Zigbee support phase 2
2019-08-31 23:36:44 +02:00
Stephan Hadinger 42d3f1f677 Add Zigbee parameters 2019-08-31 21:52:51 +02:00
Stephan Hadinger 23c3419509 Add Zigbee support phase 2 - cc2530 initialization and basic ZCL decoding 2019-08-31 21:23:32 +02:00
Theo Arends ae4735af5c
Merge pull request #6330 from s-hadinger/user_config_override
Move '#include user_config_override.h' in 'my_user_config.h'.
2019-08-31 18:30:49 +02:00
Theo Arends 2111040f56
Merge pull request #6329 from s-hadinger/ir_full_fix
Fix wrong set of IR protocols with 'sonoff-ircustom'
2019-08-31 18:06:17 +02:00
Stephan Hadinger fce3de82c5 Move '#include user_config_override.h' in 'my_user_config.h'.
Allow user_config_override.h to change parameters like USE_MQTT_TLS.
2019-08-31 14:44:49 +02:00
Stephan Hadinger 0757648c84 Fix wrong set of IR protocols with 'sonoff-ircustom' 2019-08-31 14:36:11 +02:00
Theo Arends 12a5e500ee
Merge pull request #6328 from s-hadinger/ir_full_code_shrink
Disable USE_DISCOVERY and USE_EMULATION in sonoff-ir, reducing code size by 30k
2019-08-31 11:51:16 +02:00
Theo Arends 9785a7997c
Merge pull request #6327 from gemu2015/sml-update
fix counter irq mode
2019-08-31 11:49:41 +02:00
Stephan Hadinger 2796aa7bc6 Disable USE_DISCOVERY and USE_EMULATION in sonoff-ir, reducing code size by 30k 2019-08-31 11:49:22 +02:00
gemu2015 655c8288eb fix counter irq mode 2019-08-31 11:32:57 +02:00