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

62 Commits

Author SHA1 Message Date
pkkrusty 229b772d99
Changed log level of NRG: EnergyTotal to Level 4 vs Level 3 
With console log set to level 3, this function prints out the EnergyTotal every second, which makes the console pretty useless for any other debugging work. Makes more sense to me to have it output all that on Level 4.  Still accessible if people want it, but less obtrusive for normal debugging work.
 2021-11-30 14:05:40 -08:00
Adrian Scillato c48ff05463
Fix JSON format for EnergyToday Command Response 2021-11-06 21:20:48 -03:00
Norbert 5fc7c6f796
Change comment for field voltage and frequency 2021-10-29 08:51:21 +02:00
Theo Arends eb901cfe3c Fix valid negative energy totals (#13363) 
Fix valid negative energy totals (#13363)
 2021-10-14 16:21:35 +02:00
Theo Arends c4bb190e82 Add split total energy 2021-10-02 18:29:05 +02:00
Theo Arends 9002830d7c Fixes 2021-10-02 18:19:39 +02:00
Theo Arends b47e91c8ab Add energy total spilt 2021-09-29 15:33:58 +02:00
Theo Arends 9b35c54ed1 Revert "Add support for split energy totals" 
This reverts commit d3fc03d398.
 2021-09-29 14:53:23 +02:00
Theo Arends d3fc03d398 Add support for split energy totals 
Add command ``SetOption129 1`` to enable split total energy results (#13030)
 2021-09-29 12:08:03 +02:00
Theo Arends 5e805e0c4a Move Settings from DRAM to heap 2021-06-11 18:14:12 +02:00
Barbudor fa0565b40f improve reactive_power calculation range 2021-05-16 18:09:53 +02:00
Adrian Scillato cbea6f21ef
KNX: Fix Energy Yesterday 2021-04-13 17:01:27 -03:00
Theo Arends 0650744ac2 Remove overtemp detection on external energy monitoring devices 
Removed overtemp detection on external energy monitoring devices (#11628)
 2021-04-09 10:04:37 +02:00
Theo Arends 740e4392ef Add command EnergyConfig for future use 2021-04-09 09:49:33 +02:00
Barbudor e9e0d35368 command EnergyConfig 2021-04-08 22:59:44 +02:00
Theo Arends 2f5c20a42f Add more rule triggers 2021-04-07 15:07:05 +02:00
Theo Arends 36288037a8 Refactor energy init 2021-04-06 15:23:07 +02:00
Theo Arends 6c66b2d11f Add frequency to CSE7761 driver 2021-03-21 17:51:57 +01:00
Theo Arends 1fd8c80039 Add CRC redundancy to CSE7761 2021-03-06 15:04:16 +01:00
Theo Arends 690df69c91 Fix possible CSE7761 related exceptions 2021-03-05 18:28:07 +01:00
Theo Arends bef5d2b84b Fix CSE7761 calibration 2021-03-05 11:32:13 +01:00
Theo Arends 68baafc685 Initial support for autoexec.bat using filesystem 2021-02-15 16:37:09 +01:00
Norbert Richter 435be84ff3
Add SDM72 Modbus energy meter 2021-02-09 16:13:40 +01:00
Adrian Scillato 540b3c307b
In case of lost comms with PZEM, avoid losing Today Energy 2021-01-29 21:48:47 -03:00
Theo Arends 5b375acdd2 refactor dtostrfd 2021-01-27 17:42:59 +01:00
Theo Arends efaed8046d Refactor AddLog usage 2021-01-23 16:26:23 +01:00
Theo Arends 89a9c049d6 Add debug message regarding energy reset 2021-01-15 14:31:25 +01:00
Norbert Richter b941d6208e
Add EnergyReset optional time param 2021-01-06 13:16:55 +01:00
Theo Arends dcbb3f1e0e Happy New Year 2021-01-01 13:44:04 +01:00
Theo Arends fa7fdbd51a Consolidate `AddLog_P` 
Consolidate `AddLog_P` into `AddLog_P2` and rename to `AddLog_P`
 2020-11-06 17:09:13 +01:00
Theo Arends 58dc18844b Refactor energy func every 250mS 2020-10-30 12:45:34 +01:00
Theo Arends af5082320d Use global struct 2020-10-30 12:29:48 +01:00
Theo Arends 280f0a9de7 Use global struct 2020-10-29 13:37:09 +01:00
Theo Arends f1ac7b2d67 Use global struct 2020-10-28 19:03:39 +01:00
Theo Arends b93b719108 Use global struct 2020-10-28 17:32:07 +01:00
gominoa d21599b75c
Fix ENERGY.Period after midnight 
ENERGY.Period incorrectly shows 0 for the first teleperiod after midnight
 2020-10-13 18:30:01 -04:00
Theo Arends ad3cfa6cbb Add SDM630 three phase ImportActive Energy display 
Add SDM630 three phase ImportActive Energy display when ``#define SDM630_IMPORT`` is enabled by Janusz Kostorz (#9124)
 2020-10-03 12:46:58 +02:00
Theo Arends d0028eb2e4
Merge pull request #9124 from jkostorz/development 
Add option in my_user_config.h to turn on SDM630 import active energy
 2020-10-03 12:33:15 +02:00
Theo Arends 0f1e4fc917 Add command ``PowerDelta1`` to ``PowerDelta3`` 
- Bump version to 8.4.0.3
- Add command ``PowerDelta1`` to ``PowerDelta3`` to trigger on up to three phases (#9134)
 2020-08-23 18:29:16 +02:00
Janusz b3dc33f3a0 SDM630 optional import active energy 2020-08-18 22:09:33 +02:00
Theo Arends a84ebe552a Refactor rules processing 2020-07-20 17:24:51 +02:00
Theo Arends 59f50d04f2 Allow rules on energy margins 
Allow rules on energy margins (#8935)
 2020-07-20 16:41:05 +02:00
Theo Arends 0a64625e9a Allow rules on energy margins 
Allow rules on energy margins (#8935)
 2020-07-20 16:26:32 +02:00
Theo Arends 7dafeb280e Rename global temp and pressure 
- Rename global temp and pressure (#8808, #8810)
- Fix SGP30 calculation (#8808)
 2020-06-28 12:23:18 +02:00
Theo Arends f46d3751a0 Refactor some energy monitoring 2020-06-13 15:10:12 +02:00
Theo Arends 0abfcf1954 Fix global temperature 
- Fix global temperature use of float solving intermittend power off (#8175)
- Fix BL0940 power monitoring when powered on but no load present
 2020-06-12 16:51:21 +02:00
Theo Arends d0de78352f Fix Energy Frequency display 2020-05-23 12:15:14 +02:00
Theo Arends 93ca102391 Change ExportActiveTariff to ExportTariff 2020-05-22 18:31:14 +02:00
Theo Arends 855e054db8 Change Energy JSON data 
- Bump version 8.3.1.2
- Change Energy JSON Total field from ``"Total":[33.736,11.717,16.978]`` to ``"Total":33.736,"TotalTariff":[11.717,16.978]``
- Change Energy JSON ExportActive field from ``"ExportActive":[33.736,11.717,16.978]`` to ``"ExportActive":33.736,"ExportActiveTariff":[11.717,16.978]``
- Add Three Phase Export Active Energy to SDM630 driver
 2020-05-22 17:48:21 +02:00
Theo Arends bdc0934cb8 Fix init of Energy Offset after power cycle 
Fix init of Energy Offset after power cycle (#8356)
 2020-05-10 12:59:13 +02:00