# HG changeset patch # User paul # Date 2017-04-04 06:04:42 # Node ID 78a68c2c62b6ad72038a48b01302872ec5e0b99f # Parent c29b7c3ddb6e6f20200a6f6998aeced793564abb 3.2.0.14 AVGV filter coefficients updated #1037 HK 1Hz 3.2.0.12: mauvaises valeurs DC + distorsions visibles sur signaux faibles diff --git a/header/fsw_misc.h b/header/fsw_misc.h --- a/header/fsw_misc.h +++ b/header/fsw_misc.h @@ -66,33 +66,33 @@ typedef struct{ unsigned char dpu_spw_rx_too_big; } hk_lfr_me_t; -#define B00 65 -#define B01 65 +#define B00 196 +#define B01 196 #define B02 0 -#define B10 2048 -#define B11 -3817 -#define B12 2048 -#define B20 2048 -#define B21 -3987 -#define B22 2048 +#define B10 131 +#define B11 -244 +#define B12 131 +#define B20 161 +#define B21 -314 +#define B22 161 #define A00 1 -#define A01 -1850 +#define A01 -925 #define A02 0 #define A10 1 -#define A11 -3787 -#define A12 1758 +#define A11 -947 +#define A12 439 #define A20 1 -#define A21 -3974 -#define A22 1943 +#define A21 -993 +#define A22 486 -#define GAIN_B0 17 +#define GAIN_B0 12 #define GAIN_B1 11 -#define GAIN_B2 11 +#define GAIN_B2 10 -#define GAIN_A0 11 -#define GAIN_A1 11 -#define GAIN_A2 11 +#define GAIN_A0 10 +#define GAIN_A1 9 +#define GAIN_A2 9 #define NB_COEFFS 3 #define COEFF0 0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,14 +57,14 @@ option(FSW_debug_messages "Enable LFR de option(FSW_cpu_usage_report "Enable LFR cpu usage report" OFF) option(FSW_stack_report "Enable LFR stack report" OFF) option(FSW_vhdl_dev "?" OFF) -option(FSW_lpp_dpu_destid "Set to debug at LPP" OFF) +option(FSW_lpp_dpu_destid "Set to debug at LPP" ON) option(FSW_debug_watchdog "Enable debug watchdog" OFF) 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 "13" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "14" CACHE STRING "Choose N4 FSW Version." FORCE) if(FSW_verbose) add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)