Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -rd36643be8a309f2ee587b5975663e7519b3addf9 -rd5574e12aa9638c933d11b9bee8d5cf024864440 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision d36643be8a309f2ee587b5975663e7519b3addf9) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision d5574e12aa9638c933d11b9bee8d5cf024864440) @@ -15,7 +15,6 @@ * ***************************************************************************/ - #include "Messaging.h" #include "ModeInitPOST.h" #include "ModeFault.h" @@ -32,18 +31,18 @@ // ********** private definitions ********** -#define BROADCAST_TD_OP_MODE_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< RO operation mode broadcast interval (in task interval/sec). -#define DATA_PUBLISH_COUNTER_START_COUNT 11 ///< Data publish counter start count. +#define BROADCAST_TD_OP_MODE_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< RO operation mode broadcast interval (in task interval/sec). +#define DATA_PUBLISH_COUNTER_START_COUNT 11 ///< Data publish counter start count. // ********** private data ********** -static volatile BOOL modeRequest[ NUM_OF_RO_MODES - 1 ]; ///< Pending operation mode change requests. -static RO_OP_MODE_T lastMode; ///< Last operation mode prior to current mode. -static RO_OP_MODE_T currentMode; ///< Current operation mode. -static U32 currentSubMode; ///< The currently active state of the active mode. -static U32 broadcastModeIntervalCtr; ///< Interval counter used to determine when to broadcast operation mode. Initialize to 11 to stagger broadcast. -static U32 currentSubState; ///< current sub state. -static U32 current4thLevelState; ///< current 4th level state. +static volatile BOOL modeRequest[ NUM_OF_RO_MODES - 1 ]; ///< Pending operation mode change requests. +static RO_OP_MODE_T lastMode; ///< Last operation mode prior to current mode. +static RO_OP_MODE_T currentMode; ///< Current operation mode. +static U32 currentSubMode; ///< The currently active state of the active mode. +static U32 broadcastModeIntervalCtr; ///< Interval counter used to determine when to broadcast operation mode. Initialize to 11 to stagger broadcast. +static U32 currentSubState; ///< current sub state. +static U32 current4thLevelState; ///< current 4th level state. /// Interval (in task intervals) at which to publish operation mode data to CAN bus. static OVERRIDE_U32_T opModePublishInterval = { BROADCAST_TD_OP_MODE_INTERVAL, BROADCAST_TD_OP_MODE_INTERVAL, BROADCAST_TD_OP_MODE_INTERVAL, 0 }; @@ -429,5 +428,4 @@ return result; } - /**@}*/