Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r387ea33c2e45705550905bc1a97e13db1cc95bf8 -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 387ea33c2e45705550905bc1a97e13db1cc95bf8) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) @@ -17,10 +17,13 @@ #include "BalancingChamber.h" #include "ConductivitySensors.h" +#include "Conductivity.h" +#include "Flow.h" #include "Messaging.h" #include "MessageSupport.h" #include "OperationModes.h" #include "PersistentAlarm.h" +#include "Pressure.h" #include "Temperature.h" #include "Timers.h" #include "TaskPriority.h" @@ -95,9 +98,12 @@ static U32 d50TempSamplesNextIndex; ///< D50 temperature sample next index number. static U32 d50TempCount; ///< D50 Number of samples in average buffer. -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 U32 ddTempDataPublicationTimerCounter; ///< DD Temperature sensors data publish timer counter. +static U32 fpTempDataPublicationTimerCounter; ///< FP Temperature sensors data publish timer counter. +static OVERRIDE_U32_T ddTempSensorsPublishInterval; ///< DD Temperature sensors publish time interval override. +static OVERRIDE_U32_T fpTempSensorsPublishInterval; ///< FPppp Temperature sensors publish time interval override. +//static OVERRIDE_U32_T ddTempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, +// TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override. // ********** private function prototypes ********** @@ -106,8 +112,8 @@ static void filterTemperatureReadings( void ); static void filterDialTemperatureReadings( void ); static void getTempMovingAverageTimeInterval( void ); -static void publishTemperatureSensorsData( void ); - +static void publishDDTemperatureSensorsData( void ); +static void publishFPTemperatureSensorsData( void ); /*********************************************************************//** * @brief * The initTemperature function initializes the temperature unit. @@ -117,24 +123,34 @@ *************************************************************************/ void initTemperature( void ) { - startTime = 0; - tempSensorsExecState = TEMPSENSORS_EXEC_STATE_START; - dataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; - d4TempRunningSumC = 0.0F; - d4TempAvgC = 0.0F; - d4TempSamplesNextIndex = 0; - d4TempCount = 0; - d50TempRunningSumC = 0.0F; - d50TempAvgC = 0.0F; - d50TempSamplesNextIndex = 0; - d50TempCount = 0; - d4TempSampleIntervalCounter = 0; - tempDataColTimeInterval = 0; - tempDriftEventCheck = FALSE; + startTime = 0; + tempSensorsExecState = TEMPSENSORS_EXEC_STATE_START; + ddTempDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; + fpTempDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; + d4TempRunningSumC = 0.0F; + d4TempAvgC = 0.0F; + d4TempSamplesNextIndex = 0; + d4TempCount = 0; + d50TempRunningSumC = 0.0F; + d50TempAvgC = 0.0F; + d50TempSamplesNextIndex = 0; + d50TempCount = 0; + d4TempSampleIntervalCounter = 0; + tempDataColTimeInterval = 0; + tempDriftEventCheck = FALSE; dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempColHasTimerBeenSet = FALSE; dialTempMovingAvgData[ DIAL_TEMP_D30 ].dialTempColHasTimerBeenSet = FALSE; + ddTempSensorsPublishInterval.data = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + ddTempSensorsPublishInterval.ovData = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + ddTempSensorsPublishInterval.ovInitData = 0; + ddTempSensorsPublishInterval.override = OVERRIDE_RESET; + + fpTempSensorsPublishInterval.data = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + fpTempSensorsPublishInterval.ovData = TEMP_SENSORS_DATA_PUBLISH_INTERVAL; + fpTempSensorsPublishInterval.ovInitData = 0; + fpTempSensorsPublishInterval.override = OVERRIDE_RESET; // Initialize the temperature sensors initTemperatureSensors(); @@ -216,7 +232,8 @@ filterTemperatureReadings(); // Publish the data - publishTemperatureSensorsData(); + publishDDTemperatureSensorsData(); + publishFPTemperatureSensorsData(); } /*********************************************************************//** @@ -428,19 +445,19 @@ /*********************************************************************//** * @brief - * The publishTemperatureSensorsData function broadcasts the temperature - * sensors data at the publication interval. - * @details \b Inputs: dataPublicationTimerCounter and publish interval time. - * @details \b Outputs: dataPublicationTimerCounter + * The publishDDTemperatureSensorsData function broadcasts the DD + * temperature sensors data at the publication interval. + * @details \b Inputs: ddTempDataPublicationTimerCounter and publish interval time. + * @details \b Outputs: ddTempDataPublicationTimerCounter * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA publishes the temperature * data in a periodic interval. * @return none *************************************************************************/ -static void publishTemperatureSensorsData( void ) +static void publishDDTemperatureSensorsData( void ) { - if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) ) + if ( ++ddTempDataPublicationTimerCounter >= getU32OverrideValue( &ddTempSensorsPublishInterval ) ) { - TEMPERATURE_SENSORS_DATA_T data; + TEMPERATURE_SENSORS_DD_DATA_T data; data.d1Temp = getTemperatureValue( D1_TEMP ); data.x6Temp = getTemperatureValue( X6_TEMP ); @@ -458,33 +475,80 @@ data.d28AvgTemp = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC; data.d30AvgTemp = dialTempMovingAvgData[ DIAL_TEMP_D30 ].dialTempAvgC; - broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); - dataPublicationTimerCounter = 0; + broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DD_DATA_T ) ); + ddTempDataPublicationTimerCounter = 0; } } +/*********************************************************************//** + * @brief + * The publishFPTemperatureSensorsData function broadcasts the FP + * temperature sensors data at the publication interval. + * @details \b Inputs: fpTempDataPublicationTimerCounter, tempSensorsPublishInterval + * @details \b Outputs: fpTempDataPublicationTimerCounter + * @details \b Message \b Sent: MSG_ID_FP_TEMPERATURE_DATA publishes the temperature + * data in a periodic interval. + * @return none + *************************************************************************/ +static void publishFPTemperatureSensorsData( void ) +{ + if ( ++fpTempDataPublicationTimerCounter >= getU32OverrideValue( &fpTempSensorsPublishInterval ) ) + { + TEMPERATURE_SENSORS_FP_DATA_T data; +// data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND ); +// data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND ); + data.m1Temp = getFilteredPressureSensorTemperature( M1_PRES ); + data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); + data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES ); + data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES ); + data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES ); + data.p7Temp = getFilteredFlowSensorTemperature( P7_FLOW ); + data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW ); + + broadcastData( MSG_ID_FP_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_FP_DATA_T ) ); + fpTempDataPublicationTimerCounter = 0; + } +} + + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ /*********************************************************************//** * @brief - * The testTemperatureSensorsDataPublishIntervalOverride function overrides the - * temperature sensor data publish interval. + * The testDDTemperatureSensorsDataPublishIntervalOverride function + * overrides the DD temperature sensor data publish interval. * @details \b Inputs: none - * @details \b Outputs: tempSensorsPublishInterval + * @details \b Outputs: ddTempSensorsPublishInterval * @param Override message from Dialin which includes the interval - * (in ms) to override the temperature sensor data broadcast interval to. + * (in ms) to override the DD temperature sensor data broadcast interval to. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) +BOOL testDDTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) { - BOOL result = u32BroadcastIntervalOverride( message, &tempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); + BOOL result = u32BroadcastIntervalOverride( message, &ddTempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); return result; } +/*********************************************************************//** + * @brief + * The testFPTemperatureSensorsDataPublishIntervalOverride function + * overrides the FP temperature sensors data publish interval. + * @details \b Inputs: none + * @details \b Outputs: fpTempSensorsPublishInterval + * @param Override message from Dialin which includes the interval + * (in ms) to override the FP temperature sensor data broadcast interval to. + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ) +{ + BOOL result = u32BroadcastIntervalOverride( message, &fpTempSensorsPublishInterval, TASK_PRIORITY_INTERVAL ); + return result; +} + /**@}*/