Commit Graph

1593 Commits

Author SHA1 Message Date
Thomas Basler
5d289dac47 vscode: Recommend additional extensions for development 2023-04-13 19:21:29 +02:00
helgeerbe
b00ca02aac fix layout for vedirect live data on small devices 2023-04-13 11:38:20 +02:00
helgeerbe
1a0f44dac4 Merge branch 'development' 2023-04-13 10:21:23 +02:00
helgeerbe
1dc73f91ee Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-13 10:18:49 +02:00
MalteSchm
3c5082287e remove a leftover debug message 2023-04-13 10:07:25 +02:00
MalteSchm
690025e5fd fixing a bug from merging and remove a leftover debug message 2023-04-13 10:06:06 +02:00
MalteSchm
be7a43fbfb Removing un-necessary timestamp, commenting code and cleanups 2023-04-13 09:47:12 +02:00
MalteSchm
01849dc90a adding Mqtt handling to main.cpp 2023-04-13 09:47:10 +02:00
MalteSchm
ee376827fd merging functionality from PL refactor 2023-04-13 09:47:07 +02:00
MalteSchm
9999fa28e8 refactor state machine
merging
2023-04-13 09:46:35 +02:00
MalteSchm
ee82c8c9b8 adding option to disable power limiter via mqtt
adding option to disable power limiter via mqtt - adding missing file
2023-04-13 09:44:48 +02:00
MalteSchm
9efe076cc2 resolving merge conflict
adding missing statement from merge

fixing a bug introduced in merge
2023-04-13 09:39:04 +02:00
MalteSchm
fc5089e70b resolving merge conflict 2023-04-13 09:36:00 +02:00
Marc-Philip
16877a8ea3
fix typo 2023-04-13 09:18:07 +02:00
MalteSchm
9ff1885d5a Removing un-necessary timestamp, commenting code and cleanups 2023-04-13 07:45:26 +02:00
Thomas Basler
4bcc7ce490 Fix: Use correct tag_resolver for github changelog 2023-04-12 21:02:06 +02:00
qubeck
b79619bf8b add explicit checks to avoid potential div. by zero on application of artificially increased power limit if channel power becomes zero 2023-04-12 20:44:38 +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
helgeerbe
1970b939e0 add webapp 2023-04-12 17:50:39 +02:00
helgeerbe
1d62e36303 Merge branch 'development' 2023-04-12 17:49:31 +02:00
MalteSchm
03ce71519d Merge remote-tracking branch 'upstream/development' 2023-04-12 16:16:21 +02:00
MalteSchm
74dcddaa1a merging linting error fixes 2023-04-12 16:14:33 +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
MalteSchm
d2fc00b7d6 Merge branch 'master' of https://github.com/MalteSchm/OpenDTU-OnBattery 2023-04-12 13:06:21 +02:00
MalteSchm
f99f80159d Merge remote-tracking branch 'upstream/development' 2023-04-12 13:05:53 +02:00
MalteSchm
c430b69322
Merge branch 'helgeerbe:master' into master 2023-04-12 13:02:10 +02:00
MalteSchm
79834e4d47 adding Mqtt handling to main.cpp 2023-04-12 12:51:24 +02:00
MalteSchm
1b29133ee0 merging functionality from PL refactor 2023-04-12 12:21:52 +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
MalteSchm
515bb1c7ce merging mqtt enable/disable with new refactored state machine code 2023-04-12 10:35:55 +02:00
MalteSchm
1e4337e900 merging 2023-04-12 10:12:47 +02:00
MalteSchm
a893260de0 refactor state machine 2023-04-12 10:05:17 +02:00
MalteSchm
97a8545d78 merging branches to prepare mqtt enablement 2023-04-12 09:41:40 +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
MalteSchm
b6edc11eb2 adding option to disable power limiter via mqtt - adding missing file 2023-04-12 06:46:38 +02:00
MalteSchm
4bff31e3b1 adding option to disable power limiter via mqtt 2023-04-12 06:45:41 +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