Index: firmware/App/Controllers/Switches.h
===================================================================
diff -u -rd8fa48ead3336b1fe090b42030a8648264831076 -r9fdd42e75e67270808116d7d89f099939c13add7
--- firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision d8fa48ead3336b1fe090b42030a8648264831076)
+++ firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision 9fdd42e75e67270808116d7d89f099939c13add7)
@@ -22,13 +22,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
 {
@@ -41,7 +34,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 );