Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r8f59899872dd14f91e1cf07c1c51f24335287ad6 -r3be5cfc79b9c7d3cea2a9d016384590552f5fc85 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 8f59899872dd14f91e1cf07c1c51f24335287ad6) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3be5cfc79b9c7d3cea2a9d016384590552f5fc85) @@ -917,7 +917,6 @@ if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS ) { result = conductivitySensorStatus[ sensor ].rawResistance; - } else { @@ -944,7 +943,6 @@ if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS ) { result = conductivitySensorStatus[ sensor ].rawTemperature; - } else { Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -r8f59899872dd14f91e1cf07c1c51f24335287ad6 -r3be5cfc79b9c7d3cea2a9d016384590552f5fc85 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 8f59899872dd14f91e1cf07c1c51f24335287ad6) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 3be5cfc79b9c7d3cea2a9d016384590552f5fc85) @@ -34,10 +34,10 @@ #define COND_SENSOR_REPORT_PERIOD ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Broadcast conductivity values message every second. #define COND_SENSOR_UPDATE_INTERVAL ( 700 / TASK_PRIORITY_INTERVAL ) ///< Time in task intervals for new sensor data -#define DD_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT 40 ///< Data publish counter start count. -#define FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT 41 ///< Data publish counter start count. -#define RO_DATA_PUBLISH_COUNTER_START_COUNT 42 ///< Data publish counter start count. -#define RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT 43 ///< Data publish counter start count. +#define DD_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT 40 ///< DD Conductivity data publish counter start count. +#define FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT 41 ///< FP Conductivity data publish counter start count. +#define RO_DATA_PUBLISH_COUNTER_START_COUNT 42 ///< FP RO Data publish counter start count. +#define RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT 43 ///< DD Resistance data publish counter start count. #define CONDUCTIVITY_SAMPLE_FILTER_MS ( 50 ) ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate ) #define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS ( 50 ) ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate ) #define SIZE_OF_COND_ROLLING_AVG ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL ) ///< Filtered conductivity moving average sample count. @@ -513,6 +513,7 @@ * roRRPublishTimerCounter, DD, FP, RO data broadcast message sent * @details \b Message \b Sent: MSG_ID_DD_CONDUCTIVITY_DATA to publish DD conductivity data. * @details \b Message \b Sent: MSG_ID_FP_CONDUCTIVITY_DATA to publish FP conductivity data. + * @details \b Message \b Sent: MSG_ID_FP_RO_REJECTION_RATIO_DATA to publish FP RO data. * @return none *************************************************************************/ static void publishConductivitySensorsData( void ) @@ -564,30 +565,44 @@ // publish conductivity resistance data on interval if ( ++conductivityResistancePublishTimerCounter >= getU32OverrideValue( &conductivityResistanceDataPublishInterval ) ) { - CONDUCTIVITY_RESISTANCE_DATA_T data; - - data.d17CondResist = getConductivityRawResistance( D17_COND ); - data.d27CondResist = getConductivityRawResistance( D27_COND ); - data.d29CondResist = getConductivityRawResistance( D29_COND ); - data.d43CondResist = getConductivityRawResistance( D43_COND ); - data.d74CondResist = getConductivityRawResistance( D74_COND ); - data.p9CondResist = getConductivityRawResistance( P9_COND ); - data.p18CondResist = getConductivityRawResistance( P18_COND ); - data.d17RTDResist = getConductivityRawRTD( D17_COND ); - data.d27RTDResist = getConductivityRawRTD( D27_COND ); - data.d29RTDResist = getConductivityRawRTD( D29_COND ); - data.d43RTDResist = getConductivityRawRTD( D43_COND ); - data.d74RTDResist = getConductivityRawRTD( D74_COND ); - data.p9RTDResist = getConductivityRawRTD( P9_COND ); - data.p18RTDResist = getConductivityRawRTD( P18_COND ); - conductivityResistancePublishTimerCounter = 0; - - broadcastData( MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_RESISTANCE_DATA_T ) ); + broadcastResistanceData() } } } +/*********************************************************************//** + * @brief + * The broadcastResistanceData function publishes DD resistance data. + * @details \b Inputs: conductivityResistancePublishTimerCounter + * @details \b Outputs: resistance data + * roRRPublishTimerCounter, DD & FP resistance data is sent + * @details \b Message \b Sent: MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA to publish DD resistance data. + * @return none + *************************************************************************/ +static void broadcastResistanceData( void ) +{ + CONDUCTIVITY_RESISTANCE_DATA_T data; + data.d17CondResist = getConductivityRawResistance( D17_COND ); + data.d27CondResist = getConductivityRawResistance( D27_COND ); + data.d29CondResist = getConductivityRawResistance( D29_COND ); + data.d43CondResist = getConductivityRawResistance( D43_COND ); + data.d74CondResist = getConductivityRawResistance( D74_COND ); + data.p9CondResist = getConductivityRawResistance( P9_COND ); + data.p18CondResist = getConductivityRawResistance( P18_COND ); + data.d17RTDResist = getConductivityRawRTD( D17_COND ); + data.d27RTDResist = getConductivityRawRTD( D27_COND ); + data.d29RTDResist = getConductivityRawRTD( D29_COND ); + data.d43RTDResist = getConductivityRawRTD( D43_COND ); + data.d74RTDResist = getConductivityRawRTD( D74_COND ); + data.p9RTDResist = getConductivityRawRTD( P9_COND ); + data.p18RTDResist = getConductivityRawRTD( P18_COND ); + conductivityResistancePublishTimerCounter = 0; + + broadcastData( MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_RESISTANCE_DATA_T ) ); + +} + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/