HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r405:f3243196bdc5

Forgot to remove dead code functions declarations

jeandet -

r405:f3243196bdc5 3.2.0.24 R3++

parent child

Context file:

r405:f3243196bdc5

header/fsw_misc.h +3 -1

             void timer_configure( unsigned char timer, unsigned int clock_divider,
                                 unsigned char interrupt_level, rtems_isr (*timer_isr)() );
-            void timer_start( unsigned char timer );
+            #ifdef ENABLE_DEAD_CODE
+                void timer_start( unsigned char timer );
+            #endif
             void timer_stop( unsigned char timer );
             void timer_set_clock_divider(unsigned char timer, unsigned int clock_divider);

header/tc_handler.h +3 -1

             void setCalibrationData( void );
             void setCalibrationReload( bool state);
             void setCalibrationEnable( bool state );
-            void setCalibrationInterleaved( bool state );
+            #ifdef ENABLE_DEAD_CODE
+                void setCalibrationInterleaved( bool state );
+            #endif
             void setCalibration( bool state );
             void configureCalibration( bool interleaved );
             //

header/tm_lfr_tc_exe.h +3 -1

             int send_tm_lfr_tc_exe_inconsistent( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                                 unsigned char byte_position, unsigned char rcv_value );
             int send_tm_lfr_tc_exe_not_executable( ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
-            int send_tm_lfr_tc_exe_not_implemented( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
+            #ifdef ENABLE_DEAD_CODE
+                int send_tm_lfr_tc_exe_not_implemented( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
+            #endif
             int send_tm_lfr_tc_exe_error(ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
             int send_tm_lfr_tc_exe_corrupted( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                              unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV, unsigned char destinationID );

src/CMakeLists.txt +1 -1

             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 "23" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "24" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
                 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)

src/tc_handler.c +2 0

             #endif
                 exit(0);
+            #ifdef ENABLE_DEAD_CODE
                 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
+            #endif
                 return LFR_DEFAULT;
             }

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