sml2 plugin: fix webinterface missing item column

smarthomeNG · Oct 14, 2023 · 6f7cae0 · 6f7cae0
1 parent 90f8db3
commit 6f7cae0
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 228 deletions.
diff --git a/sml2/__init__.py b/sml2/__init__.py
@@ -2,7 +2,7 @@
 # vim: set encoding=utf-8 tabstop=4 softtabstop=4 shiftwidth=4 expandtab
 #########################################################################
 #  Copyright 2012-2014 Oliver Hinckel                  [email protected]
-#  Copyright 2018-2021                              [email protected]
+#  Copyright 2018-2023                              [email protected]
 #  Copyright 2022-2022 Julian Scholle       [email protected]
 #########################################################################
 #
@@ -35,6 +35,7 @@
 import traceback
 from smllib import SmlStreamReader
 from smllib import const as smlConst
+from .const import FURTHER_OBIS_NAMES
 
 from lib.module import Modules
 from lib.item import Items
@@ -95,7 +96,7 @@ def connection_lost(self, exc):
             self.smlx.logger.error("Connection so serial device was closed")
             self.smlx.connected = False
 
-    PLUGIN_VERSION = '2.0.0'
+    PLUGIN_VERSION = '2.0.1'
 
     def __init__(self, sh):
         """
@@ -135,6 +136,8 @@ def __init__(self, sh):
         self.init_webinterface(WebInterface)
         self.task = None
         self.values = {}
+        self.obis_names = { **smlConst.OBIS_NAMES, **FURTHER_OBIS_NAMES }
+        self.obis_units = smlConst.UNITS
 
     def run(self):
         """
@@ -339,8 +342,8 @@ def parse_data(self):
                     obis_code = sml_entry.obis.obis_code
                     if obis_code not in self.values:
                         self.values[obis_code] = dict()
-                        self.values[obis_code]['name'] = smlConst.OBIS_NAMES.get(sml_entry.obis)
-                        self.values[obis_code]['unit'] = smlConst.UNITS.get(sml_entry.unit)
+                        self.values[obis_code]['name'] = self.obis_names.get(sml_entry.obis)
+                        self.values[obis_code]['unit'] = self.obis_units.get(sml_entry.unit)
                     if obis_code in self._items:
                         if 'valueReal' in self._items[obis_code]:
                             for item in self._items[obis_code]['valueReal']:

diff --git a/sml2/const.py b/sml2/const.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+FURTHER_OBIS_NAMES = {
+    '010000020000': 'Firmware Version, Firmware Prüfsumme CRC, Datum',
+    '0100010800ff': 'Bezug Zählerstand Total',
+    '0100010801ff': 'Bezug Zählerstand Tarif 1',
+    '0100010802ff': 'Bezug Zählerstand Tarif 2',
+    '0100011100ff': 'Total-Zählerstand',
+    '0100020800ff': 'Einspeisung Zählerstand Total',
+    '0100020801ff': 'Einspeisung Zählerstand Tarif 1',
+    '0100020802ff': 'Einspeisung Zählerstand Tarif 2',
+    '0100600100ff': 'Server-ID',
+    '010060320101': 'Hersteller-Identifikation',
+    '0100605a0201': 'Prüfsumme',
+}
diff --git a/sml2/plugin.yaml b/sml2/plugin.yaml
@@ -12,7 +12,7 @@ plugin:
     documentation: https://www.smarthomeng.de/developer/plugins/smlx/user_doc.html
     support: https://knx-user-forum.de/forum/supportforen/smarthome-py/39119-sml-plugin-datenblock-größenfehler
     restartable: True
-    version: 2.0.0                 # Plugin version
+    version: 2.0.1                 # Plugin version
     sh_minversion: 1.4.2           # minimum shNG version to use this plugin
     #sh_maxversion:                # maximum shNG version to use this plugin (leave empty if latest)
     multi_instance: True           # plugin supports multi instance

diff --git a/sml2/webif/__init__.py b/sml2/webif/__init__.py
@@ -71,10 +71,7 @@ def index(self, reload=None):
         """
         tmpl = self.tplenv.get_template('index.html')
         # Setting pagelength (max. number of table entries per page) for web interface
-        try:
-            pagelength = self.plugin.webif_pagelength
-        except Exception:
-            pagelength = 100
+        pagelength = self.plugin.get_parameter_value('webif_pagelength')
         # add values to be passed to the Jinja2 template eg: tmpl.render(p=self.plugin, interface=interface, ...)
         return tmpl.render(p=self.plugin,
                            webif_pagelength=pagelength,