Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r82b297112cb6098c63938b45e1e2b6099f460697 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 82b297112cb6098c63938b45e1e2b6099f460697) @@ -49,34 +49,13 @@ self._handler_pressures_sync) self.dd_pressures = { - DDPressureNames.M1_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.M3_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D9_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D66_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D51_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D18_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - }, - DDPressureNames.D41_PRES.name: { - DDPressureAttributesEnum.PRES.name: 0.0, - DDPressureAttributesEnum.TEMP.name: 0.0 - } + DDPressureNames.M1_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.M3_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.D9_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.D66_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.D51_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.D18_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 }, + DDPressureNames.D41_PRES.name: { DDPressureAttributesEnum.PRES.name: 0.0 } } self.dd_pressures_timestamp = 0 @@ -104,20 +83,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_pressures[DDPressureNames.M1_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_pressures[DDPressureNames.M3_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_pressures[DDPressureNames.D9_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_pressures[DDPressureNames.D66_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_pressures[DDPressureNames.D51_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.dd_pressures[DDPressureNames.D18_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] self.dd_pressures_timestamp = timestamp @@ -192,40 +157,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_pressure_temperature_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: - """ - Constructs and sends the pressure temperature override command. - Constraints: - Must be logged into DD. - - @param sensor: unsigned int - sensor ID - @param temperature: float - 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) - tmp = float_to_bytearray(temperature) - idx = integer_to_bytearray(sensor) - payload = rst + tmp + idx - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override pressure temperature") - - # 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.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 @@ -336,38 +267,4 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.debug("Timeout!!!!") - return False - - def cmd_pressure_filtered_temperature_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: - """ - Constructs and sends the filtered temperature override command. - Constraints: - Must be logged into DD. - - @param sensor: unsigned int - sensor ID - @param temperature: float - temperature to override the sensor with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - - rst = integer_to_bytearray(reset) - tmp = float_to_bytearray(temperature) - idx = integer_to_bytearray(sensor) - payload = rst + tmp + idx - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override pressure temperature") - - # 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.debug("Timeout!!!!") return False \ No newline at end of file