Revision 50:6001287f3045, committed 2016-07-18

Comitter:

lakshya

Date:

Mon Jul 18 06:36:25 2016 +0000

Parent:

49:61c9f28332ba

Child:

51:661dc022613a

Commit message:

before last stage tested with tctm

Changed in this revision

--- a/BCN.cpp	Thu Jul 14 23:04:26 2016 +0000
+++ b/BCN.cpp	Mon Jul 18 06:36:25 2016 +0000
@@ -138,9 +138,12 @@
     int begintx,endtx;
     BCN_TX_MAIN_STATUS = 1;
     BCN_TX_MAIN_COUNTER++;
+    printf("BCN_FEN = %d\n\r",BCN_FEN);
     if(BCN_FEN == 1)
     {
-        if(BCN_TX_SW_STATUS == 0b00000001)
+        printf("BCN_TX_SW_STATUS = %d\n\r",BCN_TX_SW_STATUS);
+        //if(BCN_TX_SW_STATUS == 0b00000001)
+        if(BCN_TX_SW_STATUS != 0b00000000)
         {
             timer_Init_BEACON_HW.reset();
             timer_Init_BEACON_HW.start();
@@ -156,6 +159,7 @@
                     BCN_TMP = temp_temp;
                 pc_bcn.printf("temperature = %d\n\r",BCN_TMP);
                 //Get BCN_HK data from BCN HW(SPI) //Store BCN_HK data in BCN_HK_BUFFER
+                printf("BCN_SPND_TX = %d\n\r",BCN_SPND_TX);
                 if(BCN_SPND_TX == 1 )
                 {
                     timer_Set_BCN_TX_STATUS_SUSPENDED.reset();
@@ -652,6 +656,7 @@
 
 void  FCTN_BCN_SPND_TX()
 {
+     printf("BCN_SPND\n\r");
      BCN_SPND_TX = 1;
      if( BCN_TX_MAIN_STATUS == 1 && BCN_TX_SW_STATUS == 1 )
      {

--- a/EPS.cpp	Thu Jul 14 23:04:26 2016 +0000
+++ b/EPS.cpp	Mon Jul 18 06:36:25 2016 +0000
@@ -393,6 +393,7 @@
     }
     
     //--------BCN_TX----------//
+    /* Commented out to test BCN TC
     if(BCN_TX_SW_STATUS != 0b11)          //!disabled
     {
         if(BCN_TX_SW_STATUS == 0b10)      //oc fault and powered off
@@ -414,7 +415,7 @@
             BCN_TX_FAULT_COUNTER = 0;
         }
     }
-    
+    */
 }
 
 //----------------------------------------------------Power algo code--------------------------------------------------------------------//

--- a/main.cpp	Thu Jul 14 23:04:26 2016 +0000
+++ b/main.cpp	Mon Jul 18 06:36:25 2016 +0000
@@ -422,7 +422,7 @@
                 ACS_STATE = (ARR_INITIAL_VAL[0]>>16)&0x0F;
                 //pc.pc.printf("\n\r acs state in starting is %x",ACS_STATE);
                 ACS_DETUMBLING_ALGO_TYPE = (ARR_INITIAL_VAL[0]>>15)&0x01;
-                BCN_TX_SW_STATUS = ((uint8_t)(ARR_INITIAL_VAL[0]>>13))&0x03;
+                BCN_TX_SW_STATUS = 1;//((uint8_t)(ARR_INITIAL_VAL[0]>>14))&0x03;
                 BCN_SPND_TX = ((uint8_t)(ARR_INITIAL_VAL[0]>>12))&0x01;
                 BCN_FEN = ((uint8_t)(ARR_INITIAL_VAL[0]>>11))&0x01;
                 BCN_LONG_MSG_TYPE = ((uint8_t)(ARR_INITIAL_VAL[0]>>10))&0x01;
@@ -464,7 +464,7 @@
         ACS_STATE = (read[0]>>16)&0x0F;
         //pc.printf("\n\r acs state in starting is %x",ACS_STATE);
         ACS_DETUMBLING_ALGO_TYPE = (read[0]>>15)&0x01;
-        BCN_TX_SW_STATUS = ((uint8_t)(read[0]>>13))&0x03;
+        BCN_TX_SW_STATUS = 1;//((uint8_t)(read[0]>>13))&0x03;
         BCN_SPND_TX = ((uint8_t)(read[0]>>12))&0x01;
         BCN_FEN = ((uint8_t)(read[0]>>11))&0x01;
         BCN_LONG_MSG_TYPE = ((uint8_t)(read[0]>>10))&0x01;
@@ -1178,7 +1178,7 @@
                     pc.printf("\nSTATE IS !!!!!! = %x !!\n",ACS_STATE);
                     timer_F_ACS.reset();
                     timer_F_ACS.start();
-                    F_ACS();
+                    //F_ACS();
                     timer_F_ACS.stop();
                     /*pc.printf("\n\r timer_F_ACS is %f",timer_F_ACS.read());
                     pc.printf("\n\r timer_SENSOR_INIT is %f",timer_SENSOR_INIT.read());
@@ -1449,7 +1449,7 @@
     irpt_2_mstr = 0;
     
     ptr_t_i2c = new Thread(T_TC);
-    ptr_t_i2c->set_priority(osPriorityHigh);
+    ptr_t_i2c->set_priority(osPriorityRealtime);
         
     irpt_4m_mstr.enable_irq();
     irpt_4m_mstr.rise(&FCTN_I2C_ISR);
@@ -1457,6 +1457,7 @@
     RtosTimer t_sc_timer(T_SC,osTimerPeriodic);               // Initiating the scheduler thread
     t_sc_timer.start(5000);
     t_start.start();
+    
     #if print
         pc.printf("\n\rStarted scheduler %f\n\r",t_start.read()); 
     #endif