Merge pull request #18 from altendky/feature/SC-142/static_modbus_pre…

…pare_sunspec_code Feature SC-142 static modbus prepare sunspec code
epcpower · Jul 19, 2021 · 418904a · 418904a
2 parents 5559688 + dec435e
commit 418904a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/epcpm/importexport.py b/src/epcpm/importexport.py
@@ -14,7 +14,6 @@
 import epcpm.project
 import epcpm.smdxtosunspec
 import epcpm.sunspecmodel
-import epcpm.sunspecmodel
 import epcpm.sunspectobitfieldsc
 import epcpm.sunspectotablesc
 import epcpm.sunspectomanualc

diff --git a/src/epcpm/parameterstointerface.py b/src/epcpm/parameterstointerface.py
@@ -457,6 +457,7 @@ def gen(self):
                 "InterfaceItem",
                 var_or_func,
                 types[parameter.internal_type].name,
+                "sunspec",
                 sunspec_type,
             ]
 

diff --git a/src/epcpm/sunspectobitfieldsc.py b/src/epcpm/sunspectobitfieldsc.py
@@ -186,8 +186,8 @@ def gen(self):
                     [  # TODO: generate a real complete common initializer
                         f".sunspec = {{",
                         [
-                            f".getter = InterfaceItem_bitfield_{bit_length}_getter,",
-                            f".setter = InterfaceItem_bitfield_{bit_length}_setter,",
+                            f".getter = InterfaceItem_bitfield_{bit_length}_sunspec_getter,",
+                            f".setter = InterfaceItem_bitfield_{bit_length}_sunspec_setter,",
                             f".variable = &sunspecInterface.model{model:05}.{parameter.abbreviation},",
                         ],
                         f"}},",