
Repository for CDMS code
Dependencies: SimpleDMA mbed-rtos mbed eeprom
Fork of COM_MNG_TMTC_SIMPLE by
Revision 133:56d37aa8a011, committed 2016-03-01
- Comitter:
- ee12b079
- Date:
- Tue Mar 01 12:35:49 2016 +0000
- Parent:
- 127:8a7bee7b8e8b
- Child:
- 134:4694fc291ce1
- Commit message:
- OBSRS TM to be checked
Changed in this revision
--- a/COM_SND_TM.h Fri Feb 26 13:01:11 2016 +0000 +++ b/COM_SND_TM.h Tue Mar 01 12:35:49 2016 +0000 @@ -267,8 +267,6 @@ DS_state = !DS_state;\ if (DS_f){\ DS_f = false;\ - if(bypass_adf == 1)\ - print_tm(ptr);\ exor(ptr);\ convolution(ptr);\ interleave(convoluted_frame,interleave_data[0]);\
--- a/DefinitionsAndGlobals.h Fri Feb 26 13:01:11 2016 +0000 +++ b/DefinitionsAndGlobals.h Tue Mar 01 12:35:49 2016 +0000 @@ -1,6 +1,6 @@ // **************DEFINITIONS********************* -#define bypass_adf 0 +#define bypass_adf 1 // COM_RX #define RX_TIMEOUT_LIMIT 0.5
--- a/Structures.h Fri Feb 26 13:01:11 2016 +0000 +++ b/Structures.h Tue Mar 01 12:35:49 2016 +0000 @@ -46,7 +46,7 @@ #define GETshort_or_long_tc(x) ( ( (x->flags) & SHORT_LONG_TC_MASK ) >> 4 ) #define GETcrc_pass(x) ( ( (x->flags) & CRC_MASK ) >> 3 ) #define GETabort_on_nack(x) ( ( (x->TC_string[1]) & 0x08 ) >> 3 ) -#define GETapid(x) ( ( (x->TC_string[1]) & 0xA0 ) >> 6 ) +#define GETapid(x) ( ( (x->TC_string[1]) & 0xC0 ) >> 6 ) #define GETexec_status(x) ( (x->flags) & EXEC_STATUS_MASK ) #define GETpacket_seq_count(x) (x->TC_string[0]) #define GETservice_type(x) ( (x->TC_string[2]) & 0xF0 )
--- a/adf.h Fri Feb 26 13:01:11 2016 +0000 +++ b/adf.h Tue Mar 01 12:35:49 2016 +0000 @@ -214,16 +214,20 @@ spi.write(0x18);\ spi.write(0x20);\ for(unsigned char i=0; i<112;i++){\ - spi.write(buffer_112[i]);\ - /*gPC.printf("0x%X,",spi.write(buffer_112[i]));*/\ + if(bypass_adf)\ + gPC.putc(buffer_112[i]);\ + else\ + spi.write(buffer_112[i]);\ }\ }\ else{\ spi.write(0x18);\ spi.write(0x90);\ for(unsigned char i=0; i<112;i++){\ - spi.write(buffer_112[i]);\ - /*gPC.printf("0x%X,",spi.write(buffer_112[i]));*/\ + if(bypass_adf)\ + gPC.putc(buffer_112[i]);\ + else\ + spi.write(buffer_112[i]);\ }\ }\ gCS_ADF=1;\