Index: firmware/App/Controllers/Switches.h
===================================================================
diff -u -r28787751424ba118764b865009edf9b0842b2ac7 -rc2fe204db1b8926994b5eee78afa1b516c97d02c
--- firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision 28787751424ba118764b865009edf9b0842b2ac7)
+++ firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision c2fe204db1b8926994b5eee78afa1b516c97d02c)
@@ -24,13 +24,6 @@
     NUM_OF_DOORS_AND_CAPS           ///< Number of doors and caps
 } SWITCH_T;
 
-typedef enum switches_status
-{
-    CLOSED = 0,                     ///< Closed
-    OPEN,                           ///< Open
-    NUM_OF_SWITCH_STATUS            ///< Number of switch status
-} SWITCH_STATUS_T;
-
 /// DG doors and caps data publish structure
 typedef struct
 {
@@ -45,7 +38,7 @@
 
 void execSwitches( void );
 
-SWITCH_STATUS_T getSwitchStatus( SWITCH_T switchId );
+OPN_CLS_STATE_T getSwitchStatus( SWITCH_T switchId );
 
 BOOL testSetSwitchesDataPublishIntervalOverride( U32 value );
 BOOL testResetSwitchesDataPublishIntervalOverrid( void );