Commit Graph

454 Commits

Author SHA1 Message Date
helgeerbe
1dc73f91ee Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-13 10:18:49 +02:00
Thomas Basler
ed0a3e5427 webapp: Update dependencies 2023-04-12 20:10:07 +02:00
Thomas Basler
0f1b3f1560 webapp: Implement combo boxes again as objects
1. Key  is a magic number which is used in the c++ backend
2. Based on the object model some further extension will be done soon
2023-04-12 19:58:34 +02:00
Thomas Basler
ebaccc9b3f Merge branch 'pr801' into dev 2023-04-12 19:35:58 +02:00
Thomas Basler
9d45c5d68a Merge branch 'pr799' into dev 2023-04-12 19:32:07 +02:00
MalteSchm
43f7553cdd removing commented lines 2023-04-12 15:56:33 +02:00
MalteSchm
72289cda1a fixed linting issues, pushing to github for test run 2023-04-12 13:21:32 +02:00
Martin Dummer
971ae6d1be
Feature: MQTT add TLS authentication
User asked for TLS client certificate based login from DTU to MQTT
server. This PR implements storage and use of x509 client certificate
and private key.

Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
2023-04-12 08:33:10 +02:00
Thomas Basler
4b9d21ac5a webapp: Update dependencies 2023-04-11 23:29:21 +02:00
fischaxe
d2d0790d90 fix: broken hardware profile handling on lang switch 2023-04-11 10:44:25 +02:00
fischaxe
9e2d7b479b fix: display rotation didn't adapt language changes 2023-04-11 09:47:27 +02:00
fischaxe
a01b9fc141 fix: pa level didn't listen to language switching 2023-04-11 09:47:24 +02:00
helgeerbe
71128e5a55 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-11 09:37:56 +02:00
fischaxe
994a543b87 webapp: added css table-responsive for lower resolutions 2023-04-10 10:45:24 +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
477eb6cfd6 Feature: Link to release page instead to commits page in Firmware Info
The Firmware Version link now referes to the release page if the given hash is a tag. It referes to the commits page if it's really a hash. (Implements #778)
2023-04-06 22:36:33 +02:00
helgeerbe
4eec055f84 fix lint errors 2023-04-06 12:08:10 +02:00
helgeerbe
ef51d75f2c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-06 10:46:02 +02:00
berni2288
09fb0618b4
Merge branch 'MalteSchm-webinterface_summary_updates' into development 2023-04-05 22:27:17 +02:00
Thomas Basler
e961872f14 Fix: Handle format "v0.1-5-gabcdefh" of git hash 2023-04-05 19:34:47 +02:00
Thomas Basler
dab5b4d723 webapp: Show inverter status in grey if polling is disabled (e.g. at night) 2023-04-05 11:52:35 +02:00
Thomas Basler
9eb15274a2 webapp: Update dependencies 2023-04-05 11:52:34 +02:00
Thomas Basler
f37b23b706 webapp: Update dependencies 2023-04-05 11:51:09 +02:00
Thomas Basler
53b965651d webapp: Implemented reload button for info views 2023-04-05 11:51:09 +02:00
Thomas Basler
d8a15c39cb webapp: Fix typos 2023-04-05 11:51:09 +02:00
MalteSchm
459f9ffc2c merging branches 2023-04-04 21:43:24 +02:00
MalteSchm
2950f55879 Webinterface updates 2023-04-04 21:32:40 +02:00
Thomas Basler
3e4747e4b0 webapp: Only cut first char of git_hash if it equals "g" 2023-04-04 20:50:47 +02:00
Thomas Basler
acf413b616 webapp: Show inverter status in grey if polling is disabled (e.g. at night) 2023-04-03 22:25:32 +02:00
Thomas Basler
3977bbafaa webapp: Update dependencies 2023-04-03 21:58:17 +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
MalteSchm
20bb7fc372
Show (Pylontech) battery infos in Live View
* adding data age to battery data

* Add battery enabled flag

* Webapi and websocket api for Battery

* Webinterface for battery

* fixed bug due to naming inconsistencies

* cleaned up rounding

* dist update

* change typename to uppercase

* reverting to original file
2023-04-02 20:58:28 +02:00
MalteSchm
90f5ed4251 reverting to original file 2023-04-02 14:43:45 +02:00
MalteSchm
4a664a7b3d change typename to uppercase 2023-04-02 14:41:50 +02:00
MalteSchm
7dee289b5b cleaned up rounding 2023-04-02 14:18:13 +02:00
MalteSchm
fa5b52210a Webinterface for battery 2023-04-02 13:03:03 +02:00
Thomas Basler
a6c3418c7c webapp: Update dependencies 2023-03-31 21:54:07 +02:00
Thomas Basler
d03b8f6e5b webapp: Implemented reload button for info views 2023-03-31 20:05:06 +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
8959795304 webapp: Fix typos 2023-03-27 19:03:18 +02:00
Thomas Basler
143aad0715 webapp: Update dependencies 2023-03-27 17:05:45 +02:00
MalteSchm
a4767827b4 merging master 2023-03-26 11:25:08 +02:00
MalteSchm
0e2b7767c7 Webapp changes to display Huawei PSU values and to enable/disable the unit 2023-03-26 11:06:51 +02:00
Thomas Basler
6faabb4408 webapp: update dependencies 2023-03-23 23:37:58 +01:00
Thomas Basler
8d8c7f8a71 Fixed typo: Successfull --> Successful 2023-03-23 23:30:55 +01:00
Thomas Basler
cb4fd20a73 webapp: Fixed typo in PinInfo dialogue 2023-03-23 21:30:39 +01:00
helgeerbe
3f8226c36c Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-03-23 19:14:14 +01:00
helgeerbe
d96be997ac hide power meter settigs if disabled 2023-03-22 12:07:43 +01:00
helgeerbe
080ef03eec correct labels for power meter 2023-03-22 11:47:18 +01:00