Index: firmware/App/Controllers/BoostPump.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Controllers/BoostPump.h	(.../BoostPump.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Controllers/BoostPump.h	(.../BoostPump.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -20,7 +20,7 @@
 
 
 #include "FluidPump.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 
 /**
  *  @defgroup BoostPump BoostPump
Index: firmware/App/Controllers/PermeateTank.h
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Controllers/PermeateTank.h	(.../PermeateTank.h)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Controllers/PermeateTank.h	(.../PermeateTank.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -20,7 +20,7 @@
 
 // ********** public definitions **********
 
-#include "FPCommon.h"
+#include "DDCommon.h"
 
 /**
  *  @defgroup FPPermeateTank FPPermeateTank
Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __RO_PUMP_H__
 
 #include "FluidPump.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 
 /**
  *  @defgroup ROPump ROPump
Index: firmware/App/Drivers/FlowSensor.h
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Drivers/FlowSensor.h	(.../FlowSensor.h)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Drivers/FlowSensor.h	(.../FlowSensor.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -18,7 +18,7 @@
 #ifndef __FLOW_SENSOR_H__
 #define __FLOW_SENSOR_H__
 
-#include "FPCommon.h"
+#include "DDCommon.h"
 
 /**
  *  @defgroup FlowSensor FlowSensor
Index: firmware/App/Drivers/FluidPump.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Drivers/FluidPump.h	(.../FluidPump.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Drivers/FluidPump.h	(.../FluidPump.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -18,7 +18,7 @@
 #ifndef __FLUID_PUMP_H__
 #define __FLUID_PUMP_H__
 
-#include "FPCommon.h"
+#include "DDCommon.h"
 
 /**
  *  @defgroup FluidPump FluidPump
Fisheye: Tag 6545787080956983fed6bd9c2717938c202917ab refers to a dead (removed) revision in file `firmware/App/FPCommon.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: firmware/App/Modes/FPModes/FPModeFault.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FPModeFault.h	(.../FPModeFault.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPModeFault.h	(.../FPModeFault.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_FP_FAULT_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FPModeInitPOST.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FPModeInitPOST.h	(.../FPModeInitPOST.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPModeInitPOST.h	(.../FPModeInitPOST.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_FP_INIT_POST_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FPModeStandby.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FPModeStandby.h	(.../FPModeStandby.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPModeStandby.h	(.../FPModeStandby.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_FP_STANDBY_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FPOperationModes.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FPOperationModes.h	(.../FPOperationModes.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPOperationModes.h	(.../FPOperationModes.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __FP_OP_MODES_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FlushConcentrate.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FlushConcentrate.h	(.../FlushConcentrate.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FlushConcentrate.h	(.../FlushConcentrate.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __FLUSH_CONCENTRATE_H_
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FlushFilter.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FlushFilter.h	(.../FlushFilter.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FlushFilter.h	(.../FlushFilter.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __FLUSH_FILTER_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/FlushPermeate.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/FlushPermeate.h	(.../FlushPermeate.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FlushPermeate.h	(.../FlushPermeate.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __FLUSH_PERMEATE_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/InletPressureCheck.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/InletPressureCheck.h	(.../InletPressureCheck.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/InletPressureCheck.h	(.../InletPressureCheck.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __INLET_PRESSURE_CHECK_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/ModeGenPermeate.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/ModeGenPermeate.h	(.../ModeGenPermeate.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.h	(.../ModeGenPermeate.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_GEN_PERM_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_GENP_DEF_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/ModePreGenPermeate.h	(.../ModePreGenPermeate.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.h	(.../ModePreGenPermeate.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_PRE_GENP_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -19,7 +19,7 @@
 #define __MODE_PRE_GENP_DEF_H__
 
 #include "DDDefs.h"
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FPDefs.h"
 
 /**
Index: firmware/App/Monitors/Flow.h
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Monitors/Flow.h	(.../Flow.h)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Monitors/Flow.h	(.../Flow.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -18,7 +18,7 @@
 #ifndef __FLOW_H__
 #define __FLOW_H__
 
-#include "FPCommon.h"
+#include "DDCommon.h"
 #include "FlowSensor.h"
 
 /**
Index: firmware/App/Monitors/WaterQualityMonitor.h
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Monitors/WaterQualityMonitor.h	(.../WaterQualityMonitor.h)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Monitors/WaterQualityMonitor.h	(.../WaterQualityMonitor.h)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -17,8 +17,8 @@
 #ifndef __WATER_QUALITY_MONITOR_H
 #define __WATER_QUALITY_MONITOR_H
 
-#include "FPCommon.h"
-#include "FPDefs.h"
+#include "DDCommon.h"
+#include "DDDefs.h"
 
 /**
  *  @defgroup WaterQualityMonitor WaterQualityMonitor
Index: firmware/App/Services/AlarmMgmtDD.c
===================================================================
diff -u -re01f6c0b94312dec30878967be9ffa3228e8773b -r6545787080956983fed6bd9c2717938c202917ab
--- firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision e01f6c0b94312dec30878967be9ffa3228e8773b)
+++ firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision 6545787080956983fed6bd9c2717938c202917ab)
@@ -65,7 +65,8 @@
 void initAlarmMgmtDD( void )
 {
     alarmInfoPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
-    isADDFaultAlarmActive              = FALSE;
+    isADDFaultAlarmActive = FALSE;
+    isAFPFaultAlarmActive = FALSE;
 
     // Initialize common alarm mgmt unit
     initAlarmMgmt();
@@ -412,6 +413,7 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testDDClearAllAlarms function clears all active DD alarms, even if they