Skip to content

Commit 6630b3e

Browse files
dennissiemensmadennissiemensma
committed
Actuele Amperes weergeven via MQTT #875 
1 parent 87b71a7 commit 6630b3e

File tree

7 files changed

+81
-17
lines changed

7 files changed

+81
-17
lines changed

‎docs/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ v3.6.0 - 2020-02-06
77
- [`#911 <https://github.com/dennissiemensma/dsmr-reader/issues/911>`_] Weer inzoomen in gas/temperatuur-grafieken
88
- [`#912 <https://github.com/dennissiemensma/dsmr-reader/issues/912>`_] Layout verbeteren
99
- [`#916 <https://github.com/dennissiemensma/dsmr-reader/issues/916>`_] Gecombineerd verbruik teruggeven in API's "Retrieve today's consumption"
10+
- [`#875 <https://github.com/dennissiemensma/dsmr-reader/issues/875>`_] Actuele Amperes weergeven via MQTT
1011

1112

1213
----

‎dsmr_frontend/templates/dsmr_frontend/configuration.html

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
var categoryContent = [
9191
{ category: '{% trans "API" %}', title: '{% trans "DSMR-reader API (key)" %}', url: api_settings_url },
9292

93+
{ category: '{% trans "Backend" %}', title: '{% trans "Backend process sleep" %}', url: backend_settings_url },
9394
{ category: '{% trans "Backend" %}', title: '{% trans "Language" %}', url: backend_settings_url },
9495
{ category: '{% trans "Backend" %}', title: '{% trans "Check for updates" %}', url: backend_settings_url },
9596
{ category: '{% trans "Backend" %}', title: '{% trans "Hide electricity return graphs" %}', url: backend_settings_url },
@@ -101,6 +102,7 @@
101102
{ category: '{% trans "Consumption" %}', title: '{% trans "Group electricity by minute" %}', url: consumption_settings_url },
102103
{ category: '{% trans "Consumption" %}', title: '{% trans "Group gas by hour" %}', url: consumption_settings_url },
103104

105+
{ category: '{% trans "Datalogger" %}', title: '{% trans "Datalogger process sleep" %}', url: datalogger_settings_url },
104106
{ category: '{% trans "Datalogger" %}', title: '{% trans "Serial port" %}', url: datalogger_settings_url },
105107
{ category: '{% trans "Datalogger" %}', title: '{% trans "DSMR version" %}', url: datalogger_settings_url },
106108
{ category: '{% trans "Datalogger" %}', title: '{% trans "Smarty meter" %}', url: datalogger_settings_url },
@@ -123,16 +125,21 @@
123125
{ category: '{% trans "Mindergas.nl" %}', title: '{% trans "Link MinderGas account" %}', url: mindergas_settings_url },
124126
{ category: '{% trans "Mindergas.nl" %}', title: '{% trans "Export to MinderGas" %}', url: mindergas_settings_url },
125127

128+
{ category: '{% trans "MQTT" %}', title: '{% trans "MQTT process sleep" %}', url: mqtt_broker_settings_url },
126129
{ category: '{% trans "MQTT" %}', title: '{% trans "Quality of service / QoS" %}', url: mqtt_broker_settings_url },
127130
{ category: '{% trans "MQTT" %}', title: '{% trans "Broker port / SSL / TLS" %}', url: mqtt_broker_settings_url },
128131
{ category: '{% trans "MQTT" %}', title: '{% trans "JSON day totals" %}', url: mqtt_jsondaytotals_settings_url },
129132
{ category: '{% trans "MQTT" %}', title: '{% trans "Split topic day totals" %}', url: mqtt_splittopicdaytotals_settings_url },
130133
{ category: '{% trans "MQTT" %}', title: '{% trans "JSON gas consumption" %}', url: mqtt_jsongasconsumption_settings_url },
131134
{ category: '{% trans "MQTT" %}', title: '{% trans "Split topic gas consumption" %}', url: mqtt_splittopicgasconsumption_settings_url },
132135
{ category: '{% trans "MQTT" %}', title: '{% trans "JSON telegram" %}', url: mqtt_jsontelegram_settings_url },
136+
{ category: '{% trans "MQTT" %}', title: '{% trans "Voltage (JSON)" %}', url: mqtt_jsontelegram_settings_url },
137+
{ category: '{% trans "MQTT" %}', title: '{% trans "Ampere (JSON)" %}', url: mqtt_jsontelegram_settings_url },
133138
{ category: '{% trans "MQTT" %}', title: '{% trans "Raw telegram" %}', url: mqtt_rawtelegram_settings_url },
134139
{ category: '{% trans "MQTT" %}', title: '{% trans "Split topic telegram" %}', url: mqtt_splittopictelegram_settings_url },
135140
{ category: '{% trans "MQTT" %}', title: '{% trans "Split topic meter statistics" %}', url: mqtt_splittopicmeterstatistics_settings_url },
141+
{ category: '{% trans "MQTT" %}', title: '{% trans "Voltage (split topic)" %}', url: mqtt_splittopictelegram_settings_url },
142+
{ category: '{% trans "MQTT" %}', title: '{% trans "Ampere (split topic)" %}', url: mqtt_splittopictelegram_settings_url },
136143

137144
{ category: '{% trans "Notifications" %}', title: '{% trans "App notifications" %}', url: notification_setting_url },
138145
{ category: '{% trans "Notifications" %}', title: '{% trans "Pushover" %}', url: notification_setting_url },

‎dsmr_mqtt/admin.py

+6
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ class JSONTelegramMQTTSettingsAdmin(SingletonModelAdmin):
8787
phase_voltage_l1 = phase_voltage_l1
8888
phase_voltage_l2 = phase_voltage_l2
8989
phase_voltage_l3 = phase_voltage_l3
90+
phase_power_current_l1 = phase_power_current_l1
91+
phase_power_current_l2 = phase_power_current_l2
92+
phase_power_current_l3 = phase_power_current_l3
9093
</pre>
9194
'''
9295
)
@@ -128,6 +131,9 @@ class SplitTopicTelegramMQTTSettingsAdmin(SingletonModelAdmin):
128131
phase_voltage_l1 = dsmr/reading/phase_voltage_l1
129132
phase_voltage_l2 = dsmr/reading/phase_voltage_l2
130133
phase_voltage_l3 = dsmr/reading/phase_voltage_l3
134+
phase_power_current_l1 = dsmr/reading/phase_power_current_l1
135+
phase_power_current_l2 = dsmr/reading/phase_power_current_l2
136+
phase_power_current_l3 = dsmr/reading/phase_power_current_l3
131137
</pre>
132138
'''
133139
)

