Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r8e3ce4e082f70e12b48d796c518994662f7668b3 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 8e3ce4e082f70e12b48d796c518994662f7668b3) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -265,7 +265,8 @@ D41_PRES = 4 # Transmembrane pressure (Ptm) NUM_OF_PRESSURE_SENSORS = 5 # Number of pressure sensors -COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Sensors +COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Readings +PRES_SENSOR_INDEX_OFFSET = 15 # Pressure Sensors Offset for Temperature Readings @unique class DDTemperaturesNames(DialinEnum): @@ -284,11 +285,12 @@ D50_AVG_TEMP = 12 # D50 Filtered value D28_AVG_TEMP = 13 # D28 Filtered value D30_AVG_TEMP = 14 # D30 Filtered value - D66_TEMP = 15 # D66 Pressure sensor temperature value - D51_TEMP = 16 # D51 Pressure sensor temperature value - D18_TEMP = 17 # D18 Pressure sensor temperature value - D41_TEMP = 18 # D41 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors + D9_TEMP = 15 # D9 Pressure sensor temperature value + D66_TEMP = 16 # D66 Pressure sensor temperature value + D51_TEMP = 17 # D51 Pressure sensor temperature value + D18_TEMP = 18 # D18 Pressure sensor temperature value + D41_TEMP = 19 # D41 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 20 # Number of Temperature Sensors @unique class DDValveStates(DialinEnum): Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -75,12 +75,6 @@ NUM_OF_FP_FLOW_SENSORS = 2 # Number of FP Flow Sensors @unique -class FPFlowSensorAttributesEnum(DialinEnum): - FLOW = 0 # Flow attribute for FP Flow Sensors - TEMP = 1 # Temperature attribute for FP Flow Sensors - NUM_OF_FP_FLOW_ATTRIBUTES = 2 # Number of FP Flow Sensor attributes - -@unique class FPFloaterLevels(DialinEnum): LEVEL_STATE_LOW = 0 # Low level for the FP Floater Level Sensors LEVEL_STATE_MEDIUM = 1 # Medium level for the FP Floater Level Sensors @@ -120,6 +114,11 @@ FB_DUTY_CYCLE_PCT = 8 # Feedback Duty Cycle Percentage attribute for pumps NUM_OF_RO_PUMP_ATTRIBUTES = 9 # Number of pump attributes +BETA_CONDUCTIVITY_SENSOR_OFFSET = 3 # Offset to translate Dialin FPTemperaturesNames to DD firmware ConductivitySensors enum +BETA_FLOW_SENSOR_OFFSET = 7 # Offset to translate Dialin FPTemperaturesNames to DD firmware FlowSensors enum +BETA_IO_PRES_SENSOR_OFFSET = 5 # Offset to translate Dialin FPTemperaturesNames to DD firmware PressureSensors enum +BETA_FP_PRES_SENSOR_OFFSET = 3 # Offset to translate Dialin FPTemperaturesNames to DD firmware PressureSensors enum + @unique class FPTemperaturesNames(DialinEnum): M1_TEMP = 0 # Temperature before pressure regulator (M1) Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -169,47 +169,6 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_temperature_override(self, sensor_index: int, temperature: float, reset: int = NO_RESET) -> int: - """ - Constructs and sends the conductivity temperature override command - Constraints: - Must be logged into DD. - Given sensor_index must be one of the sensors defined in ConductivitySensorsEnum - - @param sensor_index: unsigned int - index of the sensor - @param temperature: float - temperature value 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) - temp_byte_array = float_to_bytearray(temperature) - sensor_byte_array = integer_to_bytearray(sensor_index) - payload = reset_byte_array + temp_byte_array + sensor_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, - payload=payload) - - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(temperature) - self.logger.debug("override temperature value for conductivity sensor " + DDConductivitySensorsEnum[str(sensor_index)].name - + ": " + 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_conductivity_sensor_read_counter_override(self, sensor_index: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity read counter override command Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -151,40 +151,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 @@ -295,38 +261,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 Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -19,7 +19,7 @@ from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import COND_SENSOR_INDEX_OFFSET, DDTemperaturesNames +from leahi_dialin.common.dd_defs import COND_SENSOR_INDEX_OFFSET, PRES_SENSOR_INDEX_OFFSET, DDTemperaturesNames from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -119,18 +119,21 @@ self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] + self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] + self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: @@ -184,21 +187,31 @@ rst = integer_to_bytearray(reset) value = float_to_bytearray(sensor_value) + # DD Conductivity Sensors' Temperature Reading Override if DDTemperaturesNames.D16_TEMP.value <= sensor_index <= DDTemperaturesNames.D75_TEMP.value: index = integer_to_bytearray((sensor_index - COND_SENSOR_INDEX_OFFSET)) payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) + # DD Pressure Sensors' Temperature Reading Override + elif DDTemperaturesNames.D9_TEMP.value <= sensor_index < DDTemperaturesNames.NUM_OF_TEMP_SENSORS.value: + index = integer_to_bytearray((sensor_index - PRES_SENSOR_INDEX_OFFSET)) + payload = rst + value + index + 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) + + # DD Temperature Sensors' Temperature Reading Override else: index = integer_to_bytearray(sensor_index) payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("Setting sensor {} to {} C".format(sensor_index, sensor_value)) + self.logger.debug("Setting sensor {} to {} C".format(DDTemperaturesNames[str(sensor_index)].name, sensor_value)) # Send message received_message = self.can_interface.send(message) @@ -310,4 +323,38 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.error("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, use the index of DDTemperaturesNames + @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 - PRES_SENSOR_INDEX_OFFSET) + 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 sensor filtered 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 Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -49,14 +49,8 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_flow_data, self._handler_flow_sensor_sync) self.fp_flows = { - FPFlowSensorNames.P7_FLOW.name: { - FPFlowSensorAttributesEnum.FLOW.name: 0.0, - FPFlowSensorAttributesEnum.TEMP.name: 0.0 - }, - FPFlowSensorNames.P16_FLOW.name: { - FPFlowSensorAttributesEnum.FLOW.name: 0.0, - FPFlowSensorAttributesEnum.TEMP.name: 0.0 - } + FPFlowSensorNames.P7_FLOW.name: 0.0, + FPFlowSensorNames.P16_FLOW.name: 0.0 } self.fp_flow_timestamp = 0 @@ -69,14 +63,10 @@ @param message: published flow sensor data message @returns none """ - self.fp_flows[FPFlowSensorNames.P7_FLOW.name][FPFlowSensorAttributesEnum.FLOW.name] = struct.unpack('f', bytearray( + self.fp_flows[FPFlowSensorNames.P7_FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_flows[FPFlowSensorNames.P16_FLOW.name][FPFlowSensorAttributesEnum.FLOW.name] = struct.unpack('f', bytearray( + self.fp_flows[FPFlowSensorNames.P16_FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_flows[FPFlowSensorNames.P7_FLOW.name][FPFlowSensorAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.fp_flows[FPFlowSensorNames.P16_FLOW.name][FPFlowSensorAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.fp_flow_timestamp = timestamp Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) @@ -18,7 +18,7 @@ from logging import Logger from .constants import NO_RESET, RESET -from leahi_dialin.common.fp_defs import FPTemperaturesNames +from leahi_dialin.common.fp_defs import FPTemperaturesNames, BETA_CONDUCTIVITY_SENSOR_OFFSET, BETA_FLOW_SENSOR_OFFSET, BETA_IO_PRES_SENSOR_OFFSET, BETA_FP_PRES_SENSOR_OFFSET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -141,24 +141,39 @@ """ rst = integer_to_bytearray(reset) value = float_to_bytearray(sensor_value) - index = integer_to_bytearray(sensor_index) - payload = rst + value + index - if sensor_index <= FPTemperaturesNames.P19_TEMP.value: + # FP Conductivity Sensors' Temperature Override + if FPTemperaturesNames.P10_TEMP.value <= sensor_index <= FPTemperaturesNames.P19_TEMP.value: + index = integer_to_bytearray(sensor_index + BETA_CONDUCTIVITY_SENSOR_OFFSET) + payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value, payload=payload) + # FP Flow Sensors' Temperature Override elif FPTemperaturesNames.P7_TEMP.value <= sensor_index < FPTemperaturesNames.NUM_OF_TEMPERATURE_SENSORS.value: + index = integer_to_bytearray(sensor_index - BETA_FLOW_SENSOR_OFFSET) + payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST.value, payload=payload) - else: # the remaining sensors are sent to the pressure temp override + # IO Pressure Sensors' Temperature Override + elif FPTemperaturesNames.M1_TEMP.value <= sensor_index <= FPTemperaturesNames.M3_TEMP.value: + index = integer_to_bytearray(sensor_index + BETA_IO_PRES_SENSOR_OFFSET) + payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, payload=payload) + # FP Pressure Sensors' Temperature Override + else: + index = integer_to_bytearray(sensor_index + BETA_FP_PRES_SENSOR_OFFSET) + payload = rst + value + index + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, + payload=payload) + self.logger.debug("Setting sensor {} to {} C".format(FPTemperaturesNames[str(sensor_index)].name, sensor_value)) # Send message