Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) @@ -21,7 +21,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -57,6 +57,22 @@ } + +# ============================================================ Properties ============================================================ + @property + def fp_flows(self) -> dict: + """ + The Flow Sensors data + """ + return self._flows + + @fp_flows.setter + def fp_flows(self, value): + self._flows = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_fp_flow_data", "fp_flows", "fp_flows_timestamp"]) def _handler_flow_sensor_sync(self, message, timestamp=0.0): """ @@ -66,15 +82,15 @@ @returns none """ sensor_list =[] - sensor_list.append((fp_enum_repository.FPFlowSensorNames.P7_FLOW.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPFlowSensorNames.P16_FLOW.name, DataTypes.F32)) + sensor_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P7_FLOW.name, DataTypes.F32)) + sensor_list.append((self.fp_flows, fp_enum_repository.FPFlowSensorNames.P16_FLOW.name, DataTypes.F32)) - self.process_into_dict(dict_to_update = self.fp_flows, - decoder_list = sensor_list, - message = message) + self.process_into_vars(decoder_list = sensor_list, message = message) self.fp_flow_timestamp = timestamp + +# ============================================================ Overrides and Requests ============================================================ def cmd_flow_sensor_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends an FP flow sensor broadcast interval override command message.