Index: dialin/common/msg_defs.py =================================================================== diff -u -r6ee95f85e0504b8c7214258074e3022b50c982bd -r111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 6ee95f85e0504b8c7214258074e3022b50c982bd) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5) @@ -356,6 +356,16 @@ END_POS_FIELD_19 = START_POS_FIELD_19 + 4 START_POS_FIELD_20 = END_POS_FIELD_19 END_POS_FIELD_20 = START_POS_FIELD_20 + 4 + START_POS_FIELD_21 = END_POS_FIELD_20 + END_POS_FIELD_21 = START_POS_FIELD_21 + 4 + START_POS_FIELD_22 = END_POS_FIELD_21 + END_POS_FIELD_22 = START_POS_FIELD_22 + 4 + START_POS_FIELD_23 = END_POS_FIELD_22 + END_POS_FIELD_23 = START_POS_FIELD_23 + 4 + START_POS_FIELD_24 = END_POS_FIELD_23 + 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 ACK_NOT_REQUIRED = [ Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r2547391a5b9dd00230b8238dba5d0ae6caf2e4c6 -r111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 2547391a5b9dd00230b8238dba5d0ae6caf2e4c6) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5) @@ -74,6 +74,13 @@ TemperatureSensorsNames.INTERNAL_TDI_RTD.name: {}, TemperatureSensorsNames.INTERNAL_COND_TEMP_SENSOR.name: {}} + self.primary_raw_thermo_couple = 0 + self.primary_raw_cold_junc = 0 + self.trimmer_raw_thermo_couple = 0 + self.trimmer_raw_cold_junc = 0 + self.conductivity_1_raw = 0 + self.conductivity_2_raw = 0 + if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value @@ -89,7 +96,8 @@ """ return self.temperature_sensors[sensor] - @_publish(['temperature_sensors']) + @_publish(["temperature_sensors", "primary_raw_thermo_couple", "primary_raw_cold_junc", + "trimmer_raw_thermo_couple", "trimmer_raw_cold_junc", "conductivity_1_raw", "conductivity_2_raw"]) def _handler_temperature_sensors_sync(self, message): """ Handles published temperature sensors message @@ -169,6 +177,30 @@ message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] self.temperature_sensors[TemperatureSensorsNames.INTERNAL_COND_TEMP_SENSOR.name] = sensors_data + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] + self.primary_raw_thermo_couple = sensors_data + + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] + self.primary_raw_cold_junc = sensors_data + + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] + self.primary_raw_cold_junc = sensors_data + + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] + self.trimmer_raw_thermo_couple = sensors_data + + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] + self.trimmer_raw_cold_junc = sensors_data + + sensors_data = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] + self.conductivity_1_raw = sensors_data + def cmd_temperature_sensors_broadcast_interval_override(self, ms, reset=NO_RESET): """ Constructs and sends broadcast time interval. Index: tests/dg_heat_disinfect_test.py =================================================================== diff -u -r7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2 -r111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5 --- tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2) +++ tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5) @@ -95,15 +95,18 @@ info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, ' 'Prim_TC_temp, {:5.3f}, Trimmer_DC, {:5.3f}, Trim_int_temp, {:5.3f}, Trim_CJ_temp, {:5.3f}, ' - 'Trim_TC_temp, {:5.3f}'. + 'Trim_TC_temp, {:5.3f}, Prim_TC_raw, {:5.3f}, Prim_CJ_raw, {:5.3f}, Trimmer_TC_raw, {:5.3f}, ' + 'Trimmer_CJ_raw, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name], dg.heaters.trimmer_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name])) + dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name], + dg.temperature_sensors.primary_raw_thermo_couple, dg.temperature_sensors.primary_raw_cold_junc, + dg.temperature_sensors.trimmer_raw_thermo_couple, dg.temperature_sensors.trimmer_raw_cold_junc)) return info @@ -138,6 +141,7 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") #dg.hd_proxy.cmd_start_stop_heat_disinfect() + try: while True: @@ -163,6 +167,7 @@ dg.hd_proxy.cmd_start_stop_heat_disinfect(start=False) # Write a few more complete states to make sure the complete state items are recorded elif complete_counter == 3: + #pass f.close() break