Index: dialin/dg/accelerometer.py =================================================================== diff -u -r3a5030c08d57bddc2c22dca05d1070375e3cb5f7 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision 3a5030c08d57bddc2c22dca05d1070375e3cb5f7) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -124,14 +124,14 @@ message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) - def cmd_accel_vector_override(self, mag, axis, reset=NO_RESET): + def cmd_accel_vector_override(self, axis: int, mag: int, reset: int = NO_RESET) -> int: """ Constructs and sends the accelerometer vector override command Constraints: Must be logged into DG. - @param mag: float - axis magnitude (in g) to override with @param axis: integer - accelerometer axis to override + @param mag: float - axis magnitude (in g) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ @@ -164,14 +164,14 @@ self.logger.debug("Timeout!!!!") return False - def cmd_accel_max_vector_override(self, mag, axis, reset=NO_RESET): + def cmd_accel_max_vector_override(self, axis: int, mag: float, reset: int = NO_RESET) -> int: """ Constructs and sends the accelerometer maximum vector override command Constraints: Must be logged into DG. - @param mag: float - axis magnitude (in g) to override with @param axis: integer - accelerometer axis to override + @param mag: float - axis magnitude (in g) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ Index: dialin/dg/alarms.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/alarms.py (.../alarms.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/alarms.py (.../alarms.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -93,16 +93,16 @@ alarm_id = struct.unpack(' int: """ Constructs and sends the alarm state override command Constraints: Must be logged into DG. Given alarm must be valid. If inactivating alarm, given alarm must be recoverable (clearable). - @param state: integer - 1 for alarm active, 0 for alarm inactive @param alarm: integer - ID of alarm to override + @param state: integer - 1 for alarm active, 0 for alarm inactive @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ Index: dialin/dg/concentrate_pumps.py =================================================================== diff -u -r1c9a9880efbed5a1ba31eb231c274aaae78d30eb -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 1c9a9880efbed5a1ba31eb231c274aaae78d30eb) +++ dialin/dg/concentrate_pumps.py (.../concentrate_pumps.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -126,12 +126,12 @@ self.logger.error("Timeout!!!!") return False - def cmd_concentrate_pump_target_speed_override(self, speed, pump_id): + def cmd_concentrate_pump_target_speed_override(self, pump_id: int, speed: float) -> int: """ Constructs and sends the concentrate pump target speed override command - @param speed: float - target speed value to override concentrate pump with @param pump_id: unsigned int - concentrate pump ID + @param speed: float - target speed value to override concentrate pump with @return: 1 if successful, zero otherwise Concentrate pump IDs: \n @@ -161,12 +161,12 @@ self.logger.error("Timeout!!!!") return False - def cmd_concentrate_pump_measured_speed_override(self, speed, pump_id, reset=NO_RESET): + def cmd_concentrate_pump_measured_speed_override(self, pump_id: int, speed: float, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump measured speed override command - @param speed: float - measured speed value to override concentrate pump with @param pump_id: unsigned int - concentrate pump ID + @param speed: float - measured speed value to override concentrate pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -r5d36fab08811664f85c4de033dc34c51cc9bb9a4 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 5d36fab08811664f85c4de033dc34c51cc9bb9a4) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -94,12 +94,12 @@ self.conductivity_sensor_cd1 = cd1[0] self.conductivity_sensor_cd2 = cd2[0] - def cmd_conductivity_sensor_override(self, conductivity, sensor, reset=NO_RESET): + def cmd_conductivity_sensor_override(self, sensor: int, conductivity: float, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command - @param conductivity: float - conductivity value to override sensor with @param sensor: unsigned int - sensor ID + @param conductivity: float - conductivity value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Index: dialin/dg/load_cells.py =================================================================== diff -u -r680ab4c35b3902a5397513ef93c97f8b7a6daca8 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 680ab4c35b3902a5397513ef93c97f8b7a6daca8) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -87,15 +87,15 @@ self.load_cell_B1 = b1[0] self.load_cell_B2 = b2[0] - def cmd_load_cell_override(self, grams, sensor, reset=NO_RESET): + def cmd_load_cell_override(self, sensor: int, grams: float, reset: int = NO_RESET) -> int: """ Constructs and sends the load cell override command Constraints: Must be logged into DG. Given sensor must be one of the sensors listed below. - @param grams: float - weight (in grams) to override sensor with @param sensor: unsigned int - sensor ID + @param grams: float - weight (in grams) to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Index: dialin/dg/pressures.py =================================================================== diff -u -r2c534eec470fca0bda0b365fc4ae5e4b3d9a8059 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/pressures.py (.../pressures.py) (revision 2c534eec470fca0bda0b365fc4ae5e4b3d9a8059) +++ dialin/dg/pressures.py (.../pressures.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -95,15 +95,15 @@ self.drain_pump_inlet_pressure = dri[0] self.drain_pump_outlet_pressure = dro[0] - def cmd_pressure_override(self, pressure, sensor, reset=NO_RESET): + def cmd_pressure_override(self, sensor: int, pressure: int, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure override command. Constraints: Must be logged into DG. Given sensor must be one of the sensors listed below. - @param pressure: unsigned int - pressure (in PSI) @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 Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r2547391a5b9dd00230b8238dba5d0ae6caf2e4c6 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 2547391a5b9dd00230b8238dba5d0ae6caf2e4c6) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -200,7 +200,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_temperature_sensors_override_value(self, sensor_value, sensor_index, reset=NO_RESET): + def cmd_temperature_sensors_override_value(self, sensor_index: int, sensor_value: float, reset: int = NO_RESET) -> int: """ Constructs and sends the value override of a temperature sensor. Constraints: Index: dialin/dg/thermistors.py =================================================================== diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/thermistors.py (.../thermistors.py) (revision 18c04cbcd10619250868cec39470a2b29c86121b) +++ dialin/dg/thermistors.py (.../thermistors.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -70,7 +70,7 @@ self.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_1.name] = pwr_supply_1 self.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_2.name] = pwr_supply_2 - def cmd_thermistors_value_override(self, value, thermistor, reset=NO_RESET): + def cmd_thermistors_value_override(self, thermistor: int, value: float, reset: int = NO_RESET) -> int: """ Constructs and sends the thermistors value override command Constraints: @@ -79,6 +79,7 @@ @param value: float the temperature to be set @param thermistor: (int) thermistor index @param reset: (int) 1 to reset a previous override, 0 to override + @return 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) vlu = float_to_bytearray(value) Index: dialin/dg/uv_reactors.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/uv_reactors.py (.../uv_reactors.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/dg/uv_reactors.py (.../uv_reactors.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -152,7 +152,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_uv_reactors_health_override(self, health, reactor, reset=NO_RESET): + def cmd_uv_reactors_health_override(self, reactor: int, health: int, reset: int = NO_RESET) -> int: """ Constructs and sends the UV reactors' health override command. Constraints: @@ -161,6 +161,7 @@ @param reactor: (int) UV reactor index @param health: (int) 0 for unhealthy and 1 for healthy @param reset: (int) 0 for no reset and 1 for reset + @return 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) rctr = integer_to_bytearray(reactor) Index: dialin/dg/valves.py =================================================================== diff -u -rdd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/dg/valves.py (.../valves.py) (revision dd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37) +++ dialin/dg/valves.py (.../valves.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -283,15 +283,15 @@ self.valve_states_enum[self.VALVE_RESERVOIR_2] = self._binary_to_valve_state(vst[0] & 2048) # VR2 self.valve_states_enum[self.VALVE_PRODUCTION_DRAIN] = VPdStates(self._binary_to_valve_state(vst[0] & 4096)).name # VPD - def cmd_valve_override(self, state, valve, reset=NO_RESET): + def cmd_valve_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int: """ Constructs and sends the valve state override command. Constraints: Must be logged into DG. Given valve ID must be one of the valve IDs listed below. - @param state: bool - valve state @param valve: unsigned int - valve ID + @param state: bool - valve state @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Index: dialin/hd/accelerometer.py =================================================================== diff -u -r2e392c92d55178f457a67423ba8c503a86dcf3c8 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision 2e392c92d55178f457a67423ba8c503a86dcf3c8) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -124,14 +124,14 @@ message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) - def cmd_accel_vector_override(self, mag: float, axis: int, reset: int=NO_RESET) -> int: + def cmd_accel_vector_override(self, axis: int, mag: float, reset: int=NO_RESET) -> int: """ Constructs and sends the accelerometer vector override command Constraints: Must be logged into HD. - @param mag: float - axis magnitude (in g) to override with @param axis: integer - accelerometer axis to override + @param mag: float - axis magnitude (in g) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ @@ -164,14 +164,14 @@ self.logger.debug("Timeout!!!!") return False - def cmd_accel_max_vector_override(self, mag: float, axis: int, reset: int=NO_RESET) -> int: + def cmd_accel_max_vector_override(self, axis: int, mag: float, reset: int=NO_RESET) -> int: """ Constructs and sends the accelerometer maximum vector override command Constraints: Must be logged into HD. - @param mag: float - axis magnitude (in g) to override with @param axis: integer - accelerometer axis to override + @param mag: float - axis magnitude (in g) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ Index: dialin/hd/air_trap.py =================================================================== diff -u -r2e392c92d55178f457a67423ba8c503a86dcf3c8 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/hd/air_trap.py (.../air_trap.py) (revision 2e392c92d55178f457a67423ba8c503a86dcf3c8) +++ dialin/hd/air_trap.py (.../air_trap.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -98,15 +98,15 @@ self.lower_level = lower[0] self.upper_level = upper[0] - def cmd_air_trap_level_sensor_override(self, detected: int, sensor: int, reset: int = NO_RESET) -> int: + def cmd_air_trap_level_sensor_override(self, sensor: int, detected: int, reset: int = NO_RESET) -> int: """ Constructs and sends the air trap level sensor override command Constraints: Must be logged into HD. Given sensor must be one of the sensors listed below. - @param detected: unsigned int - detected (0=air, 1=fluid) to override sensor with @param sensor: unsigned int - sensor ID + @param detected: unsigned int - detected (0=air, 1=fluid) to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Index: dialin/hd/alarms.py =================================================================== diff -u -r2e392c92d55178f457a67423ba8c503a86dcf3c8 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/hd/alarms.py (.../alarms.py) (revision 2e392c92d55178f457a67423ba8c503a86dcf3c8) +++ dialin/hd/alarms.py (.../alarms.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -282,16 +282,16 @@ return 1 == received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] return False - def cmd_alarm_state_override(self, state: int, alarm: int, reset: int = NO_RESET) -> int: + def cmd_alarm_state_override(self, alarm: int, state: int, reset: int = NO_RESET) -> int: """ Constructs and sends the alarm state override command Constraints: Must be logged into HD. Given alarm must be valid. If inactivating alarm, given alarm must be recoverable (clearable). - @param state: integer - 1 for alarm active, 0 for alarm inactive @param alarm: integer - ID of alarm to override + @param state: integer - 1 for alarm active, 0 for alarm inactive @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ @@ -319,15 +319,15 @@ return 1 == received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] return False - def cmd_alarm_time_override(self, time_ms: int, alarm: int, reset: int = NO_RESET) -> int: + def cmd_alarm_time_override(self, alarm: int, time_ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the alarm time override command Constraints: Must be logged into HD. Given alarm must be valid. - @param time_ms: integer - time (in ms) since alarm was activated @param alarm: integer - ID of alarm to override + @param time_ms: integer - time (in ms) since alarm was activated @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r2e392c92d55178f457a67423ba8c503a86dcf3c8 -r0f4ba40a63c79697d979203f67ef0338a12cae23 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 2e392c92d55178f457a67423ba8c503a86dcf3c8) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 0f4ba40a63c79697d979203f67ef0338a12cae23) @@ -477,16 +477,16 @@ self.logger.debug("Timeout!!!!") return False - def cmd_dialysate_outlet_pump_load_cell_weight_override(self, weight: float, sensor: int, reset: int = NO_RESET) -> int: + def cmd_dialysate_outlet_pump_load_cell_weight_override(self, sensor: int, weight: float, reset: int = NO_RESET) -> int: """ Constructs and sends the measured load cell weight override command. Constraints: Must be logged into HD. Given sensor must be one of the sensors listed below. - @param weight: float - weight (in g) to override with - @param sensor: integer - ID of load cell to override - @param reset: integer - 1 to reset a previous override, 0 to override + @param sensor: integer - ID of load cell to override + @param weight: float - weight (in g) to override with + @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise Load Cells: \n