Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r62236181e6a9693a619d01967b00496c1d36e146 -r318d977d9d47b1860f09b93f06cc5885723f3e77 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 62236181e6a9693a619d01967b00496c1d36e146) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 318d977d9d47b1860f09b93f06cc5885723f3e77) @@ -100,14 +100,14 @@ void execConductivitySensors( void ) { - processCPiCPoSensorRead( CONDUCITIVYSENSORS_CPI_SENSOR, getFPGACPi(), getFPGACPiReadCount(), getFPGACPiErrorCount() ); - processCPiCPoSensorRead( CONDUCITIVYSENSORS_CPO_SENSOR, getFPGACPi(), getFPGACPoReadCount(), getFPGACPoErrorCount() ); + processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPI_SENSOR, getFPGACPi(), getFPGACPiReadCount(), getFPGACPiErrorCount() ); + processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPO_SENSOR, getFPGACPi(), getFPGACPoReadCount(), getFPGACPoErrorCount() ); if ( ++conductivityDataPublicationTimerCounter >= getConductivityDataPublishInterval() ) { conductivityDataPublicationTimerCounter = 0; - broadcastConductivityData( getConductivityValue(CONDUCITIVYSENSORS_CPI_SENSOR), - getConductivityValue(CONDUCITIVYSENSORS_CPO_SENSOR), + broadcastConductivityData( getConductivityValue(CONDUCTIVITYSENSORS_CPI_SENSOR), + getConductivityValue(CONDUCTIVITYSENSORS_CPO_SENSOR), 0, 0); } @@ -126,12 +126,12 @@ { if ( conductivity > COND_SENSOR_CPI_CPO_MAX_VALUE ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_HIGH_CONDUCITIVY, conductivity, state ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, conductivity, state ); } if ( conductivity < COND_SENSOR_CPI_CPO_MIN_VALUE ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_LOW_CONDUCITIVY, conductivity, state ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, conductivity, state ); } } @@ -353,3 +353,5 @@ return result; } + +/**@}*/