Commit Graph

1345 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
4bcc7ce490 Fix: Use correct tag_resolver for github changelog 2023-04-12 21:02:06 +02:00
Thomas Basler
131bea0967 webapp: add app.js.gz 2023-04-12 20:16:07 +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
Bernhard Kaszt
616d0425db
Merge pull request #170 from MalteSchm/only_linting_error_fix
webapp / yarn linting issues
2023-04-12 16:13:19 +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
bea0a738c1
include/Configuration.h: rename MQTT_MAX_ROOT_CA_CERT_STRLEN
rename const MQTT_MAX_ROOT_CA_CERT_STRLEN to more generic name MQTT_MAX_CERT_STRLEN

Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
2023-04-12 11:58:27 +02:00
Bernhard Kaszt
1d29781804
Merge pull request #167 from MalteSchm/only-typo-fix
Typo fix
2023-04-12 11:00:35 +02:00
Bernhard Kaszt
d28c9dbc4b
Merge pull request #168 from MalteSchm/only-mppt-150-fix
Mppt string for SmartSolar 150/48 is wrong
2023-04-12 10:59:51 +02:00
Martin Dummer
d920726a76
src/WebApi_mqtt.cpp: rename function getRootCaCertInfo
rename function WebApiMqttClass::getRootCaCertInfo to more generic
name WebApiMqttClass::getTlsCertInfo

Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
2023-04-12 08:47:24 +02:00
Martin Dummer
0db4b5f226
Fix: src/WebApi_mqtt.cpp: typos in error messages
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
2023-04-12 08:37:49 +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
Thomas Basler
c0b9f0eab6 Merge branch 'pr789' into dev 2023-04-11 23:24:09 +02:00
MalteSchm
06f6a4da8b fixing mppt string for SmartSolar 150/48 2023-04-11 19:23:49 +02:00
MalteSchm
2d7115e1e8 typo 2023-04-11 18:58:18 +02:00
MalteSchm
f6d0b0997f typo 2023-04-11 18:57:57 +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
berni2288
19b2dd4c7a
PowerMeter: Whitespace and {} fixes 2023-04-07 20:22:35 +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
f2535f0792 Doc: Highlight device profiles instead of self compile 2023-04-07 13:24:51 +02:00
Thomas Basler
299ba8f27a Doc: Resolve Markdown Lint errors 2023-04-06 23:34:35 +02:00
Thomas Basler
fef9abff93 Fix: Use commit title to categorize commits in changelog 2023-04-06 23:20:44 +02:00
Thomas Basler
12d7349699 webapp: add app.js.gz 2023-04-06 22:48:06 +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
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
fd94a69ff8
Update Readme
add badge, which shows the original OpenDTU release number
2023-04-06 19:07:25 +02:00
helgeerbe
e29708f871 fix infinite state switch if battery is above
startThreshold and solar passtrhough is enabled
2023-04-06 18:32:50 +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
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
berni2288
0ff9ebfac9
Rebuild webapp 2023-04-05 22:28:20 +02:00
berni2288
09fb0618b4
Merge branch 'MalteSchm-webinterface_summary_updates' into development 2023-04-05 22:27:17 +02:00
Thomas Basler
a7b2d727f8 Fix: Show version number in web interface instead of git hash (if available)
see https://github.com/actions/checkout/issues/701 for further info
2023-04-05 21:20:28 +02:00
Thomas Basler
778dc93dee Merge remote-tracking branch 'github/master' 2023-04-05 20:40:23 +02:00
Thomas Basler
6102516ce1 webapp: add app.js.gz 2023-04-05 20:34:18 +02:00
Thomas Basler
f1b0558913 Run automatic linting for the webapp 2023-04-05 20:19:31 +02:00
Thomas Basler
69838ba0cc Add MqttSubscribeParser, TimeoutHelper and ResetReason to cpplint 2023-04-05 20:02:39 +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
Thomas Basler
77e593777d Feature: Added possibility to create github releases with changelog 2023-04-05 19:38:31 +02:00