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
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
helgeerbe
9da5be7fd8
Merge branch 'development'
2023-04-11 10:22:27 +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
MalteSchm
406332f6cd
fixed linting issues, pushing to github for test run
2023-04-09 23:09:16 +02:00
MalteSchm
a1252c5701
Merge branch 'typo_fix'
2023-04-09 22:10:05 +02:00
MalteSchm
28e204fd80
typo
2023-04-09 22:06:47 +02:00
MalteSchm
86ecc62b33
fixing mppt string for SmartSolar 150/48
2023-04-09 21:58:41 +02:00
MalteSchm
e3964f8bbe
typo
2023-04-09 21:55:45 +02:00
MalteSchm
869d8e6d8b
fixing a bug introduced in merge
2023-04-07 20:37:26 +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
MalteSchm
734d34b7a8
make calcPowerLimit respect DTU poll interval
2023-04-07 19:08:27 +02:00
MalteSchm
f84bdf7287
adding missing statement from merge
2023-04-07 19:01:00 +02:00
MalteSchm
cb6b98499a
merging
2023-04-07 18:26:44 +02:00
MalteSchm
9521deea25
refactoring calcPowerLimit and setPowerLimit
2023-04-07 18:16:26 +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
e4822f00ec
Merge branch 'development'
2023-04-06 18:33:19 +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
724f1cf713
Merge branch 'development'
2023-04-06 13:57:57 +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