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

115 Commits

Author SHA1 Message Date
Theo Arends ee8bb3452b (Try to) fix EnergyReset 
(Try to) fix EnergyReset (#6561)
 2019-10-16 11:09:48 +02:00
Theo Arends dea8f03459 Add command SetOption72 
Add command SetOption72 0/1 to switch between software (0) or hardware (1) energy total counter (#6561)
 2019-10-06 11:43:01 +02:00
Theo Arends ec9fa4f430
Merge pull request #6564 from pablozg/fixenergyreset 
Fix energyReset command issue #6561
 2019-10-06 11:32:40 +02:00
Theo Arends 853e090474 Fix Energy CurrentLow/High JSON message 
Fix Energy CurrentLow/High JSON message (#6573)
 2019-10-06 11:28:57 +02:00
pablozg 0674971f2e Fix energyReset command issue #6561 2019-10-04 19:19:48 +02:00
Theo Arends ea72671018 Fix Energy Off-Peak detection calculation 
Fix Energy Off-Peak detection calculation (#6500)
 2019-09-29 12:18:09 +02:00
Theo Arends 5bd19d54db Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00 
Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)
 2019-09-25 14:24:49 +02:00
Theo Arends 075485e124 Fix energy usage/export resolution 
Fix energy usage/export resolution (#6444)
 2019-09-22 18:30:55 +02:00
Theo Arends 15024fa348 Add Tariff export values to JSON message 
Add Tariff export values to JSON message (#6429)
 2019-09-22 14:00:34 +02:00
Theo Arends 763601ccb4 Fix JSON total usage resolution display 
Fix JSON total usage resolution display (#6429)
 2019-09-22 11:54:02 +02:00
Theo Arends 37d9cb4c92 Fix PZEM missing phase zeroing all readings 
Fix PZEM missing phase zeroing all readings (#2315)
 2019-09-21 17:10:52 +02:00
pablozg 2798561bda NRG: Show usage/export stored values when EnergyReset command is sent 2019-09-21 11:31:41 +02:00
pablozg 4f17c93a83 Fix max value in EnergyReset command 2019-09-20 22:46:34 +02:00
pablozg d7d91583fd Energy: Fix no usage/return updated and no usage/return value stored after reboot 2019-09-20 22:35:56 +02:00
pablozg 60f55b8ea4 Energy: EnergyReset now can set the usage1, usage2, return1 and return2 totals used in Domoticz P1 smart meter sensor 2019-09-20 16:05:48 +02:00
pablozg acf85db0da Check if RTC time is valid before energy sum 2019-09-20 14:37:55 +02:00
pablozg 254f3f3f6c Change Domoticz P1 smart meter sensor total usage logic, issue #6444 2019-09-20 12:59:34 +02:00
pablozg 40657bd256 Autoupdate Energy.total with the value reported by hardware (sdm120, etc) 2019-09-18 11:42:28 +02:00
Theo Arends 7b70c042bd Add command ModuleAddress 1/2/3 
Add command ModuleAddress 1/2/3 to set Pzem module address when a single module is connected (#2315)
 2019-09-16 16:56:16 +02:00
Theo Arends a964bd0a9c Add Energy Tariff info to JSON message 
Add Energy Tariff info to JSON TOTAL energy message (#6429)
 2019-09-15 18:05:23 +02:00
Theo Arends 5eb85075e5 Add Energy 3 phase/channel support 
* Change energy sensors for three phase/channel support
 * Add Shelly 2.5 energy dual channel support (#6160)
 2019-09-15 13:10:32 +02:00
Theo Arends a4e1c10953 Change commands Tariff 
Change commands Tariff1 22,23 = Tariff1 (Off-Peak) ST,DST   Tariff2 (Standard) 6,7 = Tariff2 ST,DST   Tariff9 0/1 = Weekend toggle (1 = Off-Peak during weekend)
 2019-09-10 18:04:56 +02:00
Theo Arends 4b647928aa Bump version to 6.6.0.12 
* Redesign command Tariff to now default to 0 (=disabled) and allowing to set both Standard Time (ST) and Daylight Savings Time (DST) start hour (#6282)
 *  Commands Tariff1 23 = Tariff1 ST, Tariff2 7 = Tariff2 ST, Tarriff3 22 = Tarrif1 DST, Tariff4 6 = Tariff2 DST, Tariff9 0/1 = Weekend toggle
 2019-09-10 16:18:23 +02:00
Theo Arends 0e3a88bbe2 Add Energy Export if available 
Add Energy Export if available (#6282)
 2019-09-10 12:31:08 +02:00
Theo Arends 75abfc5fd9 Refactor energy driver detection 
Refactor energy driver detection and function call
 2019-09-08 16:57:56 +02:00
Theo Arends 17a0049fa2 Use SDM120 Import Active as Total 
Use SDM120 Import Active as Total Energy when available (#6282)
 2019-09-08 15:07:28 +02:00
Theo Arends fc2be92478 Move SDM120 modbus updates out of ticker interrupt 
Move SDM120 modbus updates out of ticker interrupt (#6282)
 2019-09-07 16:31:39 +02:00
Theo Arends 53235a3382 Redesign Energy Total calculation 
* Redesign Energy Total calculation
* Increase SDM120 modbus interval time to 200mS (#6282)
 2019-09-06 18:02:31 +02:00
Theo Arends a1e9c2d2ac Fix SDM120 modbus dump and Domoticz Energy Consumed or Produced 
Fix SDM120 modbus dump exception and Domoticz Energy Consumed or Produced (#6282)
 2019-09-05 18:02:36 +02: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 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 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 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 04debb5305 Fix USE_SDM120_2 issues 
Fix USE_SDM120_2 issues (#6282)
 2019-09-02 16:41:18 +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 b52da68a68 Fix energy smart calculation at day roll-over 
Fix energy smart calculation at day roll-over
 2019-08-28 10:52:24 +02:00
Theo Arends f31b903fab Bump version to 6.6.0.8 
* Add Tuya Energy monitoring by Shantur Rathore
 * Add phase 1 Domoticz P1 Smart Meter support using energy sensors handled by xdrv_03_energy.ino based on an idea by pablozg
 *   Add commands Tariff1 0..23 (start Off-Peak hour), Tariff2 0..23 (start Standard hour) and Tariff3 0/1 (Saturday and Sunday Off-Peak)
 2019-08-27 17:01:12 +02:00
Theo Arends 0e4d4a889a Refactor Energy code saving space 
Refactor Energy code saving space
 2019-08-16 14:41:02 +02:00
Theo Arends 2d0143623d Refactor commands by processing optional prefix 
Refactor commands by processing optional prefix
 2019-08-11 18:12:18 +02:00
Theo Arends 27efc08d2c Add define DEBUG_TASMOTA_CORE 
Add define DEBUG_TASMOTA_CORE
 2019-08-08 16:24:11 +02:00
Theo Arends 714f938c05 Refactor energy commands 
* Refactor energy commands
 * Add define USE_ENERGY_MARGIN_DETECTION to disable Energy Margin and Power Limit detection
 * Add define USE_ENERGY_POWER_LIMIT to disable Energy Power Limit detection while Energy Margin detection is active
 2019-08-01 15:46:12 +02:00
Theo Arends 64521b42b6 Add Epoch and UptimeSec to JSON messages 
Add Epoch and UptimeSec to JSON messages (#6068)
 2019-07-11 14:09:42 +02:00
Theo Arends 0243e2be7e Add command SetOption42 0..255 to set over temperature in Celsius. Defaults to 90 
Add command SetOption42 0..255 to set over temperature in Celsius. Defaults to 90 (#6036)
 2019-07-08 14:16:33 +02:00
Theo Arends 4e95417db4 Add reset of Energy values when connection to sensor is lost for over 4 seconds 
Add reset of Energy values when connection to sensor is lost for over 4 seconds (#5874, #5881)
 2019-05-30 12:45:02 +02:00
Theo Arends 4d070bfb15 Change default PowerDelta from 80% to 0% on new installations 
Change default PowerDelta from 80% to 0% on new installations (#5858, #5028, #4813, #4130, #4145, #3795, #3778, #3660, #3648)
 2019-05-24 15:04:48 +02:00
Theo Arends a623d1e90b Add temp test 
Add temp test
 2019-05-22 12:31:23 +02:00