From dec435e22947402526399aa753573161a975658d Mon Sep 17 00:00:00 2001 From: Gordon Schmidt Date: Mon, 12 Jul 2021 17:04:25 -0700 Subject: [PATCH] feat (SC-142): sunspec code gen name changes --- src/epcpm/importexport.py | 1 - src/epcpm/parameterstointerface.py | 1 + src/epcpm/sunspectobitfieldsc.py | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/epcpm/importexport.py b/src/epcpm/importexport.py index 668e9f12..dc00f769 100644 --- 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 index 14973d02..246817f4 100644 --- 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 index dea9250e..6876979a 100644 --- 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"}},",