# HG changeset patch # User paul # Date 2014-12-16 12:26:20 # Node ID 27b8d97a50ae47654961223ab9dd563878411993 # Parent 2e8a1244670be60bdbf5ac132e2386056f71bde8 2.0.2.0 first revision compatibile with the new waveform picker (VHDL >= 0.1.28) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -12,3 +12,10 @@ doc FSW-qt/bin/fsw src/LFR_basic-parameters *.pro.user.* +FSW-qt/bin/spectralmatrix/asm_f0_test_20140403_case1.txt +FSW-qt/bin/spectralmatrix/asm_f0_test_20140403_case2.txt +FSW-qt/bin/spectralmatrix/asm_f0_test_paul_1.txt +run2/src +run2/trace +run3/src +run3/trace diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile deleted file mode 100644 --- a/FSW-qt/Makefile +++ /dev/null @@ -1,273 +0,0 @@ -############################################################################# -# Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Dec 15 12:32:49 2014 -# Project: fsw-qt.pro -# Template: app -# Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro -############################################################################# - -####### Compiler, tools and options - -CC = sparc-rtems-gcc -CXX = sparc-rtems-g++ -DEFINES = -DSW_VERSION_N1=2 -DSW_VERSION_N2=0 -DSW_VERSION_N3=1 -DSW_VERSION_N4=1 -DLPP_DPU_DESTID -DPRINT_MESSAGES_ON_CONSOLE -CFLAGS = -pipe -O3 -Wall $(DEFINES) -CXXFLAGS = -pipe -O3 -Wall $(DEFINES) -INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/common_lfr_headers -I../header/processing -I../src/LFR_basic-parameters -LINK = sparc-rtems-g++ -LFLAGS = -LIBS = $(SUBLIBS) -AR = sparc-rtems-ar rcs -RANLIB = -QMAKE = /usr/bin/qmake-qt4 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = sparc-rtems-strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = obj/ - -####### Files - -SOURCES = ../src/wf_handler.c \ - ../src/tc_handler.c \ - ../src/fsw_misc.c \ - ../src/fsw_init.c \ - ../src/fsw_globals.c \ - ../src/fsw_spacewire.c \ - ../src/tc_load_dump_parameters.c \ - ../src/tm_lfr_tc_exe.c \ - ../src/tc_acceptance.c \ - ../src/processing/fsw_processing.c \ - ../src/processing/avf0_prc0.c \ - ../src/processing/avf1_prc1.c \ - ../src/processing/avf2_prc2.c \ - ../src/lfr_cpu_usage_report.c \ - ../src/LFR_basic-parameters/basic_parameters.c -OBJECTS = obj/wf_handler.o \ - obj/tc_handler.o \ - obj/fsw_misc.o \ - obj/fsw_init.o \ - obj/fsw_globals.o \ - obj/fsw_spacewire.o \ - obj/tc_load_dump_parameters.o \ - obj/tm_lfr_tc_exe.o \ - obj/tc_acceptance.o \ - obj/fsw_processing.o \ - obj/avf0_prc0.o \ - obj/avf1_prc1.o \ - obj/avf2_prc2.o \ - obj/lfr_cpu_usage_report.o \ - obj/basic_parameters.o -DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \ - /usr/lib64/qt4/mkspecs/common/linux.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt4/mkspecs/common/g++-base.conf \ - /usr/lib64/qt4/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt4/mkspecs/qconfig.pri \ - /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \ - /usr/lib64/qt4/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt4/mkspecs/features/qt_config.prf \ - /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt4/mkspecs/features/default_pre.prf \ - sparc.pri \ - /usr/lib64/qt4/mkspecs/features/release.prf \ - /usr/lib64/qt4/mkspecs/features/default_post.prf \ - /usr/lib64/qt4/mkspecs/features/shared.prf \ - /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt4/mkspecs/features/warn_on.prf \ - /usr/lib64/qt4/mkspecs/features/resources.prf \ - /usr/lib64/qt4/mkspecs/features/uic.prf \ - /usr/lib64/qt4/mkspecs/features/yacc.prf \ - /usr/lib64/qt4/mkspecs/features/lex.prf \ - /usr/lib64/qt4/mkspecs/features/include_source_dir.prf \ - fsw-qt.pro -QMAKE_TARGET = fsw -DESTDIR = bin/ -TARGET = bin/fsw - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): $(OBJECTS) - @$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/ - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: fsw-qt.pro /usr/lib64/qt4/mkspecs/linux-g++/qmake.conf /usr/lib64/qt4/mkspecs/common/unix.conf \ - /usr/lib64/qt4/mkspecs/common/linux.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt4/mkspecs/common/g++-base.conf \ - /usr/lib64/qt4/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt4/mkspecs/qconfig.pri \ - /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \ - /usr/lib64/qt4/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt4/mkspecs/features/qt_config.prf \ - /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt4/mkspecs/features/default_pre.prf \ - sparc.pri \ - /usr/lib64/qt4/mkspecs/features/release.prf \ - /usr/lib64/qt4/mkspecs/features/default_post.prf \ - /usr/lib64/qt4/mkspecs/features/shared.prf \ - /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt4/mkspecs/features/warn_on.prf \ - /usr/lib64/qt4/mkspecs/features/resources.prf \ - /usr/lib64/qt4/mkspecs/features/uic.prf \ - /usr/lib64/qt4/mkspecs/features/yacc.prf \ - /usr/lib64/qt4/mkspecs/features/lex.prf \ - /usr/lib64/qt4/mkspecs/features/include_source_dir.prf - $(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro -/usr/lib64/qt4/mkspecs/common/unix.conf: -/usr/lib64/qt4/mkspecs/common/linux.conf: -/usr/lib64/qt4/mkspecs/common/gcc-base.conf: -/usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf: -/usr/lib64/qt4/mkspecs/common/g++-base.conf: -/usr/lib64/qt4/mkspecs/common/g++-unix.conf: -/usr/lib64/qt4/mkspecs/qconfig.pri: -/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri: -/usr/lib64/qt4/mkspecs/features/qt_functions.prf: -/usr/lib64/qt4/mkspecs/features/qt_config.prf: -/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf: -/usr/lib64/qt4/mkspecs/features/default_pre.prf: -sparc.pri: -/usr/lib64/qt4/mkspecs/features/release.prf: -/usr/lib64/qt4/mkspecs/features/default_post.prf: -/usr/lib64/qt4/mkspecs/features/shared.prf: -/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/lib64/qt4/mkspecs/features/warn_on.prf: -/usr/lib64/qt4/mkspecs/features/resources.prf: -/usr/lib64/qt4/mkspecs/features/uic.prf: -/usr/lib64/qt4/mkspecs/features/yacc.prf: -/usr/lib64/qt4/mkspecs/features/lex.prf: -/usr/lib64/qt4/mkspecs/features/include_source_dir.prf: -qmake: FORCE - @$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro - -dist: - @$(CHK_DIR_EXISTS) obj/fsw1.0.0 || $(MKDIR) obj/fsw1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw1.0.0/ && (cd `dirname obj/fsw1.0.0` && $(TAR) fsw1.0.0.tar fsw1.0.0 && $(COMPRESS) fsw1.0.0.tar) && $(MOVE) `dirname obj/fsw1.0.0`/fsw1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -grmon: - cd bin && C:/opt/grmon-eval-2.0.29b/win32/bin/grmon.exe -uart COM4 -u - -check: first - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: - -####### Compile - -obj/wf_handler.o: ../src/wf_handler.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/wf_handler.o ../src/wf_handler.c - -obj/tc_handler.o: ../src/tc_handler.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/tc_handler.o ../src/tc_handler.c - -obj/fsw_misc.o: ../src/fsw_misc.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_misc.o ../src/fsw_misc.c - -obj/fsw_init.o: ../src/fsw_init.c ../src/fsw_config.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_init.o ../src/fsw_init.c - -obj/fsw_globals.o: ../src/fsw_globals.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_globals.o ../src/fsw_globals.c - -obj/fsw_spacewire.o: ../src/fsw_spacewire.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_spacewire.o ../src/fsw_spacewire.c - -obj/tc_load_dump_parameters.o: ../src/tc_load_dump_parameters.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/tc_load_dump_parameters.o ../src/tc_load_dump_parameters.c - -obj/tm_lfr_tc_exe.o: ../src/tm_lfr_tc_exe.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/tm_lfr_tc_exe.o ../src/tm_lfr_tc_exe.c - -obj/tc_acceptance.o: ../src/tc_acceptance.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/tc_acceptance.o ../src/tc_acceptance.c - -obj/fsw_processing.o: ../src/processing/fsw_processing.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_processing.o ../src/processing/fsw_processing.c - -obj/avf0_prc0.o: ../src/processing/avf0_prc0.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/avf0_prc0.o ../src/processing/avf0_prc0.c - -obj/avf1_prc1.o: ../src/processing/avf1_prc1.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/avf1_prc1.o ../src/processing/avf1_prc1.c - -obj/avf2_prc2.o: ../src/processing/avf2_prc2.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/avf2_prc2.o ../src/processing/avf2_prc2.c - -obj/lfr_cpu_usage_report.o: ../src/lfr_cpu_usage_report.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/lfr_cpu_usage_report.o ../src/lfr_cpu_usage_report.c - -obj/basic_parameters.o: ../src/LFR_basic-parameters/basic_parameters.c - $(CC) -c $(CFLAGS) $(INCPATH) -o obj/basic_parameters.o ../src/LFR_basic-parameters/basic_parameters.c - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro --- a/FSW-qt/fsw-qt.pro +++ b/FSW-qt/fsw-qt.pro @@ -11,8 +11,8 @@ include(./sparc.pri) SWVERSION=-1-0 DEFINES += SW_VERSION_N1=2 # major DEFINES += SW_VERSION_N2=0 # minor -DEFINES += SW_VERSION_N3=1 # patch -DEFINES += SW_VERSION_N4=1 # internal +DEFINES += SW_VERSION_N3=2 # patch +DEFINES += SW_VERSION_N4=0 # internal # #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage @@ -62,7 +62,7 @@ TARGET = fsw INCLUDEPATH += \ $${PWD}/../src \ $${PWD}/../header \ - $${PWD}/../header/common_lfr_headers \ + $${PWD}/../header/lfr_common_headers \ $${PWD}/../header/processing \ $${PWD}/../src/LFR_basic-parameters @@ -87,16 +87,12 @@ HEADERS += \ ../header/wf_handler.h \ ../header/tc_handler.h \ ../header/grlib_regs.h \ - ../header/fsw_params.h \ ../header/fsw_misc.h \ ../header/fsw_init.h \ - ../header/ccsds_types.h \ ../header/fsw_spacewire.h \ ../header/tc_load_dump_parameters.h \ ../header/tm_lfr_tc_exe.h \ ../header/tc_acceptance.h \ - ../header/fsw_params_nb_bytes.h \ - ../header/fsw_params_processing.h \ ../header/processing/fsw_processing.h \ ../header/processing/avf0_prc0.h \ ../header/processing/avf1_prc1.h \ @@ -105,5 +101,10 @@ HEADERS += \ ../header/lfr_cpu_usage_report.h \ ../src/LFR_basic-parameters/basic_parameters.h \ ../src/LFR_basic-parameters/basic_parameters_params.h \ - ../header/tm_byte_positions.h + ../header/lfr_common_headers/ccsds_types.h \ + ../header/lfr_common_headers/fsw_params.h \ + ../header/lfr_common_headers/fsw_params_nb_bytes.h \ + ../header/lfr_common_headers/fsw_params_processing.h \ + ../header/lfr_common_headers/TC_types.h \ + ../header/lfr_common_headers/tm_byte_positions.h diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user deleted file mode 100644 --- a/FSW-qt/fsw-qt.pro.user +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - EnvironmentId - {2e58a81f-9962-4bba-ae6b-760177f0656c} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop-Qt 4.8.2 in PATH (System) - Desktop-Qt 4.8.2 in PATH (System) - {5289e843-9ef2-45ce-88c6-ad27d8e08def} - 0 - 0 - 0 - - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - false - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - fsw-qt - - Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/FSW-qt/fsw-qt.pro - - fsw-qt.pro - false - true - - 3768 - true - false - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 16 - - - Version - 16 - - diff --git a/timegen-qt/timegen-qt.pro.user b/timegen-qt/timegen-qt.pro.user deleted file mode 100644 --- a/timegen-qt/timegen-qt.pro.user +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - EnvironmentId - {2e58a81f-9962-4bba-ae6b-760177f0656c} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop-Qt 4.8.2 in PATH (System) - Desktop-Qt 4.8.2 in PATH (System) - {5289e843-9ef2-45ce-88c6-ad27d8e08def} - 0 - 0 - 0 - - /opt/DEV_PLE/timegen-qt - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /opt/DEV_PLE/build-timegen-qt-Desktop_Qt_4_8_2_in_PATH_System-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - timegen-qt - - Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/timegen-qt/timegen-qt.pro - - timegen-qt.pro - false - true - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 16 - - - Version - 16 - -