Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r2205857f59dd884c4af450239381387cfb560c2e -r340b6bedc5aac2ad47364ade48a842f00b12b8fe --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 2205857f59dd884c4af450239381387cfb560c2e) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) @@ -55,7 +55,7 @@ static TEMPSENSORS_EXEC_STATES_T handleExecStart( void ); static TEMPSENSORS_EXEC_STATES_T handleExecGetADCValues( void ); -//static void publishTemperatureSensorsData( void ); +static void publishTemperatureSensorsData( void ); /*********************************************************************//** * @brief @@ -147,7 +147,7 @@ monitorTemperatureSenors(); // Publish the data -// publishTemperatureSensorsData(); + publishTemperatureSensorsData(); } /*********************************************************************//** @@ -162,17 +162,16 @@ { 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; + state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; + } return state; } @@ -204,25 +203,22 @@ * data in a periodic interval. * @return none *************************************************************************/ -//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; -// } -//} +static void publishTemperatureSensorsData( void ) +{ + if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) ) + { + TEMPERATURE_SENSORS_DATA_T data; + data.tempTRO1 = getTemperatureValue( TEMP_SENSOR_TRO1 ); + data.tempTRO1 = getTemperatureValue( TEMP_SENSOR_TRO2 ); + data.boardTemp = 0.0F; // TODO + broadcastData( MSG_ID_RO_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); + dataPublicationTimerCounter = 0; + } +} + + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ @@ -231,19 +227,19 @@ /*********************************************************************//** * @brief * The testTemperatureSensorsDataPublishIntervalOverride function overrides the - * temperature sensor data publish interval. + * temperature sensors data publish interval. * @details \b Inputs: none * @details \b Outputs: tempSensorsPublishInterval * @param Override message from Dialin which includes the interval * (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 ); -// -// return result; -//} +BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) +{ + BOOL result = u32BroadcastIntervalOverride( message, &tempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); + return result; +} + /**@}*/