Index: dialin/hd/blood_leak.py =================================================================== diff -u -r171cfe518f3441e140b2995fbaa790d322697b38 -r1c23b35158467567fa49da4e06024e9a73b1e7d2 --- dialin/hd/blood_leak.py (.../blood_leak.py) (revision 171cfe518f3441e140b2995fbaa790d322697b38) +++ dialin/hd/blood_leak.py (.../blood_leak.py) (revision 1c23b35158467567fa49da4e06024e9a73b1e7d2) @@ -50,27 +50,6 @@ BLOOD_LEAK_NORMAL_STATE = 4 -class BloodLeakObserver(AbstractObserver): # TODO remove - """ - - Observation class - """ - - def __init__(self, prop): - self.received = False - self.prop = prop - - def update(self, message): - """ - Publicly accessible function to provide an update of the object that is being observed - - @param message: (str) the message to update its status - - @return none - """ - self.received = message.get(self.prop, False) - - class HDBloodLeak(AbstractSubSystem): """ HDBloodLeak @@ -104,10 +83,6 @@ self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED self.blood_leak_state = BloodLeakStates.BLOOD_LEAK_INIT_STATE.value - self.blood_leak_detect_set_point = 0 - self.blood_leak_detect_level = 0 - self.blood_leak_led_intensity = 0 - self._is_emb_mode_command_in_progress = False # TODO remove self.blood_leak_emb_mode_cmds = dict() for cmd in EmbModeCommands.__members__: @@ -130,30 +105,6 @@ """ return self.blood_leak_state - def get_blood_leak_detect_set_point(self): - """ - Gets the current blood leak detect set point - - @return: integer - blood leak detect set point - """ - return self.blood_leak_detect_set_point - - def get_blood_leak_detect_level(self): - """ - Gets the current blood leak detect level - - @return: integer - blood leak detect level - """ - return self.blood_leak_detect_level - - def get_blood_leak_led_intensity(self): - """ - Gets the current blood leak LED intensity - - @return: integer - blood leak LED intensity - """ - return self.blood_leak_led_intensity - def get_blood_leak_emb_mode_command_response(self, emb_mod_cmd: int) -> str: """ Gets the embedded mode command response @@ -162,30 +113,8 @@ @return: string - embedded mode command response """ - """ - # Check if there has been a recent command sent to the firmware and then start an observer - # If there is no command sent and therefore, there is no pending response, the observer will hang - if self._is_emb_mode_command_in_progress is True: - # Create an object of the observer class to observe the response - observer = BloodLeakObserver("blood_leak_emb_mode_cmd_response") - # Attach the observer to the list - self.attach(observer) + return self.blood_leak_emb_mode_cmds[EmbModeCommands(emb_mod_cmd).name] - observer_sleep_time = 0.1 - observer_time_out = int(20 / observer_sleep_time) - observer_timer_counter = 0 - # Wait until data has been received from firmware - while not observer.received: - sleep(observer_sleep_time) - if observer_timer_counter >= observer_time_out: - print('Observer Timeout') - break - observer_timer_counter += 1 - # Done with receiving the response from the firmware - self._is_emb_mode_command_in_progress = False - """ - return self.blood_leak_emb_mode_cmds[ EmbModeCommands(emb_mod_cmd).name ] - @publish(['blood_leak_status', 'blood_leak_state']) def _handler_blood_leak_sync(self, message): """ @@ -366,7 +295,7 @@ blood_leak_emb_mode_cmd_response = '' payload = message['message'] index = MsgFieldPositions.START_POS_FIELD_1 - cmd, index = bytearray_to_integer(payload, index, False) + cmd, index = bytearray_to_byte(payload, index, False) length, index = bytearray_to_integer(payload, index, False) for i in range(0, length): Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r171cfe518f3441e140b2995fbaa790d322697b38 -r1c23b35158467567fa49da4e06024e9a73b1e7d2 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 171cfe518f3441e140b2995fbaa790d322697b38) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 1c23b35158467567fa49da4e06024e9a73b1e7d2) @@ -49,12 +49,12 @@ # 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.calibration_record.cmd_get_dg_calibration_record_report() + #dg.calibration_record.cmd_get_dg_calibration_record_report() # 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-10-06-DG-Record_betadvt2.xlsx') + dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-12-09-DG-Record-DVT-002.xlsx') # For resetting the calibration record to benign values, use the function below #dg.calibration_record.cmd_reset_dg_calibration_record() @@ -112,9 +112,9 @@ if dg.cmd_log_in_to_dg(): - run_sw_configs_commands() + #run_sw_configs_commands() - #run_calibration_commands() + run_calibration_commands() #run_system_commands() Index: tests/hd_blood_leak_data.py =================================================================== diff -u -rbff28676dd855ea33707bbb26a624abc94aebdf0 -r1c23b35158467567fa49da4e06024e9a73b1e7d2 --- tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision bff28676dd855ea33707bbb26a624abc94aebdf0) +++ tests/hd_blood_leak_data.py (.../hd_blood_leak_data.py) (revision 1c23b35158467567fa49da4e06024e9a73b1e7d2) @@ -74,16 +74,19 @@ #print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) - hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.D.value, msg_payload=0) - print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.Z.value, msg_payload=0) + #print(hd.blood_leak.get_blood_leak_emb_mode_command_response()) + #hd.blood_leak.cmd_blood_leak_zero_request() while True: - print(get_blood_leak_info()) + #print(hd.blood_leak.blood_leak_emb_mode_cmds) sleep(1) + print(hd.blood_leak.get_blood_leak_emb_mode_command_response(EmbModeCommands.Z.value)) + """ while True: hd.blood_leak.cmd_blood_leak_set_embedded_mode_command(EmbModeCommands.I.value, msg_payload=125)