Skip to content

Commit a468bd7

Browse files
Aflezen telegram + gegevens over voltages #518
1 parent 5958819 commit a468bd7

File tree

6 files changed

+28
-0
lines changed

6 files changed

+28
-0
lines changed

docs/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ v2.1.0 - 2019-04-xx
2020

2121
**Tickets resolved in this release:**
2222

23+
- [`#518 <https://github.com/dennissiemensma/dsmr-reader/issues/518>`_] Aflezen telegram
2324
- [`#574 <https://github.com/dennissiemensma/dsmr-reader/issues/574>`_] Add Telegram notification support - by thommy101
2425
- [`#562 <https://github.com/dennissiemensma/dsmr-reader/issues/562>`_] API voor live gas verbruik
2526

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.0.9 on 2019-04-25 06:32
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('dsmr_datalogger', '0010_phases_currently_returned'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='meterstatistics',
15+
name='latest_telegram',
16+
field=models.TextField(default=None, help_text='The latest telegram succesfully read. Please note that only the last telegram is saved', null=True),
17+
),
18+
]

dsmr_datalogger/models/statistics.py

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ class MeterStatistics(SingletonModel):
6868
help_text=_("Number of rejected telegrams due to invalid CRC checksum"),
6969
default=0
7070
)
71+
latest_telegram = models.TextField(
72+
help_text=_("The latest telegram succesfully read. Please note that only the last telegram is saved"),
73+
null=True,
74+
default=None
75+
)
7176

7277
class Meta:
7378
default_permissions = tuple()

dsmr_datalogger/services.py

+1
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ def telegram_to_reading(data): # noqa: C901
272272
new_reading = DsmrReading.objects.create(**reading_kwargs)
273273

274274
# There should already be one in database, created when migrating.
275+
statistics_kwargs['latest_telegram'] = data
275276
MeterStatistics.objects.all().update(**statistics_kwargs)
276277

277278
# Broadcast this telegram as signal.
174 Bytes
Binary file not shown.

dsmrreader/locales/nl/LC_MESSAGES/django.po

+3
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ msgstr "Aantal spanningspieken in fase L3 (alleen voor meters met meerdere fasen
418418
msgid "Number of rejected telegrams due to invalid CRC checksum"
419419
msgstr "Aantal genegeerde DSMR telegrammen wegens een foutieve CRC checksum"
420420

421+
msgid "The latest telegram succesfully read. Please note that only the last telegram is saved"
422+
msgstr "Het meest recente uitgelezen telegram. N.B.: Alleen het laatste telegram wordt opgeslagen"
423+
421424
msgid "DSMR Meter statistics (read only)"
422425
msgstr "Meterstatistieken (alleen lezen)"
423426

0 commit comments

Comments
 (0)