Index: dialin/common/alarm_defs.py =================================================================== diff -u -r27392693a089c6c7a10b5026d3b2727552847b55 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 27392693a089c6c7a10b5026d3b2727552847b55) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -8,9 +8,9 @@ # @file alarm_defs.py # # @author (last) Peter Lucia -# @date (last) 12-May-2021 +# @date (last) 18-May-2021 # @author (original) Peter Lucia -# @date (original) 12-May-2021 +# @date (original) 18-May-2021 # ############################################################################ from enum import unique @@ -246,3 +246,4 @@ ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 223 ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 224 ALARM_ID_HD_BATTERY_COMM_FAULT = 225 + ALARM_ID_HD_SYRINGE_PUMP_STALL = 226 Index: dialin/common/msg_defs.py =================================================================== diff -u -r1fd5bc0ed97d0d90223fa78ec195dd7636712c5b -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 1fd5bc0ed97d0d90223fa78ec195dd7636712c5b) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -25,7 +25,7 @@ MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST = 0x89 MSG_DIALIN_ID_HD_SYSTEM_USAGE_RESPONSE = 0x8A MSG_DIALIN_ID_DG_SYSTEM_USAGE_RESPONSE = 0x8C - MSG_DIALIN_ID_HD_DISINFECT_STATE = 0x7E + MSG_DIALIN_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0x8047 ACK_NOT_REQUIRED = [ Index: dialin/common/msg_ids.py =================================================================== diff -u -rd57827c9d5280734dcd1f41b3a1746b0788d4a8c -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision d57827c9d5280734dcd1f41b3a1746b0788d4a8c) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 12-May-2021 +# @date (last) 18-May-2021 # @author (original) Peter Lucia -# @date (original) 12-May-2021 +# @date (original) 18-May-2021 # ############################################################################ from enum import unique @@ -22,6 +22,20 @@ class MsgIds(DialinEnum): MSG_ID_UNUSED = 0X0 MSG_ID_OFF_BUTTON_PRESS = 0X1 + MSG_ID_ALARM_STATUS = 0X2 + MSG_ID_ALARM_TRIGGERED = 0X3 + MSG_ID_ALARM_CLEARED = 0X4 + MSG_ID_BLOOD_FLOW_DATA = 0X5 + MSG_ID_DG_CHECK_IN = 0X6 + MSG_ID_UI_CHECK_IN = 0X7 + MSG_ID_DIALYSATE_FLOW_DATA = 0X8 + MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 + MSG_ID_RTC_EPOCH = 0XA + MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0XB + MSG_ID_LOAD_CELL_READINGS = 0XC + MSG_ID_TREATMENT_TIME = 0XD + MSG_ID_POWER_OFF_WARNING = 0XE + MSG_ID_TREATMENT_STATE = 0XF MSG_ID_USER_UF_PAUSE_RESUME_REQUEST = 0X10 MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST = 0X11 MSG_ID_USER_SALINE_BOLUS_REQUEST = 0X12 @@ -38,7 +52,6 @@ MSG_ID_HD_VERSION = 0X1D MSG_ID_DG_VERSION = 0X1E MSG_ID_RO_PUMP_DATA = 0X1F - MSG_ID_ALARM_STATUS = 0X2 MSG_ID_DG_PRESSURES_DATA = 0X20 MSG_ID_DG_SWITCH_RESERVOIR_CMD = 0X21 MSG_ID_DG_FILL_CMD = 0X22 @@ -55,7 +68,6 @@ MSG_ID_DG_TEMPERATURE_DATA = 0X2D MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0X2E MSG_ID_SALINE_BOLUS_DATA = 0X2F - MSG_ID_ALARM_TRIGGERED = 0X3 MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0X30 MSG_ID_DG_CONDUCTIVITY_DATA = 0X31 MSG_ID_USER_REQUEST_ALARM_SILENCE = 0X32 @@ -72,7 +84,6 @@ MSG_ID_HD_START_PRIME_RESPONSE = 0X3D MSG_ID_HD_AIR_TRAP_DATA = 0X3E MSG_ID_ALARM_CONDITION_CLEARED = 0X3F - MSG_ID_ALARM_CLEARED = 0X4 MSG_ID_UI_ALARM_USER_ACTION = 0X40 MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0X41 MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0X42 @@ -89,7 +100,6 @@ MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0X4D MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0X4E MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0X4F - MSG_ID_BLOOD_FLOW_DATA = 0X5 MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0X50 MSG_ID_DG_COMMAND_RESPONSE = 0X51 MSG_ID_UI_RINSEBACK_CMD = 0X52 @@ -106,7 +116,6 @@ MSG_ID_UI_SAMPLE_WATER_CMD = 0X5D MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE = 0X5E MSG_ID_UI_SAMPLE_WATER_RESULT = 0X5F - MSG_ID_DG_CHECK_IN = 0X6 MSG_ID_DG_FILTER_FLUSH_PROGRESS = 0X60 MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0X61 MSG_ID_UI_INSTALLATION_CONFIRM = 0X62 @@ -123,7 +132,6 @@ MSG_ID_UI_HD_SET_RTC_REQUEST = 0X6D MSG_ID_HD_UI_SET_RTC_RESPONSE = 0X6E MSG_ID_UI_DG_SET_RTC_REQUEST = 0X6F - MSG_ID_UI_CHECK_IN = 0X7 MSG_ID_DG_UI_SET_RTC_RESPONSE = 0X70 MSG_ID_UI_START_TREATMENT_REQUEST = 0X71 MSG_ID_HD_START_TREATMENT_RESPONSE = 0X72 @@ -138,7 +146,10 @@ MSG_ID_HD_VOLTAGES_DATA = 0X7B MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C MSG_ID_HD_ALARM_INFORMATION = 0X7D - MSG_ID_DIALYSATE_FLOW_DATA = 0X8 + MSG_ID_DG_VOLTAGES_DATA = 0X86 + MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 + MSG_ID_HD_BUBBLES_DATA = 0X93 + MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0X8002 @@ -226,20 +237,13 @@ MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE = 0X8055 MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE = 0X8056 MSG_ID_HD_VALVES_CURRENT_OVERRIDE = 0X8057 - MSD_ID_HD_VALVES_POSITION_COUNT_OVERRIDE = 0x8058 MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE = 0X8059 MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE = 0X805A MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE = 0X805B MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE = 0X805C MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE = 0X805D - MSG_ID_HD_BUBBLES_STATUS_OVERRIDE = 0X805E - MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST = 0X8060 - MSG_ID_DG_VOLTAGES_DATA = 0X86 - MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 - MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 - MSG_ID_HD_BUBBLES_DATA = 0X93 - MSG_ID_CAN_ERROR_COUNT = 0X999 - MSG_ID_RTC_EPOCH = 0XA + MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0X805E + MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0X8060 MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0XA001 MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0XA002 @@ -303,11 +307,6 @@ MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0XA03F MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0XA040 MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0XA041 - MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0XB - MSG_ID_LOAD_CELL_READINGS = 0XC - MSG_ID_TREATMENT_TIME = 0XD - MSG_ID_POWER_OFF_WARNING = 0XE - MSG_ID_TREATMENT_STATE = 0XF MSG_ID_HD_DEBUG_EVENT = 0XFFF1 MSG_ID_DG_DEBUG_EVENT = 0XFFF2 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0XFFFF Index: dialin/dg/accelerometer.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -204,7 +204,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_accel_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_accel_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the accelerometer broadcast interval override command Constraints: Index: dialin/dg/concentrate_pumps.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -95,7 +95,7 @@ self.concentrate_pump_cp2_current_set_speed = cp2_current[0] self.concentrate_pump_cp2_measured_speed = cp2_measured[0] - def cmd_concentrate_pump_state_change_request(self, pump_id, on=False): + def cmd_concentrate_pump_state_change_request(self, pump_id: int, on: bool = False) -> int: """ Constructs and sends the concentrate pump state change request command @@ -200,7 +200,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_concentrate_pump_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump data broadcast interval override command Constraints: Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -136,7 +136,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity sensor data broadcast interval override command Constraints: Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -262,7 +262,7 @@ self.dg_operation_mode = mode[0] self.dg_operation_sub_mode = smode[0] - def cmd_log_in_to_dg(self, resend: bool = False): + def cmd_log_in_to_dg(self, resend: bool = False) -> int: """ Constructs and sends a login command via CAN bus. Login required before \n other commands can be sent to the DG. @@ -290,7 +290,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_ui_request_dg_version(self): + def cmd_ui_request_dg_version(self) -> None: """ Constructs and sends the ui request for version message @@ -303,12 +303,10 @@ self.can_interface.send(message, 0) - def cmd_dg_safety_shutdown_override(self): + def cmd_dg_safety_shutdown_override(self) -> int: """ Constructs and sends an DG safety shutdown override command via CAN bus. - \returns response message if received, False if no response received - @return: 1 if successful, zero otherwise """ @@ -330,7 +328,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_dg_software_reset_request(self): + def cmd_dg_software_reset_request(self) -> None: """ Constructs and sends an DG software reset request via CAN bus. Constraints: Index: dialin/dg/drain_pump.py =================================================================== diff -u -r4ff3b2874eb12aee034d1f85ae32c161d05efc00 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -112,7 +112,7 @@ self.drain_pump_state = state self.current_drain_pump_rpm = curr_rpm - def cmd_drain_pump_speed_set_point_override(self, speed): + def cmd_drain_pump_speed_set_point_override(self, speed: int) -> int: """ Constructs and sends the drain pump speed set point override command Constraints: @@ -145,7 +145,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_drain_pump_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_drain_pump_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the drain pump speed set point override command. Constraints: Index: dialin/dg/fans.py =================================================================== diff -u -rf89093ee0f0b9159df2ae4e0b86971f0e0e1b448 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/fans.py (.../fans.py) (revision f89093ee0f0b9159df2ae4e0b86971f0e0e1b448) +++ dialin/dg/fans.py (.../fans.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -137,7 +137,7 @@ self.outlet_2_rpm = outlet_2_rpm self.outlet_3_rpm = outlet_3_rpm - def cmd_fans_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_fans_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the fans data publish interval. Constraints: Index: dialin/dg/fluid_leak.py =================================================================== diff -u -r2d2b6aef93215b733d10d32cefe233f23bdfbb66 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 2d2b6aef93215b733d10d32cefe233f23bdfbb66) +++ dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -73,7 +73,7 @@ self.fluid_leak_state = state[0] - def cmd_fluid_leak_detector_override(self, detected, reset=NO_RESET): + def cmd_fluid_leak_detector_override(self, detected: int, reset: int = NO_RESET) -> int: """ Constructs and sends the fluid leak detector state override command Constraints: @@ -106,7 +106,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_fluid_leak_state_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_fluid_leak_state_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the fluid leak state broadcast interval override command Constraints: Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -rf876b77eab64261c89b8928b038e18de8125742a -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision f876b77eab64261c89b8928b038e18de8125742a) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -102,6 +102,4 @@ self.cancellation_mode = cancellation_mode self.r1_level = r1 - self.r2_level = r2 - - + self.r2_level = r2 \ No newline at end of file Index: dialin/dg/heaters.py =================================================================== diff -u -rac32f68a7fa43d9631d35b07c554b6bcbea63937 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/heaters.py (.../heaters.py) (revision ac32f68a7fa43d9631d35b07c554b6bcbea63937) +++ dialin/dg/heaters.py (.../heaters.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -126,7 +126,7 @@ self.primary_heaters_target_temperature = primary_heaters_temp self.trimmer_heater_target_temperature = trimmer_heater_temp - def cmd_start_stop_primary_heater(self, state=HeatersStartStop.STOP.name): + def cmd_start_stop_primary_heater(self, state: int = HeatersStartStop.STOP.name) -> None: """ Constructs and sends a start/stop primary heater command Constraints: @@ -149,7 +149,7 @@ self.logger.debug(operation + " the Primary heater") self.can_interface.send(message, 0) - def cmd_start_stop_trimmer_heater(self, state=HeatersStartStop.STOP.name): + def cmd_start_stop_trimmer_heater(self, state: int = HeatersStartStop.STOP.name) -> None: """ Constructs and sends start trimmer heater command Constraints: @@ -172,7 +172,9 @@ self.logger.debug(operation + " the Primary heater") self.can_interface.send(message, 0) - def cmd_set_dialysate_target_temperature(self, primary_target_temp=37.0, trimmer_target_temp=38.0): + def cmd_set_dialysate_target_temperature(self, + primary_target_temp: float = 37.0, + trimmer_target_temp: float = 38.0) -> None: """ Constructs and sends primary and trimmer heater target temperature @@ -190,7 +192,7 @@ trimmer_target_temp)) self.can_interface.send(message, 0) - def cmd_heaters_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. Constraints: Index: dialin/dg/load_cells.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -128,7 +128,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_load_cell_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_load_cell_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the load cell data broadcast interval override command Constraints: Index: dialin/dg/pressures.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/pressures.py (.../pressures.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/pressures.py (.../pressures.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -102,16 +102,16 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - @param sensor: unsigned int - sensor ID - @param pressure: unsigned int - pressure (in PSI) - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - - \details pressure sensor IDs: \n + pressure sensor IDs: \n 0 = RO Pump Inlet \n 1 = RO Pump Outlet \n 2 = Drain Pump Inlet \n 3 = Drain Pump Outlet \n + + @param sensor: unsigned int - sensor ID + @param pressure: unsigned int - pressure (in PSI) + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) @@ -136,7 +136,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_pressure_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_pressure_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure override command. Constraints: Index: dialin/dg/ro_pump.py =================================================================== diff -u -rf89093ee0f0b9159df2ae4e0b86971f0e0e1b448 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision f89093ee0f0b9159df2ae4e0b86971f0e0e1b448) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -118,7 +118,7 @@ self.ro_pump_state = ROPumpStates(ro_state).name if ROPumpStates.has_value(ro_state) else 'State Unknown' self.target_flow_lpm = tgt_flow - def cmd_ro_pump_set_point_override(self, pressure, reset=NO_RESET): + def cmd_ro_pump_set_point_override(self, pressure: int, reset: int = NO_RESET) -> int: """ Constructs and sends the RO pump set point override command. Constraints: @@ -158,8 +158,15 @@ self.logger.debug("Timeout!!!!") return False - def cmd_ro_pump_duty_cycle_pct(self, duty): - # TODO add comments + def cmd_ro_pump_duty_cycle_pct(self, duty: float) -> int: + """ + Constructs and sends the set RO pump duty cycle message + Constraints: + Must be logged into DG. + + @param duty: integer - 1 percentage for duty cycle between 0 and 100 + @return: 1 if successful, zero otherwise + """ dc = float_to_bytearray(duty/100) payload = dc @@ -184,7 +191,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_ro_flow_rate_override(self, flow, reset=NO_RESET): + def cmd_ro_flow_rate_override(self, flow: float, reset: int = NO_RESET) -> int: """ Constructs and sends the RO rate override command. Constraints: @@ -224,7 +231,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_ro_pump_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_ro_pump_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the RO pump set point override command Constraints: Index: dialin/dg/thermistors.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/thermistors.py (.../thermistors.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/thermistors.py (.../thermistors.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -100,7 +100,7 @@ self.logger.debug("Themristors value override Timeout!!!") return False - def cmd_thermistors_data_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_thermistors_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the thermistors data publish interval command. Constraints: Index: dialin/dg/uv_reactors.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/uv_reactors.py (.../uv_reactors.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/uv_reactors.py (.../uv_reactors.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -191,7 +191,7 @@ """ Constructs and sends a start/stop command to the DG inlet UV reactor - @param: state: (int) the state of the inlet UV reactor. 0 for Off and 1 for On. + @param: state: (int) the state of the inlet UV reactor. 0 for Off (default) and 1 for On. @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(0) @@ -222,7 +222,7 @@ """ Constructs and sends a start/stop command to the DG outlet UV reactor - @param: state: (int) the state of the outlet UV reactor. 0 for Off and 1 for On. + @param: state: (int) the state of the outlet UV reactor. 0 for Off (default) and 1 for On. @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(0) Index: dialin/dg/valves.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/dg/valves.py (.../valves.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/dg/valves.py (.../valves.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -333,7 +333,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_valve_broadcast_interval_override(self, ms, reset=NO_RESET): + def cmd_valve_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the valve state override command. Constraints: Index: dialin/hd/fluid_leak.py =================================================================== diff -u -r2d2b6aef93215b733d10d32cefe233f23bdfbb66 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 2d2b6aef93215b733d10d32cefe233f23bdfbb66) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -15,7 +15,7 @@ ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFieldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgIdsDialin from .constants import RESET, NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r97592c35f4d79caf180f4bfc8f68bd4823829347 -r5aea950f649f72211632cbb17be314f3b4c24f10 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 97592c35f4d79caf180f4bfc8f68bd4823829347) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -45,10 +45,6 @@ RESPONSE_REJECTED = 0 RESPONSE_ACCEPTED = 1 - # start treatment command IDs - START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 0 - START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 1 - # HD version message field positions START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX END_POS_MAJOR = START_POS_MAJOR + 1 @@ -1193,17 +1189,11 @@ self.can_interface.send(message, 0) - def cmd_ui_start_treatment_request(self, cmnd: int = START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW) -> None: - + def cmd_ui_initiate_treatment_request(self, cmnd: int = 1) -> None: """ - Constructs and sends a ui start treatment command message - Constraints: - Command must be one of the following: - START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 0 - START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 1 + Constructs and sends a ui initiate treatment command - @param cmnd: (int) start treatment command code - + @param cmnd: (int) start treatment command code (1 = initiate, 0 = cancel) @return: None """ Index: tools/build_common_defs.py =================================================================== diff -u -rb6566527169163c6500c50891a501052288d7a7b -r5aea950f649f72211632cbb17be314f3b4c24f10 --- tools/build_common_defs.py (.../build_common_defs.py) (revision b6566527169163c6500c50891a501052288d7a7b) +++ tools/build_common_defs.py (.../build_common_defs.py) (revision 5aea950f649f72211632cbb17be314f3b4c24f10) @@ -71,7 +71,7 @@ print("Error reading in txt file: {0}".format(e)) return False - heapq.heapify(enums) + # TODO: match fw order current_time = datetime.now() code_header = \ @@ -103,8 +103,7 @@ # pop the enums from the min heap until its empty code = "" - while enums: - enum = heapq.heappop(enums) + for enum in enums: code += " {0} = {1}\n".format(enum[1], enum[0]) code_result += code