From ebd80d3daf3259e015c2ce1eceb300a58f5b16aa Mon Sep 17 00:00:00 2001 From: matteo porta Date: Tue, 12 Jul 2022 15:30:30 +0200 Subject: [PATCH] wip --- src/components/modbus_component.py | 4 ++-- src/components/tecna_marposs_provaset_t3.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/modbus_component.py b/src/components/modbus_component.py index 2ef54f6..80b159c 100644 --- a/src/components/modbus_component.py +++ b/src/components/modbus_component.py @@ -65,11 +65,11 @@ class ModbusComponent(Component): return False return True - def _decode(self, read, data_type, *args, **kwargs): + def _decode(self, read, data_type="16bit_uint", *args, **kwargs): decoder = BinaryPayloadDecoder.fromRegisters(read.registers, byteorder=self.byteorder, wordorder=self.wordorder) return getattr(decoder, f"decode_{data_type}")(*args, **kwargs) - def _encode(self, data, data_type, *args, **kwargs): + def _encode(self, data, data_type="16bit_uint", *args, **kwargs): builder = BinaryPayloadBuilder(byteorder=self.byteorder, wordorder=self.wordorder) getattr(builder, f"add_{data_type}")(data, *args, **kwargs) return builder.build() diff --git a/src/components/tecna_marposs_provaset_t3.py b/src/components/tecna_marposs_provaset_t3.py index 51d99f8..dd73493 100644 --- a/src/components/tecna_marposs_provaset_t3.py +++ b/src/components/tecna_marposs_provaset_t3.py @@ -128,7 +128,10 @@ class TecnaMarpossProvasetT3(ModbusComponent): def write_recipe(self, recipe, table=1): # "pressure_ramp": self.pressure_ramp_sb, # "stabilization_cycles": self.stabilization_cycles_sb, + recipe_name = recipe.spec["part_number"][:16].encode("ascii") + recipe_name += b"\x00" * (16 - len(recipe_name)) recipe = { + **{719 + i: (recipe_name[i * 2 + 1] << 8) + recipe_name[i * 2] for i in range(8)}, "Selection number of test table on which you intend to work": table, "Type of test": "LEAK TEST", "Test flags": 0b0000000001010000,