Index: dialin/common/msg_ids.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -202,6 +202,8 @@ MSG_ID_DG_FLOW_SENSORS_DATA = 0xB3 MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4 MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5 + MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6 + MSG_ID_DG_RTC_EPOCH = 0xB7 MSG_ID_CAN_ERROR_COUNT = 0x999 Index: dialin/dg/rtc.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- dialin/dg/rtc.py (.../rtc.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/rtc.py (.../rtc.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -42,7 +42,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_RTC_EPOCH.value + msg_id = MsgIds.MSG_ID_DG_RTC_EPOCH.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_rtc_epoch) self.rtc_epoch = 0 Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r045cdab2571feecc53accc6aab0a2f569941d457 -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -54,7 +54,7 @@ # Use cmd_set_dg_calibration_excel_to_fw() set the changes back to firmware # This function requires an address for the excel report. Use the absolute address of your excel report like the # example below - dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-08-12-DG-Record.xlsx') + dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-08-17-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() @@ -69,9 +69,9 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in you computer. - #dg.system_record.cmd_get_dg_system_record_report() + dg.system_record.cmd_get_dg_system_record_report() - dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-08-09-DG-Record.xlsx') + #dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-08-09-DG-Record.xlsx') # For resetting the system record to benign values, use the function below #dg.system_record.cmd_reset_dg_system_record() Index: tests/dg_tests.py =================================================================== diff -u -r045cdab2571feecc53accc6aab0a2f569941d457 -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- tests/dg_tests.py (.../dg_tests.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) +++ tests/dg_tests.py (.../dg_tests.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -200,13 +200,15 @@ def get_heaters_info(): info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, ' '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_volt, {:5.3f}, Trimmer_volt, {:5.3f}, ' + 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f},' + ' Trimmer_volt, {:5.3f}, ' .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, dg.heaters.primary_efficiency, dg.heaters.primary_calc_target_temperature, dg.heaters.trimmer_calc_target_temperature, dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value], + dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_GND_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value])) return info @@ -395,11 +397,11 @@ counter = 1 start = False - sleep_time = 1 + sleep_time = 0.05 - #dg.heaters.cmd_heaters_broadcast_interval_override(50) - #sleep(1) - #dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50) + dg.heaters.cmd_heaters_broadcast_interval_override(50) + sleep(1) + dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50) #dg.concentrate_pumps.cmd_concentrate_pump_broadcast_interval_override(50) #sleep(0.5) @@ -412,8 +414,8 @@ drain = get_drain_states_info() load_cell = get_load_cells_info() valves = get_dg_valves_states() - ro = get_ro_info() - new_ro = get_new_ro_info() + ro = str(0)#get_ro_info() + new_ro = str(0)#get_new_ro_info() temp = get_temperature_sensors_info() heaters = get_heaters_info() dg_fans = get_dg_fans_info() Index: tests/hd_blood_leak_data.py =================================================================== diff -u -r045cdab2571feecc53accc6aab0a2f569941d457 -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision 045cdab2571feecc53accc6aab0a2f569941d457) +++ tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -46,13 +46,14 @@ #hd.blood_leak.cmd_blood_leak_data_broadcast_interval_override(50) - hd.blood_leak.cmd_blood_leak_set_to_embedded_mode() + #hd.blood_leak.cmd_blood_leak_set_to_embedded_mode() - print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + #print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) - hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.SP.value, msg_payload=30) + #hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.G.value, msg_payload=0) + #print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) - print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + hd.blood_leak.cmd_blood_leak_zero_request() """ while True: Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r438d803f6042b14c39ffb9bbbfdf61a3d9e59d17 -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 438d803f6042b14c39ffb9bbbfdf61a3d9e59d17) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -68,8 +68,8 @@ if hd.cmd_log_in_to_hd(): # Comment this function if not needed - #run_sw_configs_commands() + run_sw_configs_commands() # Comment this function if not needed - run_calibration_commands() + #run_calibration_commands() Index: tests/peter/set_RTCs.py =================================================================== diff -u -ra345f4093235adf6f88ede58841e9d6ccbcd29ff -rbca51efc98d8cbb3759ed270193c74e6d4ce3fee --- tests/peter/set_RTCs.py (.../set_RTCs.py) (revision a345f4093235adf6f88ede58841e9d6ccbcd29ff) +++ tests/peter/set_RTCs.py (.../set_RTCs.py) (revision bca51efc98d8cbb3759ed270193c74e6d4ce3fee) @@ -29,7 +29,7 @@ current_time_stamp = time() current_time = localtime(current_time_stamp) print(current_time) - """ + if hd.cmd_log_in_to_hd(): hd.rtc.cmd_set_rtc_time_and_date(current_time.tm_sec, current_time.tm_min, @@ -48,5 +48,5 @@ current_time.tm_mon, current_time.tm_year) print("Successfully set DG rtc") + """ -