Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r04c5d5d9198c1fde05df66ec8f5e660f7f7174b1 -r4599c60774ea725ba8c7dbbdc4c0c712d676aba9
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 04c5d5d9198c1fde05df66ec8f5e660f7f7174b1)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 4599c60774ea725ba8c7dbbdc4c0c712d676aba9)
@@ -51,7 +51,6 @@
 // ********** private function prototypes **********
 
 static void publishSwitchesData( void );
-static void publishSwitchChanged( SWITCH_T switchId, U32 current_state );
 
 /*********************************************************************//**
  * @brief
@@ -118,7 +117,16 @@
             // If the debounce time has been elapsed, update the switch status to the new status
             else if ( TRUE == didTimeout( switchesStatus[ i ].debounceStartTime, SWITCHES_DEBOUNCE_TIME_MS ) )
             {
-                publishSwitchChanged( (SWITCH_T)i, (U32)currentSwitchStatus );
+                if (CONCENTRATE_CAP == i)
+                {
+                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_CONCENTRATECAP_SWITCH_CHANGE,
+                                                (U32)switchesStatus[ i ].status.data, (U32)currentSwitchStatus );
+                }
+                else if (DIALYSATE_CAP == i)
+                {
+                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_DIALYSATECAP_SWITCH_CHANGE,
+                                                (U32)switchesStatus[ i ].status.data, (U32)currentSwitchStatus );
+                }
                 switchesStatus[ i ].debounceStartTime = 0;
                 switchesStatus[ i ].status.data       = currentSwitchStatus;
             }
@@ -187,15 +195,6 @@
     }
 }
 
-static void publishSwitchChanged( SWITCH_T switchId, U32 current_state )
-{
-    SWITCH_CHANGED_DATA_T data;
-
-    data.SwitchId = (U32)switchId;
-    data.newstate = current_state;
-
-    broadcastData( MSG_ID_DG_SWITCH_CHANGE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( SWITCH_CHANGED_DATA_T ) );
-}
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/