Index: dialin/dg/heaters.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r6f4c3b18f8b57ad891116e29cda04c8194f5ff34 --- dialin/dg/heaters.py (.../heaters.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/dg/heaters.py (.../heaters.py) (revision 6f4c3b18f8b57ad891116e29cda04c8194f5ff34) @@ -79,6 +79,8 @@ self.trimmer_calc_target_temperature = 0.0 self.trimmer_use_last_duty_cycle = 0 self.dg_heaters_timestamp = 0.0 + self.previous_flow = 0.0 + self.control_counter = 0 if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id @@ -158,6 +160,10 @@ message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] self.trimmer_use_last_duty_cycle = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + self.previous_flow = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] + self.control_counter = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] self.dg_heaters_timestamp = timestamp def cmd_start_stop_primary_heater(self, state: int = HeatersStartStop.STOP.value) -> None: Index: tests/dg_tests.py =================================================================== diff -u -r1b04b37b3a327b145b150477f567e26a26c60e4e -r6f4c3b18f8b57ad891116e29cda04c8194f5ff34 --- tests/dg_tests.py (.../dg_tests.py) (revision 1b04b37b3a327b145b150477f567e26a26c60e4e) +++ tests/dg_tests.py (.../dg_tests.py) (revision 6f4c3b18f8b57ad891116e29cda04c8194f5ff34) @@ -253,6 +253,7 @@ 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, ' 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_power, {:5.3f}, ' 'Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f}, Trimmer_volt, {:5.3f}, Trimmer_use_last_dc, {}, ' + 'previous_flow , {:5.3f}, trimmer_ctrl_cntr, {}, ' .format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature, @@ -262,7 +263,7 @@ dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_TRIM_HTR_V.value], - dg.heaters.trimmer_use_last_duty_cycle)) + dg.heaters.trimmer_use_last_duty_cycle, dg.heaters.previous_flow, dg.heaters.control_counter)) return info @@ -649,9 +650,9 @@ hd.cmd_log_in_to_hd() sleep(1) - hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WET_CARTRIDGE.value) - sleep(1) - hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK.value) + #hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WET_CARTRIDGE.value) + #sleep(1) + #hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK.value) #dg.load_cells.cmd_get_load_cells_tare_values() #while True: