Revision 334:71e9f4fdb387, committed 2016-12-10

Comitter:

ee12b079

Date:

Sat Dec 10 16:24:56 2016 +0000

Parent:

322:7d906d34aaff

Commit message:

testing

Changed in this revision

--- a/COM_MNG_TMTC.h	Sat Dec 10 12:32:27 2016 +0000
+++ b/COM_MNG_TMTC.h	Sat Dec 10 16:24:56 2016 +0000
@@ -14,8 +14,6 @@
 
 //DigitalIn tm_status_4m_slv(PIN39); //I2C interrupt to CDMS from BAE
 //DigitalIn tm_status_4m_pl(PIN61); //I2C interrupt to CDMS from PL
-#ifndef COM_MNG_TMTC_H    // To make sure you don't declare the function more than once by including the header multiple times.
-#define COM_MNG_TMTC_H
 
 #define RESET_CDMS NVIC_SystemReset()
 
@@ -1643,6 +1641,4 @@
         gFLAGS = gFLAGS & (~COM_MNG_TMTC_RUNNING_FLAG);\
         gFLAGS = gFLAGS & (~COM_SESSION_FLAG);\
     }\
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file

--- a/ThreadsAndFunctions.h	Sat Dec 10 12:32:27 2016 +0000
+++ b/ThreadsAndFunctions.h	Sat Dec 10 16:24:56 2016 +0000
@@ -1,9 +1,6 @@
 //Science Thread
 //SPI ISR
 
-#include "COM_MNG_TMTC.h"
-#include "adf.h"
-
 void payload_isr_fun(){
     gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
 }

--- a/adf.h	Sat Dec 10 12:32:27 2016 +0000
+++ b/adf.h	Sat Dec 10 16:24:56 2016 +0000
@@ -1,8 +1,5 @@
 //without reset feature , with state checks.
 
-#ifndef ADF_H    // To make sure you don't declare the function more than once by including the header multiple times.
-#define ADF_H
-
 InterruptIn IRQ(ADF_IRQ);
 //Ticker ticker;
 #include "OBSRS.h" 
@@ -681,6 +678,4 @@
     }
     gPC.puts("after while looprn");
 }
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file

--- a/common_functions.h	Sat Dec 10 12:32:27 2016 +0000
+++ b/common_functions.h	Sat Dec 10 16:24:56 2016 +0000
@@ -173,7 +173,7 @@
     }\
     COM_PA_IC_TMP = quantiz(tstart_thermistor,tstep_thermistor,pa_temp);\
     /*comment this ater*/\
-    COM_PA_IC_TMP = 0;\
+    /*COM_PA_IC_TMP = 0;*/\
     /*COM_PA_TMP_HIGH to be found*/\
     if (COM_PA_IC_TMP > COM_PA_TMP_HIGH){\
         returnHere = 0xFF;\

--- a/main.cpp	Sat Dec 10 12:32:27 2016 +0000
+++ b/main.cpp	Sat Dec 10 16:24:56 2016 +0000
@@ -40,6 +40,7 @@
     //RELAY SWITCHING 
     
     
+    
     RF_SW_CNTRL_BCN = 1;
     Thread::wait(25);
     RF_SW_CNTRL_BCN = 0;
@@ -96,6 +97,22 @@
     
     // COM_POWER_ON_TX();
     
+    //COM Flash parameters
+    
+    //COM_TC_BYTES_LIMIT
+    //COM_RX_CURRENT_MAX
+    //COM_RX_DISABLE_TIMEOUT
+
+    //PA temp 
+    COM_PA_TMP_HIGH = 343;
+    FCTN_CDMS_WR_FLASH(12,343); 
+    
+    //COM_PA_RECOVERY_TIMEOUT
+    //COM_SESSION_TIMEOUT
+    //COM_RSSI_MIN
+    
+    
+    
     // COM_MNG_TMTC THREAD
     gCOM_MNG_TMTC_THREAD = new Thread(COM_MNG_TMTC_FUN);
     gCOM_MNG_TMTC_THREAD->set_priority(osPriorityRealtime);