Diff: ThreadsAndFunctions.h

Revision:

275:605dd29161ad

Parent:

268:ded5306a1fd1

--- a/ThreadsAndFunctions.h	Wed Jul 20 09:58:59 2016 +0000
+++ b/ThreadsAndFunctions.h	Sat Jul 23 23:37:46 2016 +0000
@@ -128,7 +128,7 @@
                 HK_counter->stop();
                 gPAY_SPI->bulkRead_pause();
                 gFLAGS = gFLAGS | COM_SESSION_FLAG;
-                gSESSION_TIMEOUT.attach(&after_session, SESSION_TIME_LIMIT);
+                gSESSION_TIMEOUT.attach(&after_session, COM_SESSION_TIMEOUT);
                 gFLAGS = gFLAGS | COM_RX_FLAG;
                 gTOTAL_RAW_BYTES = 0;
                 PUT_RAW_BYTE;
@@ -149,7 +149,7 @@
                 gFLAGS = gFLAGS | COM_RX_FLAG;
                 PUT_RAW_BYTE;
             }
-            if(gTOTAL_RAW_BYTES > BYTE_OVERFLOW_CONSTANT){
+            if(gTOTAL_RAW_BYTES > COM_TC_BYTES_LIMIT){
                 RX1M.attach(NULL);
                 gCOM_RX_DISABLE.attach(&after_com_disable, COM_RX_DISABLE_TIMEOUT);
                 after_receive();
@@ -192,7 +192,7 @@
                         if( tempGSver == 0xFF ){
                             gPC.puts("GS code match !!\r\n");
                             gFLAGS = gFLAGS | COM_SESSION_VALIDITY;
-                            //sys_reset_cdms_timer->start(cdms_reset_timeout);
+                            sys_reset_cdms_timer->start(cdms_reset_timeout);
                             COM_POWER_ON_TX();
                             gPC.puts("P_com_hk !!\r\n");
                             P_COM_HK;
@@ -200,7 +200,7 @@
                             if( (gFLAGS & COM_PA_HOT_FLAG) || ( gFLAGS & COM_PA_OC_FLAG ) ){
                                 gPC.puts("Pahot or paoc !!\r\n");
                                 COM_TX_CNTRL = 0;
-                                gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_COOLING_TIME_LIMIT);
+                                gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_RECOVERY_TIMEOUT);
                                 gFLAGS = gFLAGS & (~COM_MNG_TMTC_RUNNING_FLAG);
                                 RX1M.attach(&rx_read, Serial::RxIrq);
                             }
@@ -283,12 +283,12 @@
                 gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
             }
         }
-        else if( gFLAGS & COM_PA_HOT_FLAG ){
+        else if( (gFLAGS & COM_PA_HOT_FLAG) || (gFLAGS & COM_PA_OC_FLAG) ){
             gPC.puts("checking for PA hot in main\r\n");
             P_COM_HK;
             if((gFLAGS & COM_PA_HOT_FLAG) || (gFLAGS & COM_PA_OC_FLAG)){
                 COM_TX_CNTRL = 0;
-                gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_COOLING_TIME_LIMIT);
+                gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_RECOVERY_TIMEOUT);
             }
             else{
                 gCOM_PA_COOLING_TIMEOUT.detach();