Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -364,7 +364,7 @@
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
     VALVE_T valve;
 
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
 #ifdef SKIP_UI_INTERACTION
         patientDisconnectionConfirmed = TRUE;
@@ -438,7 +438,7 @@
     BOOL isCartridgeRemoved = TRUE;
 #endif
 
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
         if ( FALSE == isCartridgeRemoved )
         {
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -re679dd58bd01cdb94171a9948b024fe3c3c48f3c -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e679dd58bd01cdb94171a9948b024fe3c3c48f3c)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -642,7 +642,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
 
-    if ( STATE_OPEN == getFPGADoorState() )
+    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
     {
         activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
     }
@@ -705,7 +705,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
 
-    if ( STATE_OPEN == getFPGADoorState() )
+    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
     {
         activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
     }
@@ -743,7 +743,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_PRIME_STATE;
 
-    if ( STATE_OPEN == getFPGADoorState() )
+    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
     {
         activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
     }
@@ -782,7 +782,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_RECIRCULATE_STATE;
 
-    if ( STATE_OPEN == getFPGADoorState() )
+    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
     {
         activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
     }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -632,7 +632,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
         state = NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
@@ -816,7 +816,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
     {
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -1870,21 +1870,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getDoorState function gets the current state of door switch.
- * @details Inputs: none
- * @details Outputs: none
- * @return current door state
- *************************************************************************/
-OPN_CLS_STATE_T getFPGADoorState( void )
-{
-    // TODO: Get actual door state from FPGA or GPIO
-    BOOL const status = 0x0;
-
-    return ( 0 == status ? STATE_CLOSED : STATE_OPEN );
-}
-
-/*********************************************************************//**
- * @brief
  * The setFPGAValvesControlMode function sets the valves control mode.
  * @details Inputs: fpgaActuatorSetPoints
  * @details Outputs: fpgaActuatorSetPoints
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r596b96528f155bd9f663ed1773fdc80761fc7b31
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
@@ -112,8 +112,6 @@
 
 void setFPGASensorTest( U08 sensorTest );
 
-OPN_CLS_STATE_T getFPGADoorState( void );
-
 void setFPGAValvesControlMode( U16 bits );
 U16  getFPGAValvesStatus( void );