Index: firmware/App/DDCommon.h
===================================================================
diff -u -r3e54269f2012af4c37f9a34452e55073897ae68d -r20aba5b5bb7c758e8f565458e7a74faa8ba12ddd
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 3e54269f2012af4c37f9a34452e55073897ae68d)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 20aba5b5bb7c758e8f565458e7a74faa8ba12ddd)
@@ -39,8 +39,8 @@
 //Uncomment below if barometric pressure sensor reading available
 //#define __BARO_PRES_SENSOR__      1
 
-//Uncomment below if required hardware available ( baro and cond sensor) for testing
-//#define ENABLE_ALARM_1
+//Uncomment below if TD is integrated with DD
+#define ENABLE_ALARM_1
 
 //Uncomment below once characterization/study completed
 //#define ENABLE_ALARM_2
@@ -53,10 +53,20 @@
 
 //Uncomment below to disable revised heater model
 #define __REVISED_HEATER_MODEL__   1
+
 // comment below to disable bicarb multi level sensor for time based chamber F fill
 #define CONDUCTIVE_LEVEL_SENSOR_ENABLED  1
 
+//Uncomment below to enable d30 heater alarm(as all units are not equipped with d30 temp sensor)
+//#define ENABLE_ALARM_3
 
+//Comment below to disable the DD too-many-bad-message-CRCs alarm.
+#define __BAD_MSG_CRC_ALARM_ENABLED__    1
+
+//Comment below to disable the conductivity sensor alarms
+#define ENABLE_ALARM_4
+
+
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -ree5b5dded76e04bcd2efee8335ea8e23ac7afc2d -r20aba5b5bb7c758e8f565458e7a74faa8ba12ddd
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision ee5b5dded76e04bcd2efee8335ea8e23ac7afc2d)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 20aba5b5bb7c758e8f565458e7a74faa8ba12ddd)
@@ -206,6 +206,10 @@
                         SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ level ].data, (U32)currentLevelStatus );
                         break;
 
+                    case P25_LEVL:
+                        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_P25_LEVL_CHANGE, (U32)status[ level ].data, (U32)currentLevelStatus );
+                        break;
+
 #ifndef _VECTORCAST_
                     default:
                         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_LEVEL_SELECTED, level);
@@ -605,7 +609,7 @@
 
 /*********************************************************************//**
  * @brief
- * The testFloaterLevelStatusOverride function sets the override status
+ * The testDDFloaterLevelStateOverride function sets the override status
  * for a specific floater level sensor.
  * @details \b Inputs: none
  * @details \b Outputs: status