Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 17 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 59591769b..01b0948e5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -159,7 +159,7 @@ void MillisecStart(void)
 
 void OneMilliSecondMillisecInterrupt(UArg arg0)
 {
-    MillisecMessageStruc Message;
+    MillisecMessageStruc MillisecMessage;
     uint32_t Tenmsec_millisecondCounter = 0;
     ROM_IntMasterDisable();
     ROM_TimerIntClear(Millisec_timerBase, TIMER_TIMA_TIMEOUT);  // Clear the timer interrupt
@@ -178,19 +178,19 @@ void OneMilliSecondMillisecInterrupt(UArg arg0)
         Tenmsec_millisecondCounter = msec_millisecondCounter;
     }
     //send message to the Millisec task
-    Message.messageId = OneMillisec;
-    Message.tick = msec_millisecondCounter++;
-    Message.msglen = sizeof(MillisecMessageStruc);
+    MillisecMessage.messageId = OneMillisec;
+    MillisecMessage.tick = msec_millisecondCounter++;
+    MillisecMessage.msglen = sizeof(MillisecMessageStruc);
     if (MillisecMsgQ != NULL)
-        Mailbox_post(MillisecMsgQ , &Message, BIOS_NO_WAIT);
+        Mailbox_post(MillisecMsgQ , &MillisecMessage, BIOS_NO_WAIT);
 
     if (Tenmsec_millisecondCounter)
     {
-        Message.messageId = OneMillisec;
-        Message.tick = Tenmsec_millisecondCounter;
-        Message.msglen = sizeof(MillisecMessageStruc);
+        MillisecMessage.messageId = OneMillisec;
+        MillisecMessage.tick = Tenmsec_millisecondCounter;
+        MillisecMessage.msglen = sizeof(MillisecMessageStruc);
         if (TenMillisecMsgQ != NULL)
-            Mailbox_post(TenMillisecMsgQ , &Message, BIOS_NO_WAIT);
+            Mailbox_post(TenMillisecMsgQ , &MillisecMessage, BIOS_NO_WAIT);
     }
 
     //
@@ -507,7 +507,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
  ******************************************************************************/
 void MillisecTask(UArg arg0, UArg arg1)
 {
-    MillisecMessageStruc Message;
+    MillisecMessageStruc MillisecMessage;
     //char str[60];
     //uint16_t length;
     //Clock_setTimeout(HostKAClock, 1000);
@@ -516,11 +516,11 @@ void MillisecTask(UArg arg0, UArg arg1)
     Millisecond_Task_Handle = Task_self();
     while(1)
     {
-        Mailbox_pend(MillisecMsgQ , &Message, BIOS_WAIT_FOREVER);
-        switch (Message.messageId)
+        Mailbox_pend(MillisecMsgQ , &MillisecMessage, BIOS_WAIT_FOREVER);
+        switch (MillisecMessage.messageId)
         {
             case OneMillisec:
-                MillisecLoop(Message.tick);
+                MillisecLoop(MillisecMessage.tick);
                 break;
             default:
                 break;
@@ -534,7 +534,7 @@ void MillisecTask(UArg arg0, UArg arg1)
  ******************************************************************************/
 void MillisecLowTask(UArg arg0, UArg arg1)
 {
-    MillisecMessageStruc Message;
+    MillisecMessageStruc MillisecLowMessage;
     //char str[60];
     //uint16_t length;
     //Clock_setTimeout(HostKAClock, 1000);
@@ -543,11 +543,11 @@ void MillisecLowTask(UArg arg0, UArg arg1)
     //Millisecond_Task_Handle = Task_self();
     while(1)
     {
-        Mailbox_pend(TenMillisecMsgQ , &Message, BIOS_WAIT_FOREVER);
-        switch (Message.messageId)
+        Mailbox_pend(TenMillisecMsgQ , &MillisecLowMessage, BIOS_WAIT_FOREVER);
+        switch (MillisecLowMessage.messageId)
         {
             case OneMillisec:
-                MillisecLowLoop(Message.tick);
+                MillisecLowLoop(MillisecLowMessage.tick);
                 break;
             default:
                 break;