‎dsmr_mqtt/migrations/0014_mqtt_telegram_defaults.py

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 3.0.3 on 2020-03-03 19:59
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('dsmr_mqtt', '0013_process_sleep'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='jsontelegrammqttsettings',
15+
name='formatting',
16+
field=models.TextField(default='\n[mapping]\n# READING FIELD = JSON FIELD\nid = id\ntimestamp = timestamp\nelectricity_delivered_1 = electricity_delivered_1\nelectricity_returned_1 = electricity_returned_1\nelectricity_delivered_2 = electricity_delivered_2\nelectricity_returned_2 = electricity_returned_2\nelectricity_currently_delivered = electricity_currently_delivered\nelectricity_currently_returned = electricity_currently_returned\nphase_currently_delivered_l1 = phase_currently_delivered_l1\nphase_currently_delivered_l2 = phase_currently_delivered_l2\nphase_currently_delivered_l3 = phase_currently_delivered_l3\nphase_currently_returned_l1 = phase_currently_returned_l1\nphase_currently_returned_l2 = phase_currently_returned_l2\nphase_currently_returned_l3 = phase_currently_returned_l3\nextra_device_timestamp = extra_device_timestamp\nextra_device_delivered = extra_device_delivered\nphase_voltage_l1 = phase_voltage_l1\nphase_voltage_l2 = phase_voltage_l2\nphase_voltage_l3 = phase_voltage_l3\nphase_power_current_l1 = phase_power_current_l1\nphase_power_current_l2 = phase_power_current_l2\nphase_power_current_l3 = phase_power_current_l3\n', help_text='Maps the field names used in the JSON message sent to the broker.', verbose_name='Formatting'),
17+
),
18+
migrations.AlterField(
19+
model_name='splittopictelegrammqttsettings',
20+
name='formatting',
21+
field=models.TextField(default='\n[mapping]\n# READING FIELD = TOPIC PATH\nid = dsmr/reading/id\ntimestamp = dsmr/reading/timestamp\nelectricity_delivered_1 = dsmr/reading/electricity_delivered_1\nelectricity_returned_1 = dsmr/reading/electricity_returned_1\nelectricity_delivered_2 = dsmr/reading/electricity_delivered_2\nelectricity_returned_2 = dsmr/reading/electricity_returned_2\nelectricity_currently_delivered = dsmr/reading/electricity_currently_delivered\nelectricity_currently_returned = dsmr/reading/electricity_currently_returned\nphase_currently_delivered_l1 = dsmr/reading/phase_currently_delivered_l1\nphase_currently_delivered_l2 = dsmr/reading/phase_currently_delivered_l2\nphase_currently_delivered_l3 = dsmr/reading/phase_currently_delivered_l3\nphase_currently_returned_l1 = dsmr/reading/phase_currently_returned_l1\nphase_currently_returned_l2 = dsmr/reading/phase_currently_returned_l2\nphase_currently_returned_l3 = dsmr/reading/phase_currently_returned_l3\nextra_device_timestamp = dsmr/reading/extra_device_timestamp\nextra_device_delivered = dsmr/reading/extra_device_delivered\nphase_voltage_l1 = dsmr/reading/phase_voltage_l1\nphase_voltage_l2 = dsmr/reading/phase_voltage_l2\nphase_voltage_l3 = dsmr/reading/phase_voltage_l3\nphase_power_current_l1 = dsmr/reading/phase_power_current_l1\nphase_power_current_l2 = dsmr/reading/phase_power_current_l2\nphase_power_current_l3 = dsmr/reading/phase_power_current_l3\n', help_text='Maps the field names to separate topics sent to the broker.', verbose_name='Formatting'),
22+
),
23+
]

