working version
Dependencies: mbed mbed-rtos SimpleDMA FreescaleIAP eeprom
Fork of CDMS_CODE_FM_28JAN2017 by
Diff: ThreadsAndFunctions.h
- Revision:
- 96:4ca92f9775e0
- Parent:
- 95:42d6747900cb
- Child:
- 97:717c7908c822
diff -r 42d6747900cb -r 4ca92f9775e0 ThreadsAndFunctions.h --- a/ThreadsAndFunctions.h Mon Jan 25 06:22:29 2016 +0000 +++ b/ThreadsAndFunctions.h Mon Jan 25 13:10:43 2016 +0000 @@ -70,8 +70,8 @@ void COM_MNG_TMTC_FUN(void const *args){ if( !(gFLAGS & COM_SESSION_FLAG) ){ - gLEDR = 1; - gLEDG = 1; + //gLEDR = 1; + //gLEDG = 1; } while(true){ Thread::signal_wait( COM_MNG_TMTC_SIGNAL_UART_INT ); @@ -85,25 +85,25 @@ PUT_RAW_BYTE; // PENDING : MEASURE RSSI if( gFLAGS & COM_SESSION_FLAG ){ - gLEDR = 0; - gLEDG = 0; + //gLEDR = 0; + //gLEDG = 0; } } else if( gFLAGS & COM_RX_FLAG ){ - gLEDR = 0; - gLEDG = 1; + //gLEDR = 0; + //gLEDG = 1; PUT_RAW_BYTE; } else{ - gLEDR = 1; - gLEDG = 0; + //gLEDR = 1; + //gLEDG = 0; gFLAGS = gFLAGS | COM_RX_FLAG; PUT_RAW_BYTE; } } else if( gFLAGS & NEW_TC_RECEIVED ){ /*gPC.puts("NEW TC RECEIVED\r\n");*/ - Thread::wait(10000); /*To be removed in flight model*/ + Thread::wait(2000); /*To be removed in flight model*/ gFLAGS = gFLAGS & (~NEW_TC_RECEIVED); gFLAGS = gFLAGS | COM_MNG_TMTC_RUNNING_FLAG; @@ -270,37 +270,40 @@ } -//uint8_t payload_data[6723]; +uint8_t payload_data[6723]; -//void SCIENCE_FUN(void const *args){ -// uint8_t *ptr; -// gPC.puts("haha\r\n"); -// ptr = &(payload_data[3]); -// gPC.puts("haha2\r\n"); -// int counter = 0; -// gPC.puts("haha3\r\n"); -// payload_data[2] = 0;//for mode -// for(int i = 0; i<60 ;i++){ //for mode 0.....callibra -// for(int j= 0; j<48; j++){ //2 byte values -// ptr[counter++] = 0; ptr[counter++] = 65; -// } -// for(int j=96; j <100 ; j++){ -// ptr[counter++] = 0; ptr[counter++] = 0; ptr[counter++] = 0; ptr[counter++] = 65; -// } -// ptr = ptr+112; -// counter = 0; -// } -// srp(payload_data); -// -// gPC.puts("data given to payload"); -// while(true){ -// gSCIENCE_THREAD->wait(osWaitForever); -// } -// while(true){ +void SCIENCE_FUN(void const *args){ + uint8_t *ptr; + gPC.puts("haha\r\n"); + ptr = &(payload_data[3]); + gPC.puts("haha2\r\n"); + int counter = 0; + gPC.puts("haha3\r\n"); + payload_data[2] = 0;//for mode + for(int i = 0; i<60 ;i++){ //for mode 0.....callibra + for(int j= 0; j<48; j++){ //2 byte values + ptr[counter++] = 0; ptr[counter++] = 65; + } + for(int j=96; j <100 ; j++){ + ptr[counter++] = 0; ptr[counter++] = 0; ptr[counter++] = 0; ptr[counter++] = 65; + } + ptr = ptr+112; + counter = 0; + } + //srp(payload_data); + + //gPC.puts("data given to payload"); + gLEDR = 1; + gSCIENCE_THREAD->wait(2000); gSCIENCE_THREAD->terminate(); + + /*while(true){ + gSCIENCE_THREAD->wait(osWaitForever); + }*/ + //while(true){ // gSCIENCE_THREAD->signal_wait(SCIENCE_SIGNAL); // srp(payload_data); // } -//} +}