patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,319 Commits 2 Branches 144 Tags 78 MiB
2d7115e1e8
Commit Graph

101 Commits

Author SHA1 Message Date
helgeerbe
71128e5a55 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-11 09:37:56 +02:00
qubeck
00def1d8d1
Generic SML based power meters support (#146) 
* add support for energy & power readings on SML based power meters, taking OBIS 16.7.1 for power (using mod. SML Parser lib. by olliiiver)

* switched SML read to use software serial

* made total power meter response controled by meter source to obtain either the sum of phase powers or explicit total power provided by meter

* made mqtt subscriptions to power meter topics meter source dependend

* simplified SML read loop and OBIS handler registration, + minor refactoring

* minor cleanup/style changes and optim. PowerMeter

* fixed build, add SOURCE_SML == 4

* removed optional usage of HW serial for SML power meter

* switched to usage of _powerMeter1Power for SML power reading to allign better with existing code

---------

Co-authored-by: helgeerbe <helge@erbehome.de>
 2023-04-07 20:20:00 +02:00
Thomas Basler
8673336151 Upgrade U8g2 from 2.34.16 to 2.34.17 2023-04-06 22:40:01 +02:00
Thomas Basler
ee5fe9441e Upgrade ArduinoJson from 6.21.0 to 6.21.1 2023-04-06 22:38:42 +02:00
helgeerbe
ef51d75f2c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-06 10:46:02 +02:00
tbnobody
d6ff90260e Undo latest change 2023-04-06 10:37:05 +02:00
tbnobody
7f17176462 Test multpile commits 2023-04-06 10:37:05 +02:00
Thomas Basler
778dc93dee Merge remote-tracking branch 'github/master' 2023-04-05 20:40:23 +02:00
Thomas Basler
c2cacb8d7b Fix: Replace spaces by underscores in platformio environment d1_mini_esp32 (#765) 2023-04-05 19:41:35 +02:00
tbnobody
44ca697c0e
Undo latest change 2023-04-05 11:53:53 +02:00
tbnobody
395a822f60
Test multpile commits 2023-04-05 11:53:08 +02:00
Thomas Basler
e0150a8962 Increase platform package version from 6.0.1 to 6.1.0 2023-04-05 11:52:34 +02:00
Bernhard Kaszt
e35254c8f2
New Power meter support: HTTP(S) + JSON (Shelly 3EM, Tasmota, Volkszähler etc.) (#153) 
* Implement HTTP(s) + JSON type Power Meter support

---------

Co-authored-by: Bernhard Kaszt <berni@bcserv.eu>
 2023-04-03 21:36:20 +02:00
Bernhard Kaszt
c7ef661db7 platformio.ini: Fix indentation 2023-04-02 10:14:34 +02:00
Thomas Basler
4244233dd3 Increase platform package version from 6.0.1 to 6.1.0 2023-04-01 12:49:16 +02:00
MalteSchm
5f42f66c02 fix indent error 2023-03-29 19:05:31 +02:00
helgeerbe
b3c17c8ee8 Merge branch 'pr/MalteSchm/144' into development 2023-03-27 22:16:53 +02:00
helgeerbe
e0a80734f3 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-27 21:10:03 +02:00
Thomas Basler
9523b99b22 Upgrade espMqttClient from 1.4.1 to 1.4.2 2023-03-27 16:58:35 +02:00
MalteSchm
a4767827b4 merging master 2023-03-26 11:25:08 +02:00
MalteSchm
0be574809b adding power pin 2023-03-26 11:09:08 +02:00
MalteSchm
db7ad52a4d platformio ini file changes 2023-03-24 10:05:46 +01:00
helgeerbe
3f8226c36c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-23 19:14:14 +01:00
Thomas Basler
a17362a9c5 Upgrade olikraus/U8g2 from 2.34.13 to 2.34.16 2023-03-20 18:14:38 +01:00
Thomas Basler
e95af04da4 Compile with newer c++ standard 2023-03-20 18:06:49 +01:00
helgeerbe
06370baa0e Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-18 22:42:05 +01:00
Thomas Basler
a542ea7fbb Upgrade ArduinoJson from 6.20.1 to 6.21.0 2023-03-17 18:23:56 +01:00
Thomas Basler
01a8c6d873 Upgrade espMqttClient from v1.3.3 to v1.4.1 2023-03-17 18:21:28 +01:00
MalteSchm
63c956af15 swap can library to better support newer ESPs 2023-03-12 17:27:41 +01:00
helgeerbe
1e6e40a3ab add Pylontech pins to d1 mini config 2023-03-07 21:27:51 +01:00
helgeerbe
6a89ae986e Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-07 21:17:48 +01:00
Luca Kröger
ff0c69c908 added lolin s2 mini reference layout 2023-03-07 15:39:50 +01:00
Bernhard Kaszt
44a770be0e Add Pylontech PIN numbers to platformio.ini 2023-03-05 21:22:10 +01:00
helgeerbe
73fe3bfb96 Add missing can lib 2023-02-23 12:05:50 +01:00
helgeerbe
a2473645a5 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-02-23 12:01:34 +01:00
Thomas Basler
dc309e9616 Update sunset from 1.1.3 to 1.1.7 2023-02-20 20:01:56 +01:00
helgeerbe
f560f25302 initial merge of power_limiter * missing is inverter and channel setting in gui 
* due to bug _webApiPrometheus.init is commented out
 2023-02-20 15:56:02 +01:00
helgeerbe
cb7874ac8d remove serial ports from platformio 
* use auto detect
 2023-02-20 09:43:31 +01:00
Thomas Basler
b319c78dc1 Added methods to calculate and show sunrise and sunset times 2023-02-18 18:15:48 +01:00
helgeerbe
27f20a76f0 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-02-16 12:35:18 +01:00
Thomas Basler
f5fb628559 Update espressif32 from 6.0.0 to 6.0.1 2023-02-14 19:13:24 +01:00
Thomas Basler
04c7d40cde Update ArduinoJson from ^6.20.0 to 6.20.1 2023-02-13 20:35:38 +01:00
helgeerbe
1c01e927f9 Add victron pins to device manager 2023-02-02 23:01:22 +01:00
helgeerbe
bec6c20531 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-26 10:30:55 +01:00
helgeerbe
9a7a0d293e Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-20 14:54:04 +01:00
dAjaY85
7074dd5757 Display init zum Zweiten 
chango to full Buffer Mode, remove picture loop,
because it's not worked.
look: https://github.com/olikraus/u8glib/wiki/tpictureloop

snprintf + public vars
- dispPowerSafe => true: PowerSafe Mode on
- dispLogo => true: showing Logo upper right corner
- dispContrast => possible to adjust the Display Contrast

change in date time, buffer deleted

Display-Constructor changed, reset goes to front

Arrow and Logo only shown, when production is on

Refactor OLEDDisplayClass to DisplayGraphicClass
 2023-01-18 23:22:36 +01:00
Thomas Basler
753d73accd Fix compile issue with ESP32-C3 and C++11 2023-01-18 23:13:38 +01:00
Thomas Basler
07a438db33 Upgrade ArduinoJson from 6.19.4 to 6.20.0 2023-01-17 18:55:14 +01:00
Thomas Basler
17ffda9816 Upgrade espressif framework from 5.3.0 to 6.0.0 2023-01-17 18:51:48 +01:00
helgeerbe
ddb6346087 Merge remote-tracking branch 'tbnobody/OpenDTU/master' 2023-01-03 10:51:56 +01:00