Diff: main.cpp

Revision:

345:cdde554477cd

Parent:

344:1675dbde0bae

--- a/main.cpp	Sun Jan 08 14:52:55 2017 +0000
+++ b/main.cpp	Sun Jan 22 03:12:16 2017 +0000
@@ -17,7 +17,6 @@
 #include "eeprom.h"
 #include "E2PROM.h"
 #include "COM_SND_TM_functions.h"
-//#include "Flash.h"
 #include "cdms_rtc.h"
 #include "COM_SND_TM.h"
 #include "cdms_sd.h"
@@ -34,11 +33,10 @@
 #include "COM_POWER_ON_TX.h"
 #include "OBSRS.h"
 #include "ThreadsAndFunctions.h"
-#include "TEST_PL.h"
 
 int main()
 {    
-    
+    gPC.baud(1200);//changed for bypassing COM    
     //RELAY SWITCHING 
     
     
@@ -60,8 +58,6 @@
     gRX_CURRENT_DATA_NODE = gRX_HEAD_DATA_NODE;
     gRX_COUNT = 0;
     RX1M.attach(&rx_read, Serial::RxIrq);
-    
-   gPC.baud(1200);//changed for bypassing COM
    
     
     //Base_tm *tm_ptr = NULL;
@@ -84,13 +80,14 @@
     
     FCTN_CDMS_INIT_RTC();/* rtc initialization*/
     FCTN_CDMS_SD_INIT();/* sd card initialization*/
+    INIT_EEPROM();
     
     CDMS_RESET_COUNTER++;
-    WRITE_TO_EEPROM(17,(int32_t)CDMS_RESET_COUNTER);
-    //FCTN_CDMS_WR_FLASH(17,CDMS_RESET_COUNTER);
+    WRITE_TO_EEPROM(7,(int32_t)CDMS_RESET_COUNTER);
+
+    gPC.printf("reset counter: %d",CDMS_RESET_COUNTER);
     TIME_LATEST_CDSMS_RESET = FCTN_CDMS_RD_RTC() >> 7;
     WRITE_TO_EEPROM(8,(int32_t)TIME_LATEST_CDSMS_RESET);
-    //FCTN_CDMS_WR_FLASH(8,TIME_LATEST_CDSMS_RESET);
     
     uint8_t test[512];
     for(int i =0; i<512; i++)
@@ -106,21 +103,21 @@
     #if DEBUG
     gPC.puts("allocating threads\r\n");
     #endif
-    
+
     //DMA iobject decalaration
     gPAY_SPI = new dmaSPISlave(PAY_SPI_MOSI, PAY_SPI_MISO, PAY_SPI_CLK, PAY_SPI_CS);
     
     // COM_POWER_ON_TX();
-    
+    gPC.puts("point : 1\r\n");
     // COM_MNG_TMTC THREAD
     gCOM_MNG_TMTC_THREAD = new Thread(COM_MNG_TMTC_FUN);
     gCOM_MNG_TMTC_THREAD->set_priority(osPriorityRealtime);
-    
+    gPC.puts("point : 2\r\n");
     gHK_THREAD = new Thread(FCTN_CDMS_HK_MAIN);
     gHK_THREAD->set_priority(osPriorityAboveNormal);
-    
-    gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
-    gSCIENCE_THREAD->set_priority(osPriorityHigh);
+    gPC.puts("point : 3\r\n");
+    //gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
+    //gSCIENCE_THREAD->set_priority(osPriorityHigh);
     
     #if DEBUG
     gPC.puts("completed allocating threads\r\n");