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

133 Commits

Author SHA1 Message Date
Theo Arends e891830545 Prep ESP32 energy 2023-01-24 16:54:03 +01:00
Theo Arends 88dd5f7f50 Fix Shelly Pro 4PM auto reset 2023-01-22 16:41:25 +01:00
Theo Arends 8b96f68a5b Fix ESP8266 compilation 2023-01-21 15:42:31 +01:00
Theo Arends c85003c67d Prep Shelly Pro 4PM 2023-01-21 14:30:35 +01:00
Theo Arends f9177dfa3a Revert CSE7766 8N1 support - not needed 2023-01-10 09:48:49 +01:00
Theo Arends 8b70608e58 Add more ESP32 logging 2023-01-09 13:53:07 +01:00
Theo Arends a4fe1b88f9 Add HLW8032 8N1 2023-01-09 11:04:52 +01:00
Theo Arends ff8291f77d Add support for filesystem calib.dat 2023-01-04 15:00:43 +01:00
Theo Arends cd182a5814 Add TfsLoadString() 2023-01-04 12:00:09 +01:00
Theo Arends 481cc63bf4 Add script support to Energy Modbus 2023-01-03 17:50:39 +01:00
gemu 82ed5f0d06
Modbus section (#17583) 
* modbus section

* Update xnrg_29_modbus.ino

* Update xnrg_29_modbus.ino

* Update xnrg_29_modbus.ino
 2023-01-03 17:41:37 +01:00
Theo Arends 65476c3b32 Add energy modbus configs 2023-01-03 17:05:18 +01:00
Theo Arends 18c38ec05d Add support for filesystem file modbus.json 2023-01-03 15:10:05 +01:00
Theo Arends 555b434361 Fix Energy single column values 2023-01-02 17:48:51 +01:00
Theo Arends 10af47f8f4 Fix swapped voltage/power in energy dummy 2023-01-02 12:26:40 +01:00
Theo Arends cb6dd75d8b Fix Orno-we-517 serial config 
Fix Orno-we-517 serial config on esp32
 2023-01-02 09:50:21 +01:00
Theo Arends 587e8299d6 Add debugging info to modbus.ino 2022-12-30 16:56:36 +01:00
Theo Arends 31a53148c6 Add NRG modbus features 
- User JSON name needs to be different from embedded register names
- If no user GUI name is given it will only show in JSON
 2022-12-28 17:45:13 +01:00
Theo Arends 35b4bfcb3f Fix initial user added modbus field:value pair 2022-12-28 17:06:54 +01:00
Theo Arends c1ce983bef Reduce code size by removing duplicate code 2022-12-24 15:59:29 +01:00
Theo Arends 234d6e20e0 Extent Generic Energy Modbus Driver 
- Add support for up to 3 single phase modbus energy monitoring device using generic Energy Modbus driver
 2022-12-23 16:56:18 +01:00
Theo Arends 940d2397fa Fix addressed register 1 
- Add example for PZEM-0014
 2022-12-23 14:26:25 +01:00
Theo Arends 0dc3b8d7e1 Add fieldpair "F" replacing "M" 2022-12-23 11:39:13 +01:00
Theo Arends 23e0bc27e7 Update changelogs 2022-12-22 17:54:54 +01:00
Theo Arends ad97f7b95f Add NRG_MODBUS datatypes 
Add NRG_MODBUS datatypes (#17467)
 2022-12-21 18:11:35 +01:00
Theo Arends 25ab45288b
Merge pull request #17249 from kurkav/development 
Invalid processing of received value.
 2022-12-03 12:46:38 +01:00
Theo Arends bbde894628 Add serial Modbus transmit enable GPIOs 
Add serial Modbus transmit enable GPIOs to all modbus energy drivers and modbus bridge (#17247)
 2022-12-03 12:33:42 +01:00
kurkav 6da636d685 Invalid processing of received value. 
Int64 value was read from Float buffer.
Also units received were Wh, struct needs kWh.
 2022-12-03 11:54:30 +01:00
Charles 9b37690039 Fix BBR and EJP detection in historique 2022-11-22 23:29:52 +01:00
Charles 200221acc2 Added TEMPO and status register decoding for standard mode 2022-11-22 00:41:58 +01:00
Charles aa4ff5cede Added Tempo/BBR contract, fixed display BASE bug 2022-11-21 20:06:50 +01:00
Norbert Richter 0cd97d3890
Fix generic modbus single phase register output 2022-11-17 15:14:28 +01:00
Theo Arends 4e5193fdad Remove SkipSleep() in favour of FUNC_SLEEP_LOOP 2022-11-12 15:57:46 +01:00
Theo Arends c1ea8953cb Refactor uint8_t to uint32_t 2022-11-11 10:44:56 +01:00
Theo Arends 7167eb2f46 Changed ADE7953 monitoring 
Changed ADE7953 monitoring from instant power to accumulated energy (#16941)
 2022-10-30 12:20:56 +01:00
Theo Arends 41b65fd6b7 Add support for two phase power calibration 
Add support for two phase power calibration using commands ``PowerSet2``, ``VoltageSet2`` and ``CurrentSet2``
 2022-10-30 11:15:17 +01:00
Theo Arends 314dbf5e6b Add support for second energy channel calibration 2022-10-29 19:08:06 +02:00
Theo Arends 8863d758e6
Merge pull request #16928 from hallard/tic_standard 
Teleinfo standard mode bug fixes
 2022-10-29 14:19:21 +02:00
Theo Arends 90a9ebc3e1 Fix Shelly Pro ethernet stability 2022-10-27 17:52:44 +02:00
Charles 09b02b3325 standard mode bug fixes 
Increase serial buffer size for standard mode
trimmed values for standard mode
fix (hopefully) negative total kWh counter
save energy on reset
update energy total every hour
fixed contract label display for Standard mode
 2022-10-27 14:16:37 +02:00
Theo Arends c5f7195d77 Add support for Shelly Pro 1/1PM and 2/2PM (#16773) 2022-10-26 17:16:36 +02:00
Norbert 9192e529a6
Fix typo 2022-10-23 18:21:12 +02:00
Charles cd44b262b8 fix current tariff display in standard mode 2022-10-22 16:04:47 +02:00
Charles a982c560dc fix contract in standard mode 2022-10-22 15:51:12 +02:00
Theo Arends d307be0cf6 Refactor ADE7953 2022-10-13 15:48:23 +02:00
Theo Arends bf644d8052 Add Export Active report to Shelly EM (#16794) 2022-10-13 14:32:35 +02:00
Theo Arends cf5169b3ae Restore Shelly 2.5 low reactive power channels 2022-10-13 12:58:59 +02:00
Theo Arends 4471868580 Fix Shelly 2.5 low reactive power channels 2022-10-13 09:42:42 +02:00
Theo Arends 0768f5bc4f Clean up debugging 2022-10-12 17:18:27 +02:00
Theo Arends a856275c48 Fix ADE7953 VAr no load detection 2022-10-12 16:31:51 +02:00
Theo Arends 6202211c31 Fix Shelly EM polarity (#16486) 2022-10-12 15:46:33 +02:00
Theo Arends 5cfbbd4302 Add command ``Sunrise 0..3`` to select sunrise dawn angle 
- Bump version to v12.1.1.5
- Add command ``Sunrise 0..3`` to select sunrise dawn angle between Normal, Civil, Nautical or Astronomical (#16795)
 2022-10-12 11:02:54 +02:00
Theo Arends 2f1eea2eaf Add more docu to energy modbus driver 2022-10-11 18:39:48 +02:00
Theo Arends 186566226b Remove debug from energy modbus 2022-10-11 11:15:25 +02:00
Theo Arends 3c7a5ebfd3 Fix possible buffer overflows with exception 2022-10-11 11:10:47 +02:00
Theo Arends 3c258f4e31 Try to fix energy modbus warchdogs 2022-10-09 18:38:30 +02:00
Theo Arends 36ed0cba7d Add tasmota resolution option to energy modbus 2022-10-08 17:17:15 +02:00
Theo Arends 3427e1bee3 Support for Modbus Energy Monitoring devices 
Support for Modbus Energy Monitoring devices using a rule file. See ``xnrg_29_modbus.ino`` for more information
 2022-10-08 16:14:11 +02:00
Theo Arends 625824caec Generic Energy Modbus rename config JSON 2022-10-07 10:46:25 +02:00
Theo Arends 77cfe80064 Add common voltage to generic energy modbus driver 2022-10-06 23:26:54 +02:00
Theo Arends a1420e06fd Initial generic modbus energy driver 2022-10-06 23:17:04 +02:00
Theo Arends 645b9d13d6 Add shelly EM default phase calibration 
Add shelly EM default phase calibration (#16486)
 2022-10-05 15:17:54 +02:00
Theo Arends 7152d012d9 Fix Shelly Plus 2PM negative values 2022-10-04 09:37:29 +02:00
Theo Arends 8eb7b007d5 Support for Shelly Plus 2PM 
- Version bump to v12.1.1.4
- Support for Shelly Plus 2PM using template ``{"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,9472,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}``
 2022-10-03 18:02:50 +02:00
Theo Arends a05f731a42 Fix Shelly Plus 2PM column swap 
- Fix Shelly Plus 2PM column swap
- Prep Shelly Plus 2PM ADE7953 reset pin
 2022-10-03 17:13:01 +02:00
Theo Arends 16c6a471cc Fix ADE7953 calibration (#16486) 2022-10-01 22:25:24 +02:00
Theo Arends 0ec8b47741 Add ADE7953 register decode 2022-09-30 18:01:34 +02:00
Theo Arends 38d2c444e8 Add optional ADE7953 reg dump 
Add optional ADE7953 reg dump (#16486)
 2022-09-30 12:39:03 +02:00
Theo Arends 28a1859b01 Fix Shelly EM A/B channel display 
Fix Shelly EM A/B channel display (#16486)
 2022-09-24 19:02:24 +02:00
Theo Arends ebff389cc0 Fix ADE7953 negative phase angles 
Fix ADE7953 negative phase angles (#16486)
 2022-09-24 18:49:41 +02:00
Theo Arends 903d3174b2 Fix ADE7953 apparent and reactive power calibration 2022-09-15 11:22:09 +02:00
Theo Arends c7a864231a Refactor ADE7953 2022-09-13 17:58:22 +02:00
Theo Arends 8b5a34b014 Add support of optional file calib.dat 
Add support of optional file calib.dat on ADE7953 based energy monitors like Shelly EM (#16486)
 2022-09-13 15:35:09 +02:00
Theo Arends 28c343f3c8 Add HLW debug info 2022-09-11 14:58:25 +02:00
Theo Arends 9a66687085 Add error message when invalid JSON is provided 
Add error message when invalid JSON is provided (#13515)
 2022-08-20 11:05:29 +02:00
Theo Arends 02d7eb1d7d Fix energy values after power cycle 
Fix energy values after power cycle (#16118)
 2022-08-05 15:25:39 +02:00
Theo Arends d7a210bf81 Increase dummy energy monitor max values 
Increase dummy energy monitor max values (#16059)
 2022-07-24 15:30:19 +02:00
Marius Bezuidenhout 3e8428e857 iem3xxx series energy sensor fixes 2022-07-13 11:23:03 +02:00
Theo Arends e6b4a77abd Add ESP32 Sonoff sensor support 
- Bump version to v12.0.2.3
- Add ESP32 SI7021, THS01 and MS01 support
- Fix THRxxD template
 2022-07-06 16:58:27 +02:00
Theo Arends 84ec331b62 Correct naming 2022-06-10 10:20:31 +02:00
Theo Arends d43127ce58 Add Shelly 3EM heartbeat 
Add Shelly 3EM heartbeat to reinit if interrupts stopped (#13515)
 2022-06-09 14:45:39 +02:00
Theo Arends 9afb2c9cb8 Move interface files down allowing for folder insertions 2022-06-02 14:50:31 +02:00
Theo Arends c08561f67c Bump version to v11.1.0.4 
- Restructure tasmota
 2022-06-02 14:17:39 +02:00