# HG changeset patch # User paul # Date 2016-02-11 14:07:45 # Node ID 7563e13131aa58ee8caf36c0e1b4281bcf80381f # Parent 4b39bb5ceb611aa41b6320f350ea0e0fa617d4aa 3.0.0.21 modification in snapshot synchro (some intervals were incorrect) but this was not detectable with the configurations used for the tests values < 22 are forbidden for the snapshot period 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 @@ -20,7 +20,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=19 # internal +DEFINES += SW_VERSION_N4=20 # internal # #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage diff --git a/header/tc_load_dump_parameters.h b/header/tc_load_dump_parameters.h --- a/header/tc_load_dump_parameters.h +++ b/header/tc_load_dump_parameters.h @@ -32,7 +32,7 @@ int action_dump_kcoefficients(ccsdsTelec int action_dump_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id ); // NORMAL -int check_common_par_consistency( ccsdsTelecommandPacket_t *TC, rtems_id queue_id ); +int check_normal_par_consistency( ccsdsTelecommandPacket_t *TC, rtems_id queue_id ); int set_sy_lfr_n_swf_l( ccsdsTelecommandPacket_t *TC ); int set_sy_lfr_n_swf_p( ccsdsTelecommandPacket_t *TC ); int set_sy_lfr_n_asm_p( ccsdsTelecommandPacket_t *TC ); 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 @@ -58,7 +58,7 @@ int action_load_normal_par(ccsdsTelecomm // CHECK THE PARAMETERS SET CONSISTENCY if (flag == LFR_SUCCESSFUL) { - flag = check_common_par_consistency( TC, queue_id ); + flag = check_normal_par_consistency( TC, queue_id ); } // SET THE PARAMETERS IF THEY ARE CONSISTENT @@ -469,7 +469,7 @@ int action_dump_par( ccsdsTelecommandPac //*********************** // NORMAL MODE PARAMETERS -int check_common_par_consistency( ccsdsTelecommandPacket_t *TC, rtems_id queue_id ) +int check_normal_par_consistency( ccsdsTelecommandPacket_t *TC, rtems_id queue_id ) { unsigned char msb; unsigned char lsb; @@ -517,7 +517,7 @@ int check_common_par_consistency( ccsdsT // sy_lfr_n_swf_p if (flag == LFR_SUCCESSFUL) { - if ( sy_lfr_n_swf_p < 16 ) + if ( sy_lfr_n_swf_p < 22 ) { status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, DATAFIELD_POS_SY_LFR_N_SWF_P+10, sy_lfr_n_swf_p ); flag = WRONG_APP_DATA; diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -937,7 +937,7 @@ void applyCorrection( double correction } else { - if ( (correction < -1.) && (correction < -0.5) ) + if ( (-1. < correction) && (correction < -0.5) ) { correctionInt = -1; }