Index: dialin/common/msg_defs.py =================================================================== diff -u -r8902a3c009be4d8f8d77a11e9738c03b83df3e5f -r60370a4f074468071c066d70d58a1ab58696d442 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 8902a3c009be4d8f8d77a11e9738c03b83df3e5f) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 60370a4f074468071c066d70d58a1ab58696d442) @@ -198,3 +198,11 @@ END_POS_FIELD_24 = START_POS_FIELD_24 + 4 START_POS_FIELD_25 = END_POS_FIELD_24 END_POS_FIELD_25 = START_POS_FIELD_25 + 4 + START_POS_FIELD_26 = END_POS_FIELD_25 + END_POS_FIELD_26 = START_POS_FIELD_26 + 4 + START_POS_FIELD_27 = END_POS_FIELD_26 + END_POS_FIELD_27 = START_POS_FIELD_27 + 4 + START_POS_FIELD_28 = END_POS_FIELD_27 + END_POS_FIELD_28 = START_POS_FIELD_28 + 4 + START_POS_FIELD_29 = END_POS_FIELD_28 + END_POS_FIELD_29 = START_POS_FIELD_29 + 4 Index: dialin/dg/temperatures.py =================================================================== diff -u -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 -r60370a4f074468071c066d70d58a1ab58696d442 --- dialin/dg/temperatures.py (.../temperatures.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision 60370a4f074468071c066d70d58a1ab58696d442) @@ -45,7 +45,8 @@ LOAD_CELL_A2_B2 = 15 INTERNAL_THDO_RTD = 16 INTERNAL_TDI_RTD = 17 - INTERNAL_COND_TEMP_SENSOR = 18 + INTERNAL_THD_RTD = 18 + INTERNAL_COND_TEMP_SENSOR = 19 class TemperatureSensors(AbstractSubSystem): @@ -75,6 +76,7 @@ DGTemperaturesNames.LOAD_CELL_A2_B2.name: 0.0, DGTemperaturesNames.INTERNAL_THDO_RTD.name: 0.0, DGTemperaturesNames.INTERNAL_TDI_RTD.name: 0.0, + DGTemperaturesNames.INTERNAL_THD_RTD.name: 0.0, DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name: 0.0} self.primary_raw_thermo_couple = 0 @@ -162,27 +164,30 @@ self.temperatures[DGTemperaturesNames.INTERNAL_TDI_RTD.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.temperatures[DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name] = struct.unpack('f', bytearray( + self.temperatures[DGTemperaturesNames.INTERNAL_THD_RTD.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.primary_raw_thermo_couple = struct.unpack('i', bytearray( + self.temperatures[DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] - self.primary_raw_cold_junc = struct.unpack('i', bytearray( + self.primary_raw_thermo_couple = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] - self.trimmer_raw_thermo_couple = struct.unpack('i', bytearray( + self.primary_raw_cold_junc = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] - self.trimmer_raw_cold_junc = struct.unpack('i', bytearray( + self.trimmer_raw_thermo_couple = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] - self.conductivity_1_raw = struct.unpack('i', bytearray( + self.trimmer_raw_cold_junc = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] - self.conductivity_2_raw = struct.unpack('i', bytearray( + self.conductivity_1_raw = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25]))[0] + self.conductivity_2_raw = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_26:MsgFieldPositions.END_POS_FIELD_26]))[0] + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. @@ -236,8 +241,8 @@ 2 = Primary Heater Outlet 3 = Conductivity Sensor 1 4 = Conductivity Sensor 2 - 5 = Dialysate (Redundant) - 6 = Dialysate + 5 = Outlet Dialysate (Redundant) + 6 = Inlet Dialysate 7 = Primary Heater Thermocouple 8 = Trimmer Heater Thermocouple 9 = Primary Heater Cold Junction @@ -247,9 +252,10 @@ 13 = FPGA board 14 = Load cell A1/B1 15 = Load cell A2/B2 - 16 = Internal THDO RTD - 17 = Internal TDI RTD - 18 = Internal conductivity temp sensor + 16 = Internal TRo RTD + 17 = Internal TDi RTD + 18 = Internal THd RTD + 19 = Internal conductivity temp sensor """ rst = integer_to_bytearray(reset) value = float_to_bytearray(sensor_value) Index: dialin/dg/voltages.py =================================================================== diff -u -rb1ffba07a82b4e99156a07b09762d33205300050 -r60370a4f074468071c066d70d58a1ab58696d442 --- dialin/dg/voltages.py (.../voltages.py) (revision b1ffba07a82b4e99156a07b09762d33205300050) +++ dialin/dg/voltages.py (.../voltages.py) (revision 60370a4f074468071c066d70d58a1ab58696d442) @@ -161,7 +161,7 @@ idx = integer_to_bytearray(signal) payload = rst + vlt + idx - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=MsgIds.MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE.value, payload=payload)