# HG changeset patch # User paul # Date 2015-06-19 07:36:38 # Node ID d1d105094d264c7a2a86f61570a1961c2cd51318 # Parent 273ce8305308eebaecad1210185d2454f0245131 Rev 3.0.0.5 Bug detected and corrected on the SP1/R0 misprocessing 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=4 # internal +DEFINES += SW_VERSION_N4=5 # internal # #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -1192,7 +1192,7 @@ void set_wfp_data_shaping( void ) ( (data_shaping & 0x20) >> 5 ) // BW + ( (data_shaping & 0x10) >> 3 ) // SP0 + ( (data_shaping & 0x08) >> 1 ) // SP1 - + ( (data_shaping & 0x04) ) // R0 + + ( (data_shaping & 0x04) << 1 ) // R0 + ( (data_shaping & 0x02) << 3 ) // R1 + ( (data_shaping & 0x01) << 5 ); // R2 }