‎dsmr_mqtt/models/settings/telegram.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ class JSONTelegramMQTTSettings(ModelUpdateMixin, SingletonModel):
6161
phase_currently_returned_l3 = phase_currently_returned_l3
6262
extra_device_timestamp = extra_device_timestamp
6363
extra_device_delivered = extra_device_delivered
64-
phase_voltage_l1 = dsmr/reading/phase_voltage_l1
65-
phase_voltage_l2 = dsmr/reading/phase_voltage_l2
66-
phase_voltage_l3 = dsmr/reading/phase_voltage_l3
64+
phase_voltage_l1 = phase_voltage_l1
65+
phase_voltage_l2 = phase_voltage_l2
66+
phase_voltage_l3 = phase_voltage_l3
67+
phase_power_current_l1 = phase_power_current_l1
68+
phase_power_current_l2 = phase_power_current_l2
69+
phase_power_current_l3 = phase_power_current_l3
6770
''',
6871
verbose_name=_('Formatting'),
6972
help_text=_('Maps the field names used in the JSON message sent to the broker.')
@@ -114,6 +117,9 @@ class SplitTopicTelegramMQTTSettings(ModelUpdateMixin, SingletonModel):
114117
phase_voltage_l1 = dsmr/reading/phase_voltage_l1
115118
phase_voltage_l2 = dsmr/reading/phase_voltage_l2
116119
phase_voltage_l3 = dsmr/reading/phase_voltage_l3
120+
phase_power_current_l1 = dsmr/reading/phase_power_current_l1
121+
phase_power_current_l2 = dsmr/reading/phase_power_current_l2
122+
phase_power_current_l3 = dsmr/reading/phase_power_current_l3
117123
''',
118124
verbose_name=_('Formatting'),
119125
help_text=_('Maps the field names to separate topics sent to the broker.')

