@@ -61,11 +61,11 int main( void ) | |||
|
61 | 61 | |
|
62 | 62 | while(1) |
|
63 | 63 | { |
|
64 |
|
|
|
65 |
|
|
|
66 |
|
|
|
67 |
|
|
|
68 |
|
|
|
64 | if (processTimecode == 1) | |
|
65 | { | |
|
66 | printf("timecode counter = %d\n", counter); | |
|
67 | processTimecode = 0; | |
|
68 | } | |
|
69 | 69 | } |
|
70 | 70 | |
|
71 | 71 | return 0; |
@@ -12,7 +12,7 SWVERSION=-1-0 | |||
|
12 | 12 | DEFINES += SW_VERSION_N1=3 # major |
|
13 | 13 | DEFINES += SW_VERSION_N2=0 # minor |
|
14 | 14 | DEFINES += SW_VERSION_N3=0 # patch |
|
15 |
DEFINES += SW_VERSION_N4= |
|
|
15 | DEFINES += SW_VERSION_N4=1 # internal | |
|
16 | 16 | |
|
17 | 17 | # <GCOV> |
|
18 | 18 | #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage |
@@ -914,6 +914,8 int set_sy_lfr_kcoeff( ccsdsTelecommandP | |||
|
914 | 914 | int status; |
|
915 | 915 | unsigned char *kcoeffLoadPtr; |
|
916 | 916 | unsigned char *kcoeffNormPtr; |
|
917 | unsigned char *kcoeffSbmPtr_a; | |
|
918 | unsigned char *kcoeffSbmPtr_b; | |
|
917 | 919 | |
|
918 | 920 | status = LFR_SUCCESSFUL; |
|
919 | 921 | |
@@ -959,10 +961,15 int set_sy_lfr_kcoeff( ccsdsTelecommandP | |||
|
959 | 961 | for (i=0; i<NB_K_COEFF_PER_BIN; i++) |
|
960 | 962 | { |
|
961 | 963 | // destination |
|
962 | kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + i ]; | |
|
964 | kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + i ]; | |
|
965 | kcoeffSbmPtr_a= (unsigned char*) &kcoeffPtr_sbm[ ( (bin * NB_K_COEFF_PER_BIN) + i) * 2 ]; | |
|
966 | kcoeffSbmPtr_b= (unsigned char*) &kcoeffPtr_sbm[ ( (bin * NB_K_COEFF_PER_BIN) + i) * 2 + 1 ]; | |
|
963 | 967 | // source |
|
964 | 968 | kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i]; |
|
965 | copyFloatByChar( kcoeffNormPtr, kcoeffLoadPtr ); | |
|
969 | // copy source to destination | |
|
970 | copyFloatByChar( kcoeffNormPtr, kcoeffLoadPtr ); | |
|
971 | copyFloatByChar( kcoeffSbmPtr_a, kcoeffLoadPtr ); | |
|
972 | copyFloatByChar( kcoeffSbmPtr_b, kcoeffLoadPtr ); | |
|
966 | 973 | } |
|
967 | 974 | } |
|
968 | 975 |
@@ -1187,11 +1187,11 void set_wfp_data_shaping( void ) | |||
|
1187 | 1187 | data_shaping = parameter_dump_packet.sy_lfr_common_parameters; |
|
1188 | 1188 | |
|
1189 | 1189 | waveform_picker_regs->data_shaping = |
|
1190 |
( (data_shaping & 0x |
|
|
1191 |
+ ( (data_shaping & 0x0 |
|
|
1192 |
+ ( (data_shaping & 0x0 |
|
|
1193 |
+ ( (data_shaping & 0x0 |
|
|
1194 |
+ ( (data_shaping & 0x0 |
|
|
1190 | ( (data_shaping & 0x20) >> 5 ) // BW | |
|
1191 | + ( (data_shaping & 0x10) >> 3 ) // SP0 | |
|
1192 | + ( (data_shaping & 0x08) >> 1 ) // SP1 | |
|
1193 | + ( (data_shaping & 0x04) ) // R0 | |
|
1194 | + ( (data_shaping & 0x02) << 3 ) // R1 | |
|
1195 | 1195 | + ( (data_shaping & 0x01) << 5 ); // R2 |
|
1196 | 1196 | } |
|
1197 | 1197 |
General Comments 0
You need to be logged in to leave comments.
Login now