Commit Graph

1329 Commits

Author SHA1 Message Date
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
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
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
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
helgeerbe
71128e5a55 Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development 2023-04-11 09:37:56 +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
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
Thomas Basler
e961872f14 Fix: Handle format "v0.1-5-gabcdefh" of git hash 2023-04-05 19:34:47 +02:00
helgeerbe
2a5f9776a3 add webapp 2023-04-05 11:58:11 +02:00
Thomas Basler
52deea3033 Added config for blinkyparts kit 2023-04-05 11:56:59 +02:00
Thomas Basler
ede572f6e3 Status LED's: Implemented
They can be activated using device profiles.
2023-04-05 11:56:59 +02:00
Thomas Basler
ca8c9b55ae TimeoutHelper: Allow resetting the last value 2023-04-05 11:54:50 +02:00
Thomas Basler
ca0b8e9afc Remove not required F() macro. Frees ~20kb flash. 2023-04-05 11:54:50 +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
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
e0150a8962 Increase platform package version from 6.0.1 to 6.1.0 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
d501c4b836 Uses VSPI instead of HSPI and compatibility for C3, S2 and S3 MCUs 2023-04-05 11:51:09 +02:00
Thomas Basler
7d50fa373e Allow use GPIO0 as NRF pins 2023-04-05 11:51:09 +02:00
Thomas Basler
f45de7ba36 Added additional compatible inverter 2023-04-05 11:51:09 +02:00