Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r57ca71b2ff74ef3b96b29586f5aefd5abea222df -r23ad7f4e46c52fcc77452ca6cfa171305f01cfcc --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 57ca71b2ff74ef3b96b29586f5aefd5abea222df) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 23ad7f4e46c52fcc77452ca6cfa171305f01cfcc) @@ -439,16 +439,16 @@ @unique class DDLevelSensorNames(DialinEnum): D6_LEVEL = 0 # floater switch low, medium and high status - D63_LEVEL = 1 # bicarb level low or high status - D46_LEVEL = 2 # Spent dialysate air separation chamber level low or high status - D98_LEVEL = 3 # D98 Conductivity Level Sensor + 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 NUM_OF_LEVELS = 4 # Number of Level Sensors DDLevelSensorNames._str_list = { # Official Name : Accepted strings 'D6_LEVEL': ['d6'], - 'D63_LEVEL': ['d63'], 'D46_LEVEL': ['d46'], + 'D63_LEVEL': ['d63'], 'D98_LEVEL': ['d98'], 'NUM_OF_LEVELS': [], } Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r23ad7f4e46c52fcc77452ca6cfa171305f01cfcc --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 23ad7f4e46c52fcc77452ca6cfa171305f01cfcc) @@ -50,8 +50,8 @@ #: The Level Sensors data in dictionary format self.dd_level_sensors = { dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name: 0, - dd_enum_repository.DDLevelSensorNames.D63_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 } self.dd_bicarb_level = 0 #: The Bicarb level @@ -67,15 +67,15 @@ """ 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.D46_LEVEL, 'i')) i = 1 for sensor in sensor_list: start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}') end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}') - if i == 4: + if i == 5: self.dd_bicarb_level = struct.unpack('i', bytearray(message['message'][start_pos:end_pos]))[0] else: self.dd_level_sensors[sensor[0].name] = struct.unpack(sensor[1], bytearray(message['message'][start_pos:end_pos]))[0]