Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -rc7dcb245c2378b1c96eeaa02f120f61dff598b11 -r2205857f59dd884c4af450239381387cfb560c2e --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision c7dcb245c2378b1c96eeaa02f120f61dff598b11) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 2205857f59dd884c4af450239381387cfb560c2e) @@ -7,11 +7,11 @@ * * @file Temperature.c * -* @author (last) Vinayakam Mani -* @date (last) 23-Sep-2024 +* @author (last) Sean Nash +* @date (last) 09-Nov-2024 * -* @author (original) Vinayakam Mani -* @date (original) 23-Sep-2024 +* @author (original) Sean Nash +* @date (original) 09-Nov-2024 * ***************************************************************************/ @@ -48,16 +48,14 @@ static TEMPSENSORS_EXEC_STATES_T tempSensorsExecState; ///< TemperatureSensor exec state. static U32 startTime; ///< star time to read FPGA values. - static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter. -static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, - TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override. +static OVERRIDE_U32_T tempSensorsPublishInterval; ///< Temperature sensors publish time interval override. // ********** private function prototypes ********** static TEMPSENSORS_EXEC_STATES_T handleExecStart( void ); static TEMPSENSORS_EXEC_STATES_T handleExecGetADCValues( void ); -static void publishTemperatureSensorsData( void ); +//static void publishTemperatureSensorsData( void ); /*********************************************************************//** * @brief @@ -72,6 +70,11 @@ tempSensorsExecState = TEMPSENSORS_EXEC_STATE_START; dataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; + tempSensorsPublishInterval.data = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + tempSensorsPublishInterval.ovData = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + tempSensorsPublishInterval.ovInitData = 0; + tempSensorsPublishInterval.override = OVERRIDE_RESET; + // Initialize the temperature sensors initTemperatureSensors(); } @@ -84,26 +87,26 @@ * @details \b Outputs: none * @return tempSensorsSelfTestState which is the status of the self test *************************************************************************/ -SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void ) -{ - SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; +//SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void ) +//{ +// SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; +// +// //BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DD_TEMP_SENSORS_CAL_RECORD_T ), +// // NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DD_TEMPERATURE_SENSORS_INVALID_CAL_RECORD ); +// BOOL calStatus = TRUE; +// +// if ( TRUE == calStatus ) +// { +// result = SELF_TEST_STATUS_PASSED; +// } +// else +// { +// result = SELF_TEST_STATUS_FAILED; +// } +// +// return result; +//} - //BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DD_TEMP_SENSORS_CAL_RECORD_T ), - // NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DD_TEMPERATURE_SENSORS_INVALID_CAL_RECORD ); - BOOL calStatus = TRUE; - - if ( TRUE == calStatus ) - { - result = SELF_TEST_STATUS_PASSED; - } - else - { - result = SELF_TEST_STATUS_FAILED; - } - - return result; -} - /*********************************************************************//** * @brief * The execTemperatureSensors function executes the temperature sensors' @@ -135,16 +138,16 @@ break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE, tempSensorsExecState ); - tempSensorsExecState = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; +// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE, tempSensorsExecState ); +// tempSensorsExecState = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; break; } // Monitor the temperature values monitorTemperatureSenors(); // Publish the data - publishTemperatureSensorsData(); +// publishTemperatureSensorsData(); } /*********************************************************************//** @@ -159,17 +162,17 @@ { TEMPSENSORS_EXEC_STATES_T state = TEMPSENSORS_EXEC_STATE_START; - if ( 0 == startTime ) - { - startTime = getMSTimerCount(); - } - // A delay to let FPGA to boot up - else if ( TRUE == didTimeout( startTime, ADC_FPGA_READ_DELAY ) ) - { - startTime = 0; - setBaroSensorCoefficientReadStartTime(); - state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; - } +// if ( 0 == startTime ) +// { +// startTime = getMSTimerCount(); +// } +// // A delay to let FPGA to boot up +// else if ( TRUE == didTimeout( startTime, ADC_FPGA_READ_DELAY ) ) +// { +// startTime = 0; +// setBaroSensorCoefficientReadStartTime(); +// state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; +// } return state; } @@ -201,25 +204,25 @@ * data in a periodic interval. * @return none *************************************************************************/ -static void publishTemperatureSensorsData( void ) -{ - if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) ) - { - TEMPERATURE_SENSORS_DATA_T data; +//static void publishTemperatureSensorsData( void ) +//{ +// if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) ) +// { +// TEMPERATURE_SENSORS_DATA_T data; +// +// data.inletHeatExchanger = getTemperatureValue( TEMPSENSORS_INLET_HEAT_EXCHANGER ); +// data.outletHeatExchanger = getTemperatureValue( TEMPSENSORS_OUTLET_HEAT_EXCHANGER ); +// data.hydraulicsPrimaryHeater = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); +// data.trimmerHeater = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER ); +// data.boardTemp = getTemperatureValue( TEMPSENSORS_BOARD_TEMPERATURE ); +// data.baroTempSensor = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ); +// +// broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); +// dataPublicationTimerCounter = 0; +// } +//} - data.inletHeatExchanger = getTemperatureValue( TEMPSENSORS_INLET_HEAT_EXCHANGER ); - data.outletHeatExchanger = getTemperatureValue( TEMPSENSORS_OUTLET_HEAT_EXCHANGER ); - data.hydraulicsPrimaryHeater = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); - data.trimmerHeater = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER ); - data.boardTemp = getTemperatureValue( TEMPSENSORS_BOARD_TEMPERATURE ); - data.baroTempSensor = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ); - broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); - dataPublicationTimerCounter = 0; - } -} - - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ @@ -235,12 +238,12 @@ * (in ms) to override the temperature sensor data broadcast interval to. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) -{ - BOOL result = u32BroadcastIntervalOverride( message, &tempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); +//BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) +//{ +// BOOL result = u32BroadcastIntervalOverride( message, &tempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); +// +// return result; +//} - return result; -} - /**@}*/