HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r309:a80efd176164

0

CMakeLists.txt +1 -1

             SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/sparc/")
             add_subdirectory(src)
-            add_subdirectory(timegen)
+            #add_subdirectory(timegen)

0

header/GscMemoryLPP.hpp +1 -1

                 }
                 else
                 {
-                    PRINTF("in faultTolerantScheme *** not a Leon3FT not detected\n");
+                    PRINTF("in faultTolerantScheme *** Leon3FT not detected\n");
                     PRINTF2("                       *** vendorID = 0x%x, deviceId = 0x%x\n", vendorId, deviceId);
                 }
             }

0

python_scripts/00_LFRControlPlugin_reload_fsw.py +1 -1

             # LOAD FSW USING LINK 1
             SpwPlugin0.StarDundeeSelectLinkNumber( 1 )
-            dsu3plugin0.openFile("/home/pleroy/DEV/DEV_PLE/FSW-qt/bin/fsw")
+            dsu3plugin0.openFile("/home/pleroy/DEV/DEV_PLE/build-DEV_PLE-Desktop-Default/src/fsw")
             #dsu3plugin0.openFile("/opt/LFR/LFR-FSW/2.0.2.3/fsw")
             dsu3plugin0.loadFile()

0

sparc/sparc-rtems.cmake +1 0

             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_LINK_EXECUTABLE  "<CMAKE_LINKER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
             include_directories("/opt/rtems-4.10/sparc-rtems/leon3/lib/include")

0

src/CMakeLists.txt +2 -2

             cmake_minimum_required (VERSION 2.6)
-            project (FSW)
+            project (fsw)
             include(sparc-rtems)
             add_definitions(-DSW_VERSION_N3=${SW_VERSION_N3})
             add_definitions(-DSW_VERSION_N4=${SW_VERSION_N4})
-            add_executable(FSW ${SOURCES})
+            add_executable(fsw ${SOURCES})

0

src/fsw_init.c 0 -1

                 BOOT_PRINTF1("local_sbm1_nb_cwf_max %d \n", param_local.local_sbm1_nb_cwf_max)
                 BOOT_PRINTF1("local_sbm2_nb_cwf_max %d \n", param_local.local_sbm2_nb_cwf_max)
-                BOOT_PRINTF1("nb_interrupt_f0_MAX = %d\n", param_local.local_nb_interrupt_f0_MAX)
                 // init sequence counters

0

src/tc_load_dump_parameters.c +3 -3

                 valuePtr = (unsigned char*) &value;
                 ptr[0] = valuePtr[0];
-                ptr[1] = valuePtr[0];
+                ptr[1] = valuePtr[1];
-                ptr[2] = valuePtr[0];
+                ptr[2] = valuePtr[2];
-                ptr[3] = valuePtr[0];
+                ptr[3] = valuePtr[3];
             }
             //**********

0

FSW-qt/bin/__init__.py removed 0 0

1

NO CONTENT: file was removed

0

FSW-qt/bin/floatconversion.py removed 0 -83

1

NO CONTENT: file was removed

0

FSW-qt/bin/gdb.ini removed 0 -12

1

NO CONTENT: file was removed

0

FSW-qt/bin/lfr_fsw.sublime-project removed 0 -11

1

NO CONTENT: file was removed

0

FSW-qt/bin/lfr_fsw.sublime-workspace removed 0 -282

1

NO CONTENT: file was removed

0

FSW-qt/bin/loadPlugin.py removed 0 -14

1

NO CONTENT: file was removed

0

FSW-qt/bin/load_spectral_matrix.py removed 0 -21

1

NO CONTENT: file was removed

0

FSW-qt/bin/load_spectral_matrix_TCH.py removed 0 -72

1

NO CONTENT: file was removed

0

FSW-qt/bin/load_spectral_matrix_sinus.py removed 0 -22

1

NO CONTENT: file was removed

0

FSW-qt/bin/spectralmatrix/__init__.py removed 0 0

1

NO CONTENT: file was removed

0

FSW-qt/bin/spectralmatrix/readmatrix.py removed 0 -34

1

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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