Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rd3819286869611f9c02add72a0f8e321598fdf42 -r622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94)
@@ -1,6 +1,7 @@
 
 
 #include "FPGA.h"
+#include "MessageSupport.h"
 #include "Switches.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -77,15 +78,15 @@
         switch ( i )
         {
             case CONCENTRATE_CAP:
-                currentSwitchStatus = getFPGAConcentrateCapStatus();
+                currentSwitchStatus = ( getFPGAConcentrateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             case DIALYSATE_CAP:
-                currentSwitchStatus = getFPGADialysateCapStatus();
+                currentSwitchStatus = ( getFPGADialysateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             case FLUID_DOOR:
-                currentSwitchStatus = getFPGAGFluidDoorStatus();
+                currentSwitchStatus = ( getFPGAGFluidDoorStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             default:
@@ -169,7 +170,7 @@
 
         switchesDataPublicationCounter = 0;
 
-        broadcastSwitchesData( &data );
+        broadcastData( MSG_ID_DG_SWITCHES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( SWITCHES_DATA_T ) );
     }
 }
 
@@ -212,7 +213,7 @@
  * @details Outputs: switchesDataPublishInterval
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testResetSwitchesDataPublishIntervalOverrid( void )
+BOOL testResetSwitchesDataPublishIntervalOverride( void )
 {
     BOOL result = FALSE;