Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r076d41f2a507a2f1e5ceb929100bd025cee3b840 -r4a9872d81bae53492c124d0378028ece422f1b4d
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 076d41f2a507a2f1e5ceb929100bd025cee3b840)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 4a9872d81bae53492c124d0378028ece422f1b4d)
@@ -68,24 +68,23 @@
 void execSwitches( void )
 {
     U08 i;
+    U16 currentSwitchStatus;
 
-    U16 currentSwitchStatus = 0;
-
     for ( i = 0; i < NUM_OF_DOORS_AND_SWITCHES; i++ )
     {
         // Get the current switch status
         switch ( i )
         {
             case FRONT_DOOR:
-                currentSwitchStatus = getFPGAFrontDoorStatus();
+                currentSwitchStatus = ( 0 == getFPGAFrontDoorStatus() ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             case PUMP_TRACK_SWITCH:
-                currentSwitchStatus = getFPGAPumpTrackSwitchStatus();
+                currentSwitchStatus = ( 0 == getFPGAPumpTrackSwitchStatus() ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_SWITCH_ID, i )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_SWITCH_ID, i )
                 break;
         }
 
@@ -103,7 +102,7 @@
                 switchesStatus[ i ].debounceStartTime = 0;
                 // If the bit is 0, the door switch is open, because it is normally open switch
                 // TODO investigate the polarity of the pump track switch once it tied to the cartridge latch
-                switchesStatus[ i ].status.data       = ( 0 == currentSwitchStatus ? STATE_OPEN : STATE_CLOSED );
+                switchesStatus[ i ].status.data       = currentSwitchStatus;
             }
         }
         else
@@ -138,7 +137,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_SWITCH_ID, (U32)switchId )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_SWITCH_ID, (U32)switchId )
     }
 
     return (OPN_CLS_STATE_T)status;
@@ -161,7 +160,7 @@
         SWITCHES_DATA_T data;
 
         data.frontDoor      = (U32)getSwitchStatus( FRONT_DOOR );
-        data.cartrdigeLatch = (U32)getSwitchStatus( PUMP_TRACK_SWITCH );
+        data.pumpTrackSwitch = (U32)getSwitchStatus( PUMP_TRACK_SWITCH );
 
         switchesDataPublicationCounter = 0;