‎dsmrreader/locales/nl/LC_MESSAGES/django.mo

934 Bytes
Binary file not shown.

‎dsmrreader/locales/nl/LC_MESSAGES/django.po

+35-14
Original file line numberDiff line numberDiff line change
@@ -958,15 +958,12 @@ msgstr "Energiecontracten"
958958
msgid "Status"
959959
msgstr "Status"
960960

961-
msgid "Notifications"
962-
msgstr "Notificaties"
961+
msgid "Export data"
962+
msgstr "Exporteer gegevens"
963963

964964
msgid "Authentication required"
965965
msgstr "Authenticatie vereist"
966966

967-
msgid "Export data"
968-
msgstr "Exporteer gegevens"
969-
970967
msgid "Configuration"
971968
msgstr "Configuratie"
972969

@@ -982,12 +979,12 @@ msgstr "API docs"
982979
msgid "Feedback / bugs / ideas"
983980
msgstr "Feedback / fouten / ideeën"
984981

985-
msgid "Thanks to all the contributers"
986-
msgstr "Dank aan alle bijdragen"
987-
988982
msgid "Donations / tips"
989983
msgstr "Donaties"
990984

985+
msgid "Thanks to all the contributers"
986+
msgstr "Dank aan alle bijdragen"
987+
991988
msgid "Base selection"
992989
msgstr "Basisselectie"
993990

@@ -1015,6 +1012,9 @@ msgstr "Mindergas.nl"
10151012
msgid "MQTT"
10161013
msgstr "MQTT"
10171014

1015+
msgid "Notifications"
1016+
msgstr "Notificaties"
1017+
10181018
msgid "PVOutput.org"
10191019
msgstr "PVOutput.org"
10201020

@@ -1093,6 +1093,9 @@ msgstr "Koppel MinderGas-account"
10931093
msgid "Export to MinderGas"
10941094
msgstr "Exporteer naar MinderGas"
10951095

1096+
msgid "MQTT process sleep"
1097+
msgstr "MQTT proces sleep"
1098+
10961099
msgid "Quality of service / QoS"
10971100
msgstr "Quality of service / QoS"
10981101

@@ -1114,6 +1117,12 @@ msgstr "Gesplitst topic gasverbruik"
11141117
msgid "JSON telegram"
11151118
msgstr "JSON telegram"
11161119

1120+
msgid "Voltage (JSON)"
1121+
msgstr "Voltage (JSON)"
1122+
1123+
msgid "Ampere (JSON)"
1124+
msgstr "Ampere (JSON)"
1125+
11171126
msgid "Raw telegram"
11181127
msgstr "Ruw telegram"
11191128

@@ -1123,6 +1132,12 @@ msgstr "Gesplitst topic telegram"
11231132
msgid "Split topic meter statistics"
11241133
msgstr "Gesplitst topic meterstatistieken"
11251134

1135+
msgid "Voltage (split topic)"
1136+
msgstr "Voltage (gesplitst topic)"
1137+
1138+
msgid "Ampere (split topic)"
1139+
msgstr "Ampere (gesplitst topic)"
1140+
11261141
msgid "App notifications"
11271142
msgstr "App-notificaties"
11281143

