diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 19 07:41:34 2014 +# Generated by qmake (2.01a) (Qt 4.8.6) on: Fri Jun 20 15:19:24 2014 # Project: fsw-qt.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget 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 @@ -79,7 +79,6 @@ int action_load_burst_par(ccsdsTelecomma * */ - int result; int flag; rtems_status_code status; unsigned char sy_lfr_b_bp_p0; @@ -90,7 +89,7 @@ int action_load_burst_par(ccsdsTelecomma if ( lfrCurrentMode == LFR_MODE_BURST ) { status = send_tm_lfr_tc_exe_not_executable( TC, queue_id ); - result = LFR_DEFAULT; + flag = LFR_DEFAULT; } sy_lfr_b_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_B_BP_P0 ]; @@ -131,8 +130,8 @@ int action_load_burst_par(ccsdsTelecomma // SET HTE PARAMETERS if (flag == LFR_SUCCESSFUL) { - result = set_sy_lfr_b_bp_p0( TC ); - result = set_sy_lfr_b_bp_p1( TC ); + flag = set_sy_lfr_b_bp_p0( TC ); + flag = set_sy_lfr_b_bp_p1( TC ); } return flag; @@ -147,7 +146,6 @@ int action_load_sbm1_par(ccsdsTelecomman * */ - int result; int flag; rtems_status_code status; unsigned char sy_lfr_s1_bp_p0; @@ -158,7 +156,7 @@ int action_load_sbm1_par(ccsdsTelecomman if ( lfrCurrentMode == LFR_MODE_SBM1 ) { status = send_tm_lfr_tc_exe_not_executable( TC, queue_id ); - result = LFR_DEFAULT; + flag = LFR_DEFAULT; } sy_lfr_s1_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_S1_BP_P0 ]; @@ -197,8 +195,8 @@ int action_load_sbm1_par(ccsdsTelecomman // SET THE PARAMETERS if (flag == LFR_SUCCESSFUL) { - result = set_sy_lfr_s1_bp_p0( TC ); - result = set_sy_lfr_s1_bp_p1( TC ); + flag = set_sy_lfr_s1_bp_p0( TC ); + flag = set_sy_lfr_s1_bp_p1( TC ); } return flag; @@ -213,7 +211,6 @@ int action_load_sbm2_par(ccsdsTelecomman * */ - int result; int flag; rtems_status_code status; unsigned char sy_lfr_s2_bp_p0; @@ -224,7 +221,7 @@ int action_load_sbm2_par(ccsdsTelecomman if ( lfrCurrentMode == LFR_MODE_SBM2 ) { status = send_tm_lfr_tc_exe_not_executable( TC, queue_id ); - result = LFR_DEFAULT; + flag = LFR_DEFAULT; } sy_lfr_s2_bp_p0 = TC->dataAndCRC[ DATAFIELD_POS_SY_LFR_S2_BP_P0 ]; @@ -265,8 +262,8 @@ int action_load_sbm2_par(ccsdsTelecomman // SET THE PARAMETERS if (flag == LFR_SUCCESSFUL) { - result = set_sy_lfr_s2_bp_p0( TC ); - result = set_sy_lfr_s2_bp_p1( TC ); + flag = set_sy_lfr_s2_bp_p0( TC ); + flag = set_sy_lfr_s2_bp_p1( TC ); } return flag;