Commit Graph

233 Commits

Author SHA1 Message Date
Gunnar Skjold
e6df68481f Merge branch 'master' into dev-v2.2 2022-10-13 20:47:48 +02:00
Gunnar Skjold
6d81b0a856 Fixed all build warnings 2022-10-13 20:24:56 +02:00
Gunnar Skjold
1b6ce203b7 Better debug output whem receiving unknown data 2022-10-13 17:40:44 +02:00
Gunnar Skjold
2850be4e48 Merge pull request #322 from tbarnekov/extend_power_info
Populate Active Import and Export per phase and export to HA
2022-10-12 20:34:09 +02:00
Gunnar Skjold
7eca31de84 Fixed build errors 2022-10-12 20:01:55 +02:00
Gunnar Skjold
ce3a47a7e6 Fixed error blinks and improved WiFi reconnect 2022-10-12 19:25:48 +02:00
Thomas Barnekov
adb5050621 Merge branch 'gskjold:master' into extend_power_info 2022-10-06 17:31:43 +02:00
Gunnar Skjold
026cd25c8c Setting modem sleep to max 2022-10-06 17:30:37 +02:00
Thomas Barnekov
ad78ff3082 Fix implicit cast and non-const char pointer warnings 2022-10-05 22:42:43 +02:00
Gunnar Skjold
fe7be81f1e Rudimentary detection for L&G data. Probably change this in the future 2022-10-01 12:11:46 +02:00
Gunnar Skjold
7674fc2ad0 Merge branch 'lng-parser' 2022-10-01 11:56:08 +02:00
Gunnar Skjold
e7c25fafda Prices and realtime HA sensors 2022-09-28 20:13:03 +02:00
Gunnar Skjold
2a4772fe25 Fixed memory leak when reconnecting to MQTT/SSL 2022-09-27 19:59:37 +02:00
Gunnar Skjold
feb8e5007b Fixed MQTT buffer size 2022-09-25 10:50:34 +02:00
Gunnar Skjold
584c7b1154 More restructuring 2022-09-03 14:03:15 +02:00
Gunnar Skjold
488c969858 Some serious restructuring to be able to swap between implementations 2022-09-03 13:12:29 +02:00
Gunnar Skjold
ef8715be6d Merge branch 'master' into lng-parser 2022-08-31 08:04:24 +02:00
Gunnar Skjold
f18171fecc Fixed MQTT byte mode 2022-08-23 20:39:47 +02:00
Gunnar Skjold
01547f9a52 Adjustments to make L&G parser work 2022-08-19 13:26:29 +02:00
Gunnar Skjold
940d38af5c Merge branch 'master' into lng-parser 2022-08-17 17:33:24 +02:00
Gunnar Skjold
4e451c51e1 HW serial fix for S2 2022-08-17 17:33:06 +02:00
Gunnar Skjold
a055465ce0 Untestet L&G data parser 2022-08-16 08:22:43 +02:00
Gunnar Skjold
998b986604 Adjusted modem sleep to a safer value 2022-08-12 20:48:34 +02:00
Gunnar Skjold
508c14a671 Fixed modem sleep on S2 and fixed default wifi power 2022-08-12 09:02:04 +02:00
Gunnar Skjold
e3a1a242d2 Fixed debugging 2022-07-29 22:24:06 +02:00
Gunnar Skjold
ddfade65d8 Merge branch 'master' into new-parser 2022-07-29 21:21:40 +02:00
Gunnar Skjold
f43fe5f864 Fixed cost overflow 2022-07-28 13:40:23 +02:00
Gunnar Skjold
0e75732022 Merge branch 'master' into new-parser 2022-07-19 07:20:43 +02:00
Gunnar Skjold
7f3e0e6089 Limit threshold average to use a single peak per day 2022-07-19 06:43:06 +02:00
Gunnar Skjold
a90ed40aee Fixed config file loading of energyaccounting 2022-07-05 21:48:56 +02:00
Gunnar Skjold
32ba6c31f0 Max hour average from more than one hour. Plus a fix for real time cost calculation 2022-07-05 20:34:48 +02:00
Gunnar Skjold
caf00f99e3 Merge branch 'master' into new-parser 2022-06-28 18:16:06 +02:00
Gunnar Skjold
648cac0b06 Some adjustmenst 2022-06-23 20:22:15 +02:00
Gunnar Skjold
b805363c60 MQTT/SSL config re-enabled for ESP8266 in case it actually is in use 2022-06-23 08:13:13 +02:00
Gunnar Skjold
fca46a3f54 Restructured AMS data parsing 2022-06-12 09:46:20 +02:00
Gunnar Skjold
2617956b38 Disabled MQTT SSL for ESP8266 2022-06-04 09:55:25 +02:00
Gunnar Skjold
ba7915ca7c Added UART1 HW serial for ESP32-S2 2022-05-25 09:27:31 +02:00
Gunnar Skjold
fab637cf60 Fixed GBT multiframe 2022-05-13 09:16:40 +02:00
Gunnar Skjold
b2e144efcf Fixed error 2022-05-13 09:03:38 +02:00
Gunnar Skjold
10308ce738 Added support for GBT transfer 2022-05-07 10:01:30 +02:00
Gunnar Skjold
70f5b0f912 Change default MQTT buffer 2022-04-23 08:48:34 +02:00
Gunnar Skjold
1ab529785a Fixed loop error 2022-04-14 10:50:00 +02:00
Gunnar Skjold
3a81e62bbe Support for encrypted DSMR 2022-04-14 10:38:04 +02:00
Gunnar Skjold
35b884713c Merge branch 'agpl' 2022-03-30 17:09:54 +02:00
Gunnar Skjold
a07c55889f Build fix 2022-03-20 20:11:29 +01:00
Gunnar Skjold
a675f56f9c Restart after uploading config file, then restore, then reboot again 2022-03-20 20:02:51 +01:00
Gunnar Skjold
0590ec375d Delete firmware file if exists after factory reset 2022-03-18 19:35:58 +01:00
Gunnar Skjold
40016f314e Multipliers for HAN data 2022-03-18 19:16:03 +01:00
Gunnar Skjold
a92524eaf8 Some adjustments for real time calculation 2022-03-17 18:47:57 +01:00
Gunnar Skjold
a60dd8a60a Added separate buffer for HAN data 2022-03-17 18:14:31 +01:00