samp Srinivasan / Mbed 2 deprecated CDMS_CODE_samp_22Nov16

publishing to check changes in cdms code

Dependencies:   FreescaleIAP SimpleDMA mbed-rtos mbed

Fork of CDMS_CODE_samp_23SEP_DMA_flag by samp Srinivasan

Files at this revision

API Documentation at this revision

Revision 300:609c3e4240c9, committed 2016-09-03

Comitter:
ee12b079
Date:
Sat Sep 03 16:44:56 2016 +0000
Parent:
295:699801854b71
Child:
301:701ac67649b7
Commit message:
Testing time in TM type1 frames

Changed in this revision

COM_SND_TM.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/COM_SND_TM.h	Sun Aug 28 13:53:42 2016 +0000
+++ b/COM_SND_TM.h	Sat Sep 03 16:44:56 2016 +0000
@@ -12,7 +12,7 @@
 const unsigned char FCCH80[] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 const unsigned char SCH40[] = {0x0a,0x3f,0x46,0xb4,0x00};
 const unsigned char EXOR_SEQ[] = {0x55,0xF1,0x51,0x3D,0xA7,0x42,0xAE,0x2E,0x2E,0x28,0x76,0x80,0x62,0x41,0xC4,0x75,0x4D,0x87,0xDB,0xE1,0x02,0x61,0x60,0x96,0x9C,0xCB,0x8A,0xBD,0x37,0xE4,0x72,0x5D,0xF2,0x19,0x62,0x06,0x9A,0xF9,0x38,0xB0,0x49,0x75,0xD0,0x17,0x1B,0xCC,0x0B,0xEB,0x1B,0x50,0xA2,0x2A,0x8E,0xFA,0x4D,0x6F,0x1B,0xF8,0x0F,0x97,0x39,0x25,0x60,0x55,0x9A,0xDF,0x1D,0x10,0x7F,0xBD,0x3E,0xBF,0xE5,0x68,0x02,0xD1,0x99,0x0D,0xDF,0x84,0x2E,0x15,0xE3,0x08,0xD7,0x44,0x10,0x41,0xCE,0x93,0xF6,0x59,0x71,0xD2,0xF7,0x1C,0x4A,0x44,0x2D,0xA9,0x44,0x98,0x3A,0x00,0x71,0xCC,0x2A,0x35,0xC1,0x81,0xCF,0x44,0xF7,0x6A,0x0E,0xE4,0xF2,0xFC,0xD6,0x0B,0xA8,0x95,0x7B,0x86,0xB5,0xF8,0x33,0xE9,0xBF,0x6A,0x0E,0xE6,0x53,0x82};
- 
+uint32_t TIME_LATEST_TM;
 unsigned char interleave_data[2][144];
 #define print_tm(ptr) {\
     for( int i = 0; i < 134; i++ ){\
@@ -173,7 +173,10 @@
                 next_type_structure(T1F_pointer);\
               }\
         }\
-        TMframe_type1[0] = (1<<7) + (( (i-4)/13 )<<3);\
+        TIME_LATEST_TM = FCTN_CDMS_RD_RTC()&0x13;\
+        TMframe_type1[0] = (1<<7) + (( (i-4)/13 )<<3) + (TIME_LATEST_TM >>16);\
+        TMframe_type1[1] = TIME_LATEST_TM >>8;\
+        TMframe_type1[2] = TIME_LATEST_TM;\
         TMframe_type1[3] = crc8_gen(TMframe_type1,3);\
         if(T1F_pointer == NULL && i>12){\
             for( ; i < 134 ; i++){\

--- a/main.cpp	Sun Aug 28 13:53:42 2016 +0000
+++ b/main.cpp	Sat Sep 03 16:44:56 2016 +0000
@@ -15,9 +15,9 @@
 #include "crc.h"
 #include "i2c.h"
 #include "COM_SND_TM_functions.h"
-#include "COM_SND_TM.h"
 #include "Flash.h"
 #include "cdms_rtc.h"
+#include "COM_SND_TM.h"
 #include "cdms_sd.h"
 #include "common_functions.h"
 #include "RESET_functions.h"
@@ -114,9 +114,9 @@
     sys_reset_cdms_timer = new RtosTimer(sys_pwr_reset, osTimerPeriodic, (void * )NULL);
     sys_reset_cdms_timer->start(cdms_reset_timeout);
 
-    //PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
-    //PL_wo_dma->start(6000);
-    gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
+    PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
+    PL_wo_dma->start(6000);
+    //gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
     
     /*Timeout flipper;
     flipper.attach(BAE_TC,31);*/