Index: firmware/Debug/App/Modes/subdir_vars.mk
===================================================================
diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/Debug/App/Modes/subdir_vars.mk	(.../subdir_vars.mk)	(revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7)
+++ firmware/Debug/App/Modes/subdir_vars.mk	(.../subdir_vars.mk)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -4,75 +4,75 @@
 
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
+../App/Modes/ModeDisinfect.c \
+../App/Modes/ModeDrain.c \
 ../App/Modes/ModeFault.c \
 ../App/Modes/ModeFill.c \
+../App/Modes/ModeFlush.c \
 ../App/Modes/ModeInitPOST.c \
-../App/Modes/ModeOpParams.c \
 ../App/Modes/ModePostTreat.c \
-../App/Modes/ModePreTreat.c \
 ../App/Modes/ModeService.c \
 ../App/Modes/ModeStandby.c \
-../App/Modes/ModeTreatment.c \
 ../App/Modes/OperationModes.c 
 
 C_DEPS += \
+./App/Modes/ModeDisinfect.d \
+./App/Modes/ModeDrain.d \
 ./App/Modes/ModeFault.d \
 ./App/Modes/ModeFill.d \
+./App/Modes/ModeFlush.d \
 ./App/Modes/ModeInitPOST.d \
-./App/Modes/ModeOpParams.d \
 ./App/Modes/ModePostTreat.d \
-./App/Modes/ModePreTreat.d \
 ./App/Modes/ModeService.d \
 ./App/Modes/ModeStandby.d \
-./App/Modes/ModeTreatment.d \
 ./App/Modes/OperationModes.d 
 
 OBJS += \
+./App/Modes/ModeDisinfect.obj \
+./App/Modes/ModeDrain.obj \
 ./App/Modes/ModeFault.obj \
 ./App/Modes/ModeFill.obj \
+./App/Modes/ModeFlush.obj \
 ./App/Modes/ModeInitPOST.obj \
-./App/Modes/ModeOpParams.obj \
 ./App/Modes/ModePostTreat.obj \
-./App/Modes/ModePreTreat.obj \
 ./App/Modes/ModeService.obj \
 ./App/Modes/ModeStandby.obj \
-./App/Modes/ModeTreatment.obj \
 ./App/Modes/OperationModes.obj 
 
 OBJS__QUOTED += \
+"App/Modes/ModeDisinfect.obj" \
+"App/Modes/ModeDrain.obj" \
 "App/Modes/ModeFault.obj" \
 "App/Modes/ModeFill.obj" \
+"App/Modes/ModeFlush.obj" \
 "App/Modes/ModeInitPOST.obj" \
-"App/Modes/ModeOpParams.obj" \
 "App/Modes/ModePostTreat.obj" \
-"App/Modes/ModePreTreat.obj" \
 "App/Modes/ModeService.obj" \
 "App/Modes/ModeStandby.obj" \
-"App/Modes/ModeTreatment.obj" \
 "App/Modes/OperationModes.obj" 
 
 C_DEPS__QUOTED += \
+"App/Modes/ModeDisinfect.d" \
+"App/Modes/ModeDrain.d" \
 "App/Modes/ModeFault.d" \
 "App/Modes/ModeFill.d" \
+"App/Modes/ModeFlush.d" \
 "App/Modes/ModeInitPOST.d" \
-"App/Modes/ModeOpParams.d" \
 "App/Modes/ModePostTreat.d" \
-"App/Modes/ModePreTreat.d" \
 "App/Modes/ModeService.d" \
 "App/Modes/ModeStandby.d" \
-"App/Modes/ModeTreatment.d" \
 "App/Modes/OperationModes.d" 
 
 C_SRCS__QUOTED += \
+"../App/Modes/ModeDisinfect.c" \
+"../App/Modes/ModeDrain.c" \
 "../App/Modes/ModeFault.c" \
 "../App/Modes/ModeFill.c" \
+"../App/Modes/ModeFlush.c" \
 "../App/Modes/ModeInitPOST.c" \
-"../App/Modes/ModeOpParams.c" \
 "../App/Modes/ModePostTreat.c" \
-"../App/Modes/ModePreTreat.c" \
 "../App/Modes/ModeService.c" \
 "../App/Modes/ModeStandby.c" \
-"../App/Modes/ModeTreatment.c" \
 "../App/Modes/OperationModes.c"