# HG changeset patch # User paul # Date 2017-02-07 07:51:11 # Node ID c2bf5d0fa3518ef1202297f27aba476ecd976089 # Parent 547f7fbdb0d051f04c829a40a3e3ba608779ecdf 3.2.0.0 Bug #920 GRLIB-TN-0009 mitigation --330 Commit before going back to Rev 326 --329 partial recoding of reaction wheel filtering -- 328 compliance with ICD 4.3 moving average updated and averages written in HK packets diff --git a/sparc/sparc-rtems.cmake b/sparc/sparc-rtems.cmake --- a/sparc/sparc-rtems.cmake +++ b/sparc/sparc-rtems.cmake @@ -4,6 +4,6 @@ set(CMAKE_C_COMPILER /opt/rtems-4.10/bin set(CMAKE_CXX_COMPILER /opt/rtems-4.10/bin/sparc-rtems-g++) set(CMAKE_LINKER /opt/rtems-4.10/bin/sparc-rtems-g++) SET(CMAKE_EXE_LINKER_FLAGS "-static") -set(CMAKE_C_FLAGS_RELEASE "-O3") +set(CMAKE_C_FLAGS_RELEASE "-O3 -mfix-b2bst") set(CMAKE_C_LINK_EXECUTABLE " -o ") include_directories("/opt/rtems-4.10/sparc-rtems/leon3/lib/include") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,9 +62,9 @@ option(FSW_debug_watchdog "Enable debug option(FSW_debug_tch "?" OFF) set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE) -set(SW_VERSION_N2 "1" CACHE STRING "Choose N2 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 "5" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "0" CACHE STRING "Choose N4 FSW Version." FORCE) if(FSW_verbose) add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)