Index: firmware/source/sys_main.c
===================================================================
diff -u -rda12d1065b9bc93d30500255d8b986f00d1bdd69 -r9af6fc3e5afc442a877bd5e23ecfa6872a3ad5a4
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision da12d1065b9bc93d30500255d8b986f00d1bdd69)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9af6fc3e5afc442a877bd5e23ecfa6872a3ad5a4)
@@ -64,6 +64,7 @@
 #include "CommBuffers.h"
 #include "Interrupts.h"
 #include "NVDataMgmt.h"
+#include "OperationModes.h"
 #include "TaskBG.h"
 #include "Timers.h"
 /* USER CODE END */
@@ -106,6 +107,7 @@
     initCommBuffers();
     initInterrupts();
     initNVDataMgmt();
+    initOperationModes();
     initTimers();
 }
 
@@ -115,8 +117,6 @@
     rtiInit();
     rtiEnableNotification( rtiNOTIFICATION_COMPARE0 | rtiNOTIFICATION_COMPARE1 | rtiNOTIFICATION_COMPARE3 );
     rtiStartCounter( rtiCOUNTER_BLOCK0 );
-    // The timer task requires FIQ enabled
-    _enable_FIQ();
     // The general and priority tasks require IRQ enabled
     _enable_IRQ();
 }