Revision 319:c11a52b91d25, committed 2016-12-08

Comitter:

ee12b079

Date:

Thu Dec 08 15:17:24 2016 +0000

Parent:

318:978d72f191f9

Child:

320:7080e8c46988

Child:

321:42bdefc37270

Commit message:

changed few flags

Changed in this revision

--- a/COM_MNG_TMTC.h	Thu Dec 08 13:12:34 2016 +0000
+++ b/COM_MNG_TMTC.h	Thu Dec 08 15:17:24 2016 +0000
@@ -1360,8 +1360,8 @@
         }\
         obosc_tm_current->next_TM = obosc_tm;\
         /*Sending OBOSC TM to GS*/\
-        /*snd_tm.head_pointer(obosc_tm_head);*/\
-        /*transmit_adf;*/\
+        snd_tm.head_pointer(obosc_tm_head);\
+        transmit_adf;\
         /*DELETE THE TM AFTER USE*/\
         obosc_tm_current = obosc_tm_head;\
         int overCount = 0;\
@@ -1434,8 +1434,8 @@
                             tm_ptr = tm_ptr->next_TM;\
                         }\
                         /*Send only call sign, ACK_L1 to GS*/\
-                        /*snd_tm.head_pointer(tm_ptr_head);*/\
-                        /*transmit_adf;*/\
+                        snd_tm.head_pointer(tm_ptr_head);\
+                        transmit_adf;\
                         /*DELETE THE TM AFTER USE*/\
                         tm_ptr = tm_ptr_head;\
                         int overflowCountExecute = 0;\

--- a/COM_POWER_OFF_TX.h	Thu Dec 08 13:12:34 2016 +0000
+++ b/COM_POWER_OFF_TX.h	Thu Dec 08 15:17:24 2016 +0000
@@ -77,7 +77,7 @@
     RF_SW_CNTRL_BCN = 1;\
     Thread::wait(25);\
     RF_SW_CNTRL_BCN = 0;\
-    gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;\
+    gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);/*RF_SW_STATUS_FLAG set to RF_COM_BCN*/\
     if( gFLAGS & COM_AUTO_POWER_OFF_BAE_FLAG ){\
         /*gPC.puts("powering on bae\r\n")*/;\
         SW_ON_BAE;\

--- a/COM_POWER_ON_TX.h	Thu Dec 08 13:12:34 2016 +0000
+++ b/COM_POWER_ON_TX.h	Thu Dec 08 15:17:24 2016 +0000
@@ -136,7 +136,7 @@
                         RF_SW_CNTRL_TX = 1;
                         Thread::wait(25);
                         RF_SW_CNTRL_TX = 0;
-                        gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
+                        gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
                     }
                     else{
                         gPC.puts("waiting for bcn off\r\n");
@@ -159,7 +159,7 @@
                             RF_SW_CNTRL_TX = 1;
                             Thread::wait(25);
                             RF_SW_CNTRL_TX = 0;
-                            gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);
+                            gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
                         }
                         else{
                             gPC.puts("ack = C0\r\n");
@@ -175,7 +175,7 @@
                         RF_SW_CNTRL_TX = 1;
                         Thread::wait(25);
                         RF_SW_CNTRL_TX = 0;
-                        gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
+                        gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
                     }
                     /*DELETE THE TM AFTER USE*/
                     Base_tm *del_tm = tm_ptr2;
@@ -215,7 +215,7 @@
             RF_SW_CNTRL_TX = 1;
             Thread::wait(25);
             RF_SW_CNTRL_TX = 0;
-            gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
+            gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;/*RF_SW_STATUS_FLAG set to RF_COM_TX*/
         }
     }
     gPC.puts("swd off BAE\r\n");

--- a/P_COM_INIT.h	Thu Dec 08 13:12:34 2016 +0000
+++ b/P_COM_INIT.h	Thu Dec 08 15:17:24 2016 +0000
@@ -3,7 +3,7 @@
     RF_SW_CNTRL_BCN = 1;\
     Thread::wait(25);\
     RF_SW_CNTRL_BCN = 0;\
-    gFLAGS = gFLAGS | RF_SW_STATUS_FLAG;\
+    gFLAGS = gFLAGS & (~RF_SW_STATUS_FLAG);/*RF_SW_STATUS_FLAG set to RF_COM_BCN*/\
     COM_RX_CNTRL = 0;\
     Thread::wait(200);\
     COM_RX_CNTRL = 1;\