# HG changeset patch # User paul # Date 2017-03-24 12:38:33 # Node ID b7b6742fb4396e61e8b829dce2f500c86e10f7fe # Parent 0781840df51337902c48a34db110fb4a5cb3f537 3.2.0.8 test on the values of v, e1 and e2 removed from the AVGV task 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 "7" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "8" 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 @@ -430,10 +430,10 @@ rtems_task avgv_task(rtems_task_argument current_v = waveform_picker_regs->v; current_e1 = waveform_picker_regs->e1; current_e2 = waveform_picker_regs->e2; - if ( (current_v != old_v) - && (current_e1 != old_e1) - && (current_e2 != old_e2)) - { +// if ( (current_v != old_v) +// && (current_e1 != old_e1) +// && (current_e2 != old_e2)) +// { // get new values newValue_v = getIntFromShort( current_v ); newValue_e1 = getIntFromShort( current_e1 ); @@ -461,7 +461,7 @@ rtems_task avgv_task(rtems_task_argument 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 ); - } +// } old_v = current_v; old_e1 = current_e1; old_e2 = current_e2;