Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r35246359c5a9080c704e0a6f1563e99a337e2e91 -r94b2082ddcec6ccb947e67714dc85ae005a2c7b6 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 35246359c5a9080c704e0a6f1563e99a337e2e91) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 94b2082ddcec6ccb947e67714dc85ae005a2c7b6) @@ -110,10 +110,8 @@ pressuresSelfTestState = PRESSURE_SELF_TEST_STATE_START; pressuresDataPublicationTimerCounter = 0; - initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_LOW_PRESSURE, ALARM_ID_INLET_WATER_LOW_PRESSURE, - FALSE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD ); - initPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_PRESSURE_FAULT, ALARM_ID_INLET_WATER_PRESSURE_FAULT, - FALSE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD ); + initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_PRESSURE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD ); + initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_FAULT, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD ); } /*********************************************************************//** @@ -247,8 +245,7 @@ F32 const pressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET ); BOOL const isPressureTooLow = ( pressure < MIN_INLET_WATER_PRESSURE ); - // TODO fill the limit argument with the right value - checkPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_LOW_PRESSURE, isPressureTooLow, pressure, 0 ); + checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_PRESSURE, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE ); } /*********************************************************************//** @@ -264,8 +261,7 @@ F32 const pressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET ); BOOL const isPressureTooLow = ( pressure < MIN_INLET_WATER_PRESSURE ); - // TODO fill the limit argument with the right value - checkPersistentAlarm( PERSISTENT_ALARM_INLET_WATER_PRESSURE_FAULT, isPressureTooLow, pressure, 0 ); + checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_FAULT, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE ); } /*********************************************************************//** @@ -318,19 +314,6 @@ broadcastPressureSensorsData( roIn, roOut, drainIn, drainOut ); pressuresDataPublicationTimerCounter = 0; -#ifdef DEBUG_ENABLED -#ifdef PRESSURES_DEBUG -{ - // TODO - temporary debug code - remove later - F32 lc1 = getLoadCellFilteredWeight(LOAD_CELL_A1); - F32 lc2 = getLoadCellFilteredWeight(LOAD_CELL_B1); - char debugPresStr[ 256 ]; - - sprintf( debugPresStr, "RO: %5d, %5d, Drain: %5d, %5d, Loads: %6d, %6d\n", (S32)roIn, (S32)roOut, (S32)drainIn, (S32)drainOut, (S32)lc1, (S32)lc2 ); - sendDebugData( (U08*)debugPresStr, strlen(debugPresStr) ); -} -#endif -#endif } }