@@ -1653,6 +1668,9 @@ msgid ""
16531668
"phase_voltage_l1 = phase_voltage_l1\n"
16541669
"phase_voltage_l2 = phase_voltage_l2\n"
16551670
"phase_voltage_l3 = phase_voltage_l3\n"
1671+
"phase_power_current_l1 = phase_power_current_l1\n"
1672+
"phase_power_current_l2 = phase_power_current_l2\n"
1673+
"phase_power_current_l3 = phase_power_current_l3\n"
16561674
"</pre>\n"
16571675
msgstr ""
16581676
"Wordt geactiveerd door elke manier van metingen aanmaken (datalogger of API). Staat je toe om nieuwe metingen door te sturen naar de MQTT broker, in JSON-formaat. Je kunt de veldnamen aanpassen die in het JSON-bericht gebruikt worden. Standaardwaarden:\n"
@@ -1677,7 +1695,9 @@ msgstr ""
16771695
"phase_voltage_l1 = phase_voltage_l1\n"
16781696
"phase_voltage_l2 = phase_voltage_l2\n"
16791697
"phase_voltage_l3 = phase_voltage_l3\n"
1680-
"\n"
1698+
"phase_power_current_l1 = phase_power_current_l1\n"
1699+
"phase_power_current_l2 = phase_power_current_l2\n"
1700+
"phase_power_current_l3 = phase_power_current_l3\n"
16811701
"</pre>\n"
16821702

16831703
msgid ""
@@ -1703,10 +1723,12 @@ msgid ""
17031723
"phase_voltage_l1 = dsmr/reading/phase_voltage_l1\n"
17041724
"phase_voltage_l2 = dsmr/reading/phase_voltage_l2\n"
17051725
"phase_voltage_l3 = dsmr/reading/phase_voltage_l3\n"
1726+
"phase_power_current_l1 = dsmr/reading/phase_power_current_l1\n"
1727+
"phase_power_current_l2 = dsmr/reading/phase_power_current_l2\n"
1728+
"phase_power_current_l3 = dsmr/reading/phase_power_current_l3\n"
17061729
"</pre>\n"
17071730
msgstr ""
17081731
"Wordt geactiveerd door elke manier van metingen aanmaken (datalogger of API). Staat je toe om nieuwe metingen door te sturen naar de MQTT broker, gesplitst op een apart topic per veld. Je kunt daarmee elke veldnaam toewijzen op een aparte topic. Standaardwaarden:\n"
1709-
"\n"
17101732
"<pre>\n"
17111733
"[mapping]\n"
17121734
"id = dsmr/reading/id\n"
@@ -1728,7 +1750,9 @@ msgstr ""
17281750
"phase_voltage_l1 = dsmr/reading/phase_voltage_l1\n"
17291751
"phase_voltage_l2 = dsmr/reading/phase_voltage_l2\n"
17301752
"phase_voltage_l3 = dsmr/reading/phase_voltage_l3\n"
1731-
"\n"
1753+
"phase_power_current_l1 = dsmr/reading/phase_power_current_l1\n"
1754+
"phase_power_current_l2 = dsmr/reading/phase_power_current_l2\n"
1755+
"phase_power_current_l3 = dsmr/reading/phase_power_current_l3\n"
17321756
"</pre>\n"
17331757

17341758
msgid ""
@@ -1972,9 +1996,6 @@ msgstr "Herstart vereist"
19721996
msgid "Whether the process requires a restart, forcing the client-broker connection to be reset."
19731997
msgstr "Geeft aan of het proces een herstart vereist, wat forceert om de verbinding tussen client en broker te resetten."
19741998

1975-
msgid "MQTT process sleep"
1976-
msgstr "MQTT proces sleep"
1977-
19781999
msgid "The number of seconds the application will sleep after publishing the outgoing MQTT message queue."
19792000
msgstr "Het aantal seconden dat de applicatie wacht na het versturen van alle MQTT-berichten."
19802001

0 commit comments

Comments
 (0)