Diff: robot.h

Revision:

3:dc7e9c6bc26c

Parent:

2:7d523bdd2f50

Child:

4:989d51f3e6ef

--- a/robot.h	Sun Dec 28 06:05:17 2014 +0000
+++ b/robot.h	Sat Jan 03 04:35:32 2015 +0000
@@ -32,9 +32,6 @@
 // The `Watchdog Timer` timeout value. The mbed will reset if the timer is not reset after the number of seconds defined here
 #define RJ_WATCHDOG_TIMER_VALUE 2   // seconds
 
-// Set the proper header files to include for the Real Time Operating System implementation - This should always be set to 1
-#define RJ_RTOS_MODE    1
-
 
 // ** ============================= ** PIN DECLARATIONS ** ============================= **
 
@@ -123,7 +120,7 @@
 // ** ============================= ** DO NOT EDIT ANYTHING BELOW HERE ** ============================= **
 // ** ================================================================================================= **
 
-// Include the basic classes - Note: the header files included within "mbed.h" are listed below its include line.
+// Include the basic classes - Note: the header files included within "mbed.h" are listed here.
 #include "mbed.h"
 /*
 #include <stdio.h>
@@ -166,24 +163,19 @@
 #include "rtc_time.h"
 */
 
+// Include header file for the CMSIS Real Time Operating System
+#include "cmsis_os.h"
+
 #if RJ_CHECK_FIRMWARE
 #include "FirmwareCheck.h"
 #endif
 
-// Include header file for the CMSIS Real Time Operating System - include the correct one depending upon pre-processor values
-#if RJ_RTOS_MODE == 1
-#include "cmsis_os.h"
-#else
-#include "rtos.h"
-#endif
-
 // Include the header file for the watchdog timer class
 #include "Watchdog.h"
 
 // Include the base classes for communication if a communication link is active
 #if RJ_PRIMARY_RADIO | RJ_SECONDARY_RADIO
-#include "CommModule.h"
-#include "CommLink.h"
+#include "Communication.h"
 #endif
 
 // Include the primary radio class if 915MHz band radio [if active]
@@ -196,4 +188,6 @@
 #include "nRF24L01.h"
 #endif
 
+#include "Logger.h"
+
 #endif // ROBOT_H