Index: firmware/source/sys_main.c
===================================================================
diff -u -r494b19c85bdea2b8fc273c648b4f1955f9d07dc3 -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 494b19c85bdea2b8fc273c648b4f1955f9d07dc3)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
@@ -63,8 +63,9 @@
 #include "rti.h"
 
 #include "TDCommon.h"
-#include "AlarmLamp.h"
+#include "AirPump.h"
 #include "Bubbles.h"
+#include "Buttons.h"
 #include "CpldInterface.h"
 #include "DDInterface.h"
 #include "FpgaTD.h"
@@ -73,7 +74,7 @@
 #include "MsgQueues.h"
 #include "OperationModes.h"
 #include "PressureSensor.h"
-#include "SystemComm.h"
+#include "Switches.h"
 #include "SystemCommTD.h"
 #include "TaskBG.h"
 #include "Timers.h"
@@ -189,9 +190,11 @@
     initWatchdogMgmt();
     // Initialize monitors
     initBubbles();
+    initButtons();
+    initSwitches();
     initVoltagesMonitor();
     // Initialize controllers
-    initAlarmLamp();
+    initAirPump();
     // Initialize modes
     initOperationModes();
 }