HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r275:7563e13131aa

3.0.0.21...

paul -

r275:7563e13131aa R3a

parent child

Context file:

r275:7563e13131aa

FSW-qt/fsw-qt.pro +1 -1

             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
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

header/tc_load_dump_parameters.h +1 -1

             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 );

src/tc_load_dump_parameters.c +3 -3

                 // 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
             //***********************
             // 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;
                 // 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;

src/wf_handler.c +1 -1

                 }
                 else
                 {
-                    if ( (correction < -1.) && (correction < -0.5) )
+                    if ( (-1. < correction) && (correction < -0.5) )
                     {
                         correctionInt = -1;
                     }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages