Team Fox / Mbed 2 deprecated BAE_QM_MAR9

Dependencies:   FreescaleIAP mbed-rtos mbed

Fork of workinQM_5thJan_azad by Team Fox

Files at this revision

API Documentation at this revision

Comitter:
azaddevarm
Date:
Sat Dec 10 14:02:38 2016 +0000
Parent:
77:6a5f6e1c7a35
Child:
79:bc093fd525d7
Commit message:
BCN_TX_STATUS refined

Changed in this revision

BCN.cpp Show annotated file Show diff for this revision Revisions of this file
BCN.h Show annotated file Show diff for this revision Revisions of this file
TCTM.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/BCN.cpp	Sat Dec 10 13:25:06 2016 +0000
+++ b/BCN.cpp	Sat Dec 10 14:02:38 2016 +0000
@@ -13,8 +13,7 @@
 Timer timer_Set_BCN_TX_STATUS_FAILURE;
 
 extern BAE_HK_actual actual_data;
- 
-//DigitalOut bcn_sw(PIN14,0);
+
 Serial pc_bcn(USBTX, USBRX);        //tx,rx //see if it creates a problem
 //SPI spi(D11, D12, D13);              // mosi, miso, sclk 
 //DigitalOut cs(D10);                //slave select or chip select
@@ -29,7 +28,7 @@
 //GLOBAL VARIABLES
 uint8_t BCN_INIT_STATUS = 0;
 uint8_t BCN_TX_MAIN_STATUS = 0;
-uint8_t BCN_TX_STATUS = 0;
+uint8_t BCN_TX_STATUS = BCN_RF_SILENCE;
 //uint8_t BCN_TX_ENABLE = 1;              //hardcoding for now    //check where is this variable toggled??
 uint8_t BCN_TX_SW_STATUS = 1;
 uint8_t BCN_FEN = 0;                //hardcoding for now    //write this value to flash
@@ -112,7 +111,7 @@
         {
             timer_Set_BCN_TX_STATUS_DISABLED.reset();
             timer_Set_BCN_TX_STATUS_DISABLED.start();
-            Set_BCN_TX_STATUS(BCN_TX_DISABLED);
+            BCN_TX_STATUS = BCN_TX_DISABLED;
             timer_Set_BCN_TX_STATUS_DISABLED.stop();
         }
  // if(BCN_FEN == 0)//BCN_FEN is in flash
@@ -172,7 +171,7 @@
                 {
                     timer_Set_BCN_TX_STATUS_SUSPENDED.reset();
                     timer_Set_BCN_TX_STATUS_SUSPENDED.start();
-                    Set_BCN_TX_STATUS(BCN_TX_SUSPENDED);
+                    BCN_TX_STATUS = BCN_TX_SUSPENDED;
                     BCN_TX_MAIN_STATUS = 0;
                     timer_Set_BCN_TX_STATUS_SUSPENDED.stop();
                 }
@@ -185,12 +184,12 @@
                         
                     if(Check_ACK_RECEIVED() == 1)
                     {
-                        Set_BCN_TX_STATUS(BCN_TX_SUCCESS);
+                        BCN_TX_STATUS = BCN_TX_SUCCESS;
                         BCN_TX_MAIN_STATUS = 0;   
                     }
                     else
                     {
-                        Set_BCN_TX_STATUS(BCN_TX_FAILURE);
+                        BCN_TX_STATUS = BCN_TX_FAILURE;
                         //BCN_FAIL_COUNT++;
                         //Init_BEACON_HW();
                         BCN_TX_MAIN_STATUS = 0;
@@ -201,7 +200,7 @@
         }
         else
         {
-            Set_BCN_TX_STATUS(BCN_TX_DISABLED);
+            BCN_TX_STATUS = BCN_TX_DISABLED;
             BCN_TX_MAIN_STATUS = 0;
         }
     }
@@ -209,7 +208,7 @@
     {
         timer_Set_BCN_TX_STATUS_RF_SILENCE.reset();
         timer_Set_BCN_TX_STATUS_RF_SILENCE.start();
-        Set_BCN_TX_STATUS(BCN_RF_SILENCE);  //Window of RF Silence: None of the Txs should be on.
+        BCN_TX_STATUS = BCN_RF_SILENCE;  //Window of RF Silence: None of the Txs should be on.
         BCN_TX_MAIN_STATUS = 0;
         timer_Set_BCN_TX_STATUS_RF_SILENCE.stop();
     }
@@ -568,7 +567,7 @@
             
             timer_Set_BCN_TX_STATUS_SUCCESS.reset();
             timer_Set_BCN_TX_STATUS_SUCCESS.start();
-            Set_BCN_TX_STATUS(BCN_INIT_SUCCESS);
+            BCN_TX_STATUS = BCN_INIT_SUCCESS;
             timer_Set_BCN_TX_STATUS_SUCCESS.stop();
             
             break;
@@ -593,7 +592,7 @@
             
             timer_Set_BCN_TX_STATUS_FAILURE.reset();
             timer_Set_BCN_TX_STATUS_FAILURE.start();
-            Set_BCN_TX_STATUS(BCN_INIT_FAILURE);
+            BCN_TX_STATUS = BCN_INIT_FAILURE;
             timer_Set_BCN_TX_STATUS_FAILURE.stop();
             
             break;
--- a/BCN.h	Sat Dec 10 13:25:06 2016 +0000
+++ b/BCN.h	Sat Dec 10 14:02:38 2016 +0000
@@ -7,9 +7,6 @@
 #define BCN_TX_SUSPENDED 2
 #define BCN_TX_SUCCESS 3
 #define BCN_TX_FAILURE 4
-//#define BCN_TX_SUCCESS 4
-//#define BCN_TX_INITIALIZED 5
-
 #define BCN_INIT_SUCCESS 5
 #define BCN_INIT_FAILURE 6
 
--- a/TCTM.cpp	Sat Dec 10 13:25:06 2016 +0000
+++ b/TCTM.cpp	Sat Dec 10 14:02:38 2016 +0000
@@ -1928,7 +1928,7 @@
                                                                 //ACK_L234_TM
                                                                 telemetry[0]=0xB0;
                                                                 telemetry[1]=tc[0];
-                                                                BCN_SW = 1;// same convection active high 5th dec sw status is 0 for off
+                                                                BCN_SW = 1;// same convention active low 5th dec
                                                                 BCN_TX_SW_ENABLE=0x03;
                                                                 
                                                                 /*update in the flash*/