Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r23ad7f4e46c52fcc77452ca6cfa171305f01cfcc -r03cf6f1c459aed5f12550222c40c58fc41c51688 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 23ad7f4e46c52fcc77452ca6cfa171305f01cfcc) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 03cf6f1c459aed5f12550222c40c58fc41c51688) @@ -438,18 +438,18 @@ @unique class DDLevelSensorNames(DialinEnum): - D6_LEVEL = 0 # floater switch low, medium and high status - D46_LEVEL = 1 # Spent dialysate air separation conductivity level sensor low or high status - D63_LEVEL = 2 # bicarb lower level conductivity level sensor low or high status - D98_LEVEL = 3 # bicarb upper level conductivity Level sensor low or high status + D46_LEVEL = 0 # Spent dialysate air separation chamber level low or high status + D63_LEVEL = 1 # bicarb lower conductivity level sensor low or high status + D98_LEVEL = 2 # bicarb upper conductivity level sensor low or high status + D6_LEVEL = 3 # floater switch low, medium and high status NUM_OF_LEVELS = 4 # Number of Level Sensors DDLevelSensorNames._str_list = { # Official Name : Accepted strings - 'D6_LEVEL': ['d6'], 'D46_LEVEL': ['d46'], 'D63_LEVEL': ['d63'], 'D98_LEVEL': ['d98'], + 'D6_LEVEL': ['d6'], 'NUM_OF_LEVELS': [], } Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -r03cf6f1c459aed5f12550222c40c58fc41c51688 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 03cf6f1c459aed5f12550222c40c58fc41c51688) @@ -16,7 +16,7 @@ from enum import unique -from .dd_defs import DDConductivitySensorNames, DDPressureSensorNames, DDValveNames +from .dd_defs import DDConductivitySensorNames, DDPressureSensorNames, DDValveNames, DDLevelSensorNames from ..utils.base import DialinEnum @@ -25,6 +25,7 @@ BETA_IOFP_COND_SENSOR_OFFSET = DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum BETA_IOFP_PRES_SENSOR_OFFSET = DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum BETA_IOFP_VALVE_OFFSET = DDValveNames.NUM_OF_DD_VALVES.value # Offset to translate Dialin FPValveNames to DD firmware DD_Valves +BETA_IOFP_LEVEL_OFFSET = DDLevelSensorNames.NUM_OF_LEVELS.value # offset to translate Dialin FPLevelSensorNames to DD firmware DDLevelSensorNames # ================================================== Enum Creators: Operations Lvl 1 ================================================== @unique Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r106e58f4292b0b970a3c2084af19dca26682edc5 -r03cf6f1c459aed5f12550222c40c58fc41c51688 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 106e58f4292b0b970a3c2084af19dca26682edc5) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 03cf6f1c459aed5f12550222c40c58fc41c51688) @@ -49,10 +49,10 @@ #: The Level Sensors data in dictionary format self.dd_level_sensors = { - dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name: 0, dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name: 0, dd_enum_repository.DDLevelSensorNames.D63_LEVEL.name: 0, dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name: 0 + dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name: 0, } self.dd_bicarb_level = 0 #: The Bicarb level @@ -66,10 +66,10 @@ @returns none """ sensor_list =[] - sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL, 'i')) + sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i')) i = 1 for sensor in sensor_list: @@ -131,7 +131,6 @@ logger = self.logger, can_interface = self.can_interface) - def cmd_floater_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status override command. Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -r106e58f4292b0b970a3c2084af19dca26682edc5 -r03cf6f1c459aed5f12550222c40c58fc41c51688 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 106e58f4292b0b970a3c2084af19dca26682edc5) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 03cf6f1c459aed5f12550222c40c58fc41c51688) @@ -18,6 +18,7 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common.fp_defs import BETA_IOFP_VALVE_OFFSET from leahi_dialin.common import fp_enum_repository from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override @@ -101,6 +102,7 @@ @returns 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) + lvl_sen = integer_to_bytearray(level_sensor + BETA_IOFP_LEVEL_OFFSET ) sts = integer_to_bytearray(status) lvl_sen = integer_to_bytearray(level_sensor) payload = reset_value + sts + lvl_sen @@ -109,7 +111,7 @@ payload = payload, reset = reset, channel_id = DenaliChannels.dialin_to_fp_ch_id, - msg_id = MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST, + msg_id = MsgIds.MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST, entity_name = f'FP Levels status', override_text = f'{str(status)}', logger = self.logger,