# HG changeset patch
# User paul
# Date 2015-05-12 10:27:55
# Node ID 6628458d4fb05738df143c6b8c98fece8e77a245
# Parent  c53fb904ef313395a25f957ba89bd4225b23a0d3

Major bug corrected on the handling of TC_LFR_LOAD_COMMON_PAR

diff --git a/EQM/src/main.c b/EQM/src/main.c
--- a/EQM/src/main.c
+++ b/EQM/src/main.c
@@ -61,11 +61,11 @@ int main( void )
 
     while(1)
     {
-//        if (processTimecode == 1)
-//        {
-//            printf("timecode counter = %d\n", counter);
-//            processTimecode = 0;
-//        }
+        if (processTimecode == 1)
+        {
+            printf("timecode counter = %d\n", counter);
+            processTimecode = 0;
+        }
     }
 
     return 0;
diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro
--- a/FSW-qt/fsw-qt.pro
+++ b/FSW-qt/fsw-qt.pro
@@ -12,7 +12,7 @@ SWVERSION=-1-0
 DEFINES += SW_VERSION_N1=3 # major
 DEFINES += SW_VERSION_N2=0 # minor
 DEFINES += SW_VERSION_N3=0 # patch
-DEFINES += SW_VERSION_N4=0 # internal
+DEFINES += SW_VERSION_N4=1 # internal
 
 # <GCOV>
 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
diff --git a/src/tc_load_dump_parameters.c b/src/tc_load_dump_parameters.c
--- a/src/tc_load_dump_parameters.c
+++ b/src/tc_load_dump_parameters.c
@@ -914,6 +914,8 @@ int set_sy_lfr_kcoeff( ccsdsTelecommandP
     int status;
     unsigned char *kcoeffLoadPtr;
     unsigned char *kcoeffNormPtr;
+    unsigned char *kcoeffSbmPtr_a;
+    unsigned char *kcoeffSbmPtr_b;
 
     status = LFR_SUCCESSFUL;
 
@@ -959,10 +961,15 @@ int set_sy_lfr_kcoeff( ccsdsTelecommandP
         for (i=0; i<NB_K_COEFF_PER_BIN; i++)
         {
             // destination
-            kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + i ];
+            kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[   (bin * NB_K_COEFF_PER_BIN) + i          ];
+            kcoeffSbmPtr_a= (unsigned char*) &kcoeffPtr_sbm[  ( (bin * NB_K_COEFF_PER_BIN) + i) * 2     ];
+            kcoeffSbmPtr_b= (unsigned char*) &kcoeffPtr_sbm[  ( (bin * NB_K_COEFF_PER_BIN) + i) * 2 + 1 ];
             // source
             kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i];
-            copyFloatByChar( kcoeffNormPtr, kcoeffLoadPtr );
+            // copy source to destination
+            copyFloatByChar( kcoeffNormPtr,  kcoeffLoadPtr );
+            copyFloatByChar( kcoeffSbmPtr_a, kcoeffLoadPtr );
+            copyFloatByChar( kcoeffSbmPtr_b, kcoeffLoadPtr );
         }
     }
 
diff --git a/src/wf_handler.c b/src/wf_handler.c
--- a/src/wf_handler.c
+++ b/src/wf_handler.c
@@ -1187,11 +1187,11 @@ void set_wfp_data_shaping( void )
     data_shaping = parameter_dump_packet.sy_lfr_common_parameters;
 
     waveform_picker_regs->data_shaping =
-              ( (data_shaping & 0x10) >> 4 )     // BW
-            + ( (data_shaping & 0x08) >> 2 )     // SP0
-            + ( (data_shaping & 0x04)      )     // SP1
-            + ( (data_shaping & 0x02) << 2 )     // R0
-            + ( (data_shaping & 0x01) << 4 )     // R1
+              ( (data_shaping & 0x20) >> 5 )     // BW
+            + ( (data_shaping & 0x10) >> 3 )     // SP0
+            + ( (data_shaping & 0x08) >> 1 )     // SP1
+            + ( (data_shaping & 0x04)      )     // R0
+            + ( (data_shaping & 0x02) << 3 )     // R1
             + ( (data_shaping & 0x01) << 5 );    // R2
 }