Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -ra5b82c620e6a54f2b8559c54ffaa1a84e831d88e -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision a5b82c620e6a54f2b8559c54ffaa1a84e831d88e) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -364,7 +364,15 @@ SPARE5_VALV = 29 # Spare Valve 5 D100_VALV = 30 # Valve De-scaler (D100) SPARE7_VALV = 31 # Spare Valve 7 - NUM_OF_DD_VALVES = 32 # Number of Valves for the DD + M4_VALV = 32 # First IO valve (M4) + M12_VALV = 33 # Last IO valve IO valve (M12) + P11_VALV = 34 # First FP Valve (P11) + P33_VALV = 35 # FP Valve (P33) + P34_VALV = 36 # FP Valve (P34) + P37_VALV = 37 # FP Valve (P37) + P39_VALV = 38 # FP Valve (P39) + P6_VALV = 39 # Last FP Valve (P6) + NUM_OF_DD_VALVES = 40 # Number of Valves for the DD @unique class DDNotLegalStates(DialinEnum): Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rc4579da3bd8c483e8675f2894901d3dcdbea7b99 -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision c4579da3bd8c483e8675f2894901d3dcdbea7b99) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -217,7 +217,7 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005 MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006 MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007 - MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008 + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008 MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009 MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rd2697fb12fc381fed6e7fb0820ec6486513243f6 -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -139,45 +139,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_pressure_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the pressure sensor read counter override command - Constraints: - Must be logged into DD. - - @param sensor: unsigned int - sensor ID - @param counter: integer - read count to override sensor with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - - """ - - reset_byte_array = integer_to_bytearray(reset) - read_byte_array = integer_to_bytearray(counter) - sensor_byte_array = integer_to_bytearray(sensor) - payload = reset_byte_array + read_byte_array + sensor_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST.value, - payload=payload) - - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(sensor) + " psi" - self.logger.debug("override read counter value for pressure sensor " + str(sensor) + ": " + str_res) - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False - def cmd_pressure_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure sensor error counter override command.