Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rd28c03acc3414131c48be5c52fd4cb0f2bf3c9b9 -rf96654b60d6a3a09178dc1dfe22c54ae1e067eed
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision d28c03acc3414131c48be5c52fd4cb0f2bf3c9b9)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision f96654b60d6a3a09178dc1dfe22c54ae1e067eed)
@@ -33,6 +33,9 @@
 #define SWITCHES_DEBOUNCE_TIME_MS        ( MS_PER_SECOND / 4 )                                  ///< Switches FPGA status check interval.
 #define DATA_PUBLISH_COUNTER_START_COUNT 4                                                      ///< Data publish counter start count.
 
+#define FRONT_DOOR_SWITCH_MASK           0x0010                                                 ///< Front door switch bit mask. Bit 4 of the GPIO register.
+#define PUMP_TRACK_SWITCH_MASK           0x0020                                                 ///< Pump track switch bit mask. Bit 5 of the GPIO register.
+
 /// Switch status structure
 typedef struct
 {
@@ -94,11 +97,11 @@
         switch ( i )
         {
             case FRONT_DOOR:
-                currentSwitchStatus = ( 0 == getFPGAFrontDoorStatus() ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = ( FRONT_DOOR_SWITCH_MASK == getFPGAFrontDoorStatus() ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             case PUMP_TRACK_SWITCH:
-                currentSwitchStatus = ( 1 == getFPGAPumpTrackSwitchStatus() ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = ( PUMP_TRACK_SWITCH_MASK == getFPGAPumpTrackSwitchStatus() ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             default:
@@ -193,7 +196,7 @@
     {
         SWITCHES_DATA_T data;
 
-        data.frontDoor      = (U32)getSwitchStatus( FRONT_DOOR );
+        data.frontDoor       = (U32)getSwitchStatus( FRONT_DOOR );
         data.pumpTrackSwitch = (U32)getSwitchStatus( PUMP_TRACK_SWITCH );
 
         switchesDataPublicationCounter = 0;