# HG changeset patch # User paul # Date 2017-03-30 06:09:26 # Node ID 0f33a04cb74784b09cdf7d8c17573f3de78a5fb3 # Parent 3e73a8516099d75e46ffc37b65a5d693ade9e730 3.2.0.12 AVGV: extra division by MOVING_AVERAGE reloved diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,7 @@ option(FSW_debug_tch "?" OFF) set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE) set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE) set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE) -set(SW_VERSION_N4 "11" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "12" CACHE STRING "Choose N4 FSW Version." FORCE) if(FSW_verbose) add_definitions(-DPRINT_MESSAGES_ON_CONSOLE) diff --git a/src/fsw_misc.c b/src/fsw_misc.c --- a/src/fsw_misc.c +++ b/src/fsw_misc.c @@ -454,9 +454,9 @@ rtems_task avgv_task(rtems_task_argument average_e2 = filter( current_e2, &ctx_e2 ); //update int16 values - hk_lfr_sc_v_f3_as_int16 = (int16_t) (average_v / MOVING_AVERAGE ); - hk_lfr_sc_e1_f3_as_int16 = (int16_t) (average_e1 / MOVING_AVERAGE ); - hk_lfr_sc_e2_f3_as_int16 = (int16_t) (average_e2 / MOVING_AVERAGE ); + hk_lfr_sc_v_f3_as_int16 = (int16_t) average_v; + hk_lfr_sc_e1_f3_as_int16 = (int16_t) average_e1; + hk_lfr_sc_e2_f3_as_int16 = (int16_t) average_e2; } old_v = current_v; old_e1 = current_e1; diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -1210,7 +1210,7 @@ void set_wfp_delta_f0_f0_2( void ) delta_f0_in_float = (nb_samples_per_snapshot / 2.) * ( (1. / FREQ_F2) - (1. / FREQ_F0) ) * FREQ_F2; waveform_picker_regs->delta_f0 = delta_snapshot - floor( delta_f0_in_float ); - waveform_picker_regs->delta_f0_2 = DFLT_WFP_DELTA_F0_2; // 48 = 11 0000, max 7 bits + waveform_picker_regs->delta_f0_2 = DFLT_WFP_DELTA_F0_2; } void set_wfp_delta_f1( void )