Index: dialin/common/dg_defs.py =================================================================== diff -u -rdbad9b7e15a64dff87ea2be5c359de71b01ffa0f -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision dbad9b7e15a64dff87ea2be5c359de71b01ffa0f) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27) @@ -78,12 +78,11 @@ @unique class DGStandByModeStates(DialinEnum): - DG_STANDBY_MODE_STATE_START = 0 # Start standby mode state - DG_STANDBY_MODE_STATE_IDLE = 1 # Idle standby mode state - DG_STANDBY_MODE_STATE_FLUSH_FILTER = 2 # Sample water flush filter state - DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE = 3 # Sample water flush filter idle state - DG_STANDBY_MODE_STATE_SAMPLE_WATER = 4 # Sample water state - NUM_OF_DG_STANDBY_MODE_STATES = 5 # Number of standby mode states + DG_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state + DG_STANDBY_MODE_STATE_FLUSH_FILTER = 1 # Sample water flush filter state + DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE = 2 # Sample water flush filter idle state + DG_STANDBY_MODE_STATE_SAMPLE_WATER = 3 # Sample water state + NUM_OF_DG_STANDBY_MODE_STATES = 4 # Number of standby mode states @unique Index: dialin/common/msg_ids.py =================================================================== diff -u -r4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27) @@ -389,7 +389,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030 + MSG_ID____AVAILABLE_5 = 0xA030 MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031 MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032 MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033 Index: dialin/dg/temperatures.py =================================================================== diff -u -r60370a4f074468071c066d70d58a1ab58696d442 -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 --- dialin/dg/temperatures.py (.../temperatures.py) (revision 60370a4f074468071c066d70d58a1ab58696d442) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27) @@ -47,6 +47,7 @@ INTERNAL_TDI_RTD = 17 INTERNAL_THD_RTD = 18 INTERNAL_COND_TEMP_SENSOR = 19 + BARO_TEMP_SENSOR = 20 class TemperatureSensors(AbstractSubSystem): @@ -76,16 +77,9 @@ DGTemperaturesNames.LOAD_CELL_A2_B2.name: 0.0, DGTemperaturesNames.INTERNAL_THDO_RTD.name: 0.0, DGTemperaturesNames.INTERNAL_TDI_RTD.name: 0.0, - DGTemperaturesNames.INTERNAL_THD_RTD.name: 0.0, - DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name: 0.0} + DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name: 0.0, + DGTemperaturesNames.BARO_TEMP_SENSOR.name: 0.0} - self.primary_raw_thermo_couple = 0 - self.primary_raw_cold_junc = 0 - self.trimmer_raw_thermo_couple = 0 - self.trimmer_raw_cold_junc = 0 - self.conductivity_1_raw = 0 - self.conductivity_2_raw = 0 - if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value @@ -101,8 +95,7 @@ """ return self.temperatures[DGTemperaturesNames(sensor).name] - @publish(["temperatures", "primary_raw_thermo_couple", "primary_raw_cold_junc", "trimmer_raw_thermo_couple", - "trimmer_raw_cold_junc", "conductivity_1_raw", "conductivity_2_raw"]) + @publish(["temperatures"]) def _handler_temperature_sensors_sync(self, message): """ Handles published temperature sensors message @@ -167,27 +160,9 @@ self.temperatures[DGTemperaturesNames.INTERNAL_THD_RTD.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.temperatures[DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name] = struct.unpack('f', bytearray( + self.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] - self.primary_raw_thermo_couple = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] - - self.primary_raw_cold_junc = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] - - self.trimmer_raw_thermo_couple = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] - - self.trimmer_raw_cold_junc = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] - - self.conductivity_1_raw = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25]))[0] - - self.conductivity_2_raw = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_26:MsgFieldPositions.END_POS_FIELD_26]))[0] - def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. @@ -252,10 +227,17 @@ 13 = FPGA board 14 = Load cell A1/B1 15 = Load cell A2/B2 +<<<<<<< HEAD 16 = Internal TRo RTD 17 = Internal TDi RTD 18 = Internal THd RTD 19 = Internal conductivity temp sensor +======= + 16 = Internal THDO RTD + 17 = Internal TDI RTD + 18 = Internal conductivity temp sensor + 19 = Barometric temperature sensor +>>>>>>> DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 """ rst = integer_to_bytearray(reset) value = float_to_bytearray(sensor_value) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r68b0243e27e4a5b5b796090b41c5755e207a4a45 -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 68b0243e27e4a5b5b796090b41c5755e207a4a45) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27) @@ -69,9 +69,9 @@ # It creates a folder called DG_NV_Records in the destination that is called # If no address is provided, the default location is one folder above the dialin folder wherever it is installed # in you computer. - #hd.system_record.cmd_get_hd_system_record_report() + hd.system_record.cmd_get_hd_system_record_report() - hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-09-26-HD-Record.xlsx') + #hd.system_record.cmd_set_hd_system_record_excel_to_fw('/home/fw/projects/HD_NV_Records/2022-09-26-HD-Record.xlsx') # For resetting the system record to benign values, use the function below #hd.system_record.cmd_reset_hd_system_record()