Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -ra069a798bc85ad39afb0df9b440457c1f18f2ba3 -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision a069a798bc85ad39afb0df9b440457c1f18f2ba3) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -323,6 +323,7 @@ case DG_MODE_GENE: case DG_MODE_FILL: case DG_MODE_DRAI: + case DG_MODE_STAN: if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) ) { isConductTooLow = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? FALSE : TRUE ); @@ -347,8 +348,6 @@ checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ); break; - case DG_MODE_INIT: - case DG_MODE_STAN: case DG_MODE_FLUS: case DG_MODE_HEAT: case DG_MODE_HCOL: Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -rd2f63f7b752a67a5805b5cb72afab07349afa408 -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision d2f63f7b752a67a5805b5cb72afab07349afa408) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -163,7 +163,6 @@ initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); @@ -1024,17 +1023,6 @@ checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, HEATERS_VOLTAGE_TOLERANCE_V ); - -#ifndef _RELEASE_ - if ( getHardwareConfigStatus() != HW_CONFIG_BETA ) -#endif - { - // If the system is DVT, check the primary heater's power line voltage - F32 powerMainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V ); - BOOL isPriPowerOut = ( fabs( powerMainPriVoltage - HEATERS_MAX_OPERATING_VOLTAGE_V ) > PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); - - checkPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, isPriPowerOut, powerMainPriVoltage, PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ); - } } } Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -rb68997b535f3ffd7073b7573fbecbc2c86e4abaa -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision b68997b535f3ffd7073b7573fbecbc2c86e4abaa) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -182,6 +182,7 @@ case DG_MODE_GENE: case DG_MODE_FILL: case DG_MODE_DRAI: + case DG_MODE_STAN: if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) { isPressureTooLow = ( pressure >= MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ? FALSE : TRUE ); @@ -199,8 +200,6 @@ checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); break; - case DG_MODE_INIT: - case DG_MODE_STAN: case DG_MODE_FLUS: case DG_MODE_HEAT: case DG_MODE_HCOL: Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r14ab8d8d80fb3607d37d70d4e7a09bbb8dbc3055 -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 14ab8d8d80fb3607d37d70d4e7a09bbb8dbc3055) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -427,6 +427,7 @@ case DG_MODE_GENE: case DG_MODE_FILL: case DG_MODE_DRAI: + case DG_MODE_STAN: if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) { isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE ); @@ -448,8 +449,6 @@ case DG_MODE_HEAT: case DG_MODE_HCOL: case DG_MODE_CHEM: - case DG_MODE_INIT: - case DG_MODE_STAN: case DG_MODE_CHFL: if ( VALVE_STATE_OPEN == getValveStateName( VPI ) ) { Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -rc230be1bd4296324bf5dfc288c212eb7c2ce5d2d -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision c230be1bd4296324bf5dfc288c212eb7c2ce5d2d) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -1674,7 +1674,7 @@ { prevChemDisinfectState = chemDisinfectState; chemDisinfectState = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH; - alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION; + alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION; } } Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c =================================================================== diff -u -rc230be1bd4296324bf5dfc288c212eb7c2ce5d2d -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision c230be1bd4296324bf5dfc288c212eb7c2ce5d2d) +++ firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -1072,7 +1072,12 @@ { prevChemDisinfectFlushState = chemDisinfectFlushState; chemDisinfectFlushState = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH; - alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION; + alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION; + + if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) + { + alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION; + } } } } Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u -rdc6dc717eb63064c4eeacfb8da92636472908869 -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision dc6dc717eb63064c4eeacfb8da92636472908869) +++ firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -1119,10 +1119,14 @@ { // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function - U32 cap = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP ); prevFlushState = flushState; flushState = DG_FLUSH_STATE_CANCEL_WATER_PATH; - alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION; + alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION; + + if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) + { + alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION; + } } } Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -rc230be1bd4296324bf5dfc288c212eb7c2ce5d2d -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision c230be1bd4296324bf5dfc288c212eb7c2ce5d2d) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -1963,10 +1963,14 @@ { // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function - U32 cap = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP ); prevHeatDisinfectState = heatDisinfectState; heatDisinfectState = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH; - alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION; + alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION; + + if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) + { + alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION; + } } } Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c =================================================================== diff -u -rc230be1bd4296324bf5dfc288c212eb7c2ce5d2d -rcd7ff5665a2ac5142e29c0cad5339af0639e7c57 --- firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision c230be1bd4296324bf5dfc288c212eb7c2ce5d2d) +++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision cd7ff5665a2ac5142e29c0cad5339af0639e7c57) @@ -771,10 +771,14 @@ { // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function - U32 cap = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP ); heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState; heatDisinfectActiveCoolState = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE; - alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION; + alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION; + + if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) + { + alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION; + } } }