Index: firmware/App/Monitors/Flow.c =================================================================== diff -u -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5 -r5aaed18e3cd460c091c36c95c81635273bad61c6 --- firmware/App/Monitors/Flow.c (.../Flow.c) (revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5) +++ firmware/App/Monitors/Flow.c (.../Flow.c) (revision 5aaed18e3cd460c091c36c95c81635273bad61c6) @@ -311,11 +311,11 @@ *************************************************************************/ //static F32 getCalibrationAppliedFlow( U08 sensorId, F32 flow ) //{ -// F32 calFlow = pow( pressure, 4 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].fourthOrderCoeff + -// pow( pressure, 3 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].thirdOrderCoeff + -// pow( pressure, 2 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].secondOrderCoeff + -// pressure * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].gain + -// flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].offset; +// F32 calFlow = pow( flow, 4 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].fourthOrderCoeff + +// pow( flow, 3 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].thirdOrderCoeff + +// pow( flow, 2 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].secondOrderCoeff + +// flow * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].gain + +// flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].offset; // return calFlow; //} @@ -368,14 +368,14 @@ { FLOW_TEMP_DATA_T data; - data.FlowFMS = getFilteredFlow( FLOW_SENSOR_WATER_INLET ); - data.FlowFMP = getFilteredFlow( FLOW_SENSOR_RO_OUTLET ); + data.FlowFMS = getFilteredFlow( FLOW_SENSOR_WATER_INLET ); + data.FlowFMP = getFilteredFlow( FLOW_SENSOR_RO_OUTLET ); - data.TempFMS = getFilteredFlowSensorTemperature( FLOW_SENSOR_WATER_INLET ); - data.TempFMP = getFilteredFlowSensorTemperature( FLOW_SENSOR_RO_OUTLET ); + data.TempFMS = getFilteredFlowSensorTemperature( FLOW_SENSOR_WATER_INLET ); + data.TempFMP = getFilteredFlowSensorTemperature( FLOW_SENSOR_RO_OUTLET ); broadcastData( MSG_ID_RO_FLOW_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) ); - flowsDataPublicationTimerCounter = 0; + flowsDataPublicationTimerCounter = 0; } }