Diff: BCN.cpp

Revision:

78:8ab8fb417a84

Parent:

76:293693fb7949

Child:

79:bc093fd525d7

--- 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;