HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r162:32d2a1c32a62

Sync before going back to 1.0.0.12 for srec generation

paul -

r162:32d2a1c32a62 VHDLib206

parent child

Context file:

r162:32d2a1c32a62

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Jun 23 07:48:42 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 24 09:17:30 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=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=12 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=13 -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/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:

FSW-qt/fsw-qt.pro +1 -1

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** vhdl_dev *** debug_tch
             CONFIG += console verbose
             CONFIG -= qt
             include(./sparc.pri)
             # flight software version
             SWVERSION=-1-0
             DEFINES += SW_VERSION_N1=1 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=12 # internal
+            DEFINES += SW_VERSION_N4=13 # internal
             contains( CONFIG, debug_tch ) {
                 DEFINES += DEBUG_TCH
             }
             contains( CONFIG, vhdl_dev ) {
                 DEFINES += VHDL_DEV
             }
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE
             }
             contains( CONFIG, debug_messages ) {
                 DEFINES += DEBUG_MESSAGES
             }
             contains( CONFIG, cpu_usage_report ) {
                 DEFINES += PRINT_TASK_STATISTICS
             }
             contains( CONFIG, stack_report ) {
                 DEFINES += PRINT_STACK_REPORT
             }
             contains( CONFIG, boot_messages ) {
                 DEFINES += BOOT_MESSAGES
             }
             #doxygen.target = doxygen
             #doxygen.commands = doxygen ../doc/Doxyfile
             #QMAKE_EXTRA_TARGETS += doxygen
             TARGET = fsw
             INCLUDEPATH += \
                 ../src \
                 ../header \
                 ../header/processing \
                 ../src/LFR_basic-parameters
             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
             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 \
                 ../header/processing/avf2_prc2.h \
                 ../header/fsw_params_wf_handler.h \
                 ../header/lfr_cpu_usage_report.h \
                 ../src/LFR_basic-parameters/basic_parameters.h \
                 ../src/LFR_basic-parameters/basic_parameters_params.h

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-06-23T07:07:05. -->
+            <!-- Written by QtCreator 3.0.1, 2014-06-24T12:52:17. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
               <value type="int">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.EditorSettings</variable>
               <valuemap type="QVariantMap">
                <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
                <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
                <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
                 <value type="QString" key="language">Cpp</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
                 </valuemap>
                </valuemap>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
                 <value type="QString" key="language">QmlJS</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
                 </valuemap>
                </valuemap>
                <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
                <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
                <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
                <value type="int" key="EditorConfiguration.IndentSize">4</value>
                <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
                <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
                <value type="int" key="EditorConfiguration.PaddingMode">1</value>
                <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
                <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
                <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
                <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
                <value type="int" key="EditorConfiguration.TabSize">8</value>
                <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
                <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
                <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
                <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
                <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
                <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.PluginSettings</variable>
               <valuemap type="QVariantMap"/>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Target.0</variable>
               <valuemap type="QVariantMap">
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5289e843-9ef2-45ce-88c6-ad27d8e08def}</value>
                <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
                 <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory"></value>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value>
                   <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
                  </valuemap>
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
                 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
                 <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
                 <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <value type="int" key="PE.EnvironmentAspect.Base">2</value>
                 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">fsw-qt</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/FSW-qt/fsw-qt.pro</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">fsw-qt.pro</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
                 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
                 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
                 <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
                 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.TargetCount</variable>
               <value type="int">1</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
               <value type="QByteArray">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
               <value type="int">15</value>
              </data>
             </qtcreator>

header/processing/fsw_processing.h +20 -8

             #ifndef FSW_PROCESSING_H_INCLUDED
             #define FSW_PROCESSING_H_INCLUDED
             #include <rtems.h>
             #include <grspw.h>
             #include <math.h>
             #include <stdlib.h> // abs() is in the stdlib
             #include <stdio.h>  // printf()
             #include <math.h>
             #include "fsw_params.h"
             #include "fsw_spacewire.h"
             typedef struct ring_node_sm
             {
                 struct ring_node_sm *previous;
                 struct ring_node_sm *next;
                 int buffer_address;
                 unsigned int status;
                 unsigned int coarseTime;
                 unsigned int fineTime;
             } ring_node_sm;
             typedef struct ring_node_asm
             {
                 struct ring_node_asm *next;
                 float  matrix[ TOTAL_SIZE_SM ];
                 unsigned int status;
             } ring_node_asm;
             typedef struct
             {
                 Header_TM_LFR_SCIENCE_BP_t header;
                 unsigned char data[ 30 * 22 ];   // MAX size is 22 * 30 [TM_LFR_SCIENCE_BURST_BP2_F1]
             } bp_packet;
             typedef struct
             {
                 Header_TM_LFR_SCIENCE_BP_with_spare_t header;
                 unsigned char data[ 9 * 13 ];   // only for TM_LFR_SCIENCE_NORMAL_BP1_F0 and F1
             } bp_packet_with_spare;
             typedef struct
             {
                 ring_node_asm *norm;
                 ring_node_asm *burst_sbm;
                 rtems_event_set event;
                 unsigned int coarseTime;
                 unsigned int fineTime;
             } asm_msg;
             extern volatile int sm_f0[ ];
             extern volatile int sm_f1[ ];
             extern volatile int sm_f2[ ];
             // parameters
             extern struct param_local_str param_local;
             // registers
             extern time_management_regs_t *time_management_regs;
             extern spectral_matrix_regs_t *spectral_matrix_regs;
             extern rtems_name  misc_name[5];
             extern rtems_id    Task_id[20];         /* array of task ids */
             // ISR
             rtems_isr spectral_matrices_isr( rtems_vector_number vector );
             rtems_isr spectral_matrices_isr_simu( rtems_vector_number vector );
             //******************
             // Spectral Matrices
             void reset_nb_sm( void );
             // SM
             void SM_init_rings( void );
             void SM_reset_current_ring_nodes( void );
             void SM_generic_init_ring(ring_node_sm *ring, unsigned char nbNodes, volatile int sm_f[] );
             // ASM
             void ASM_generic_init_ring(ring_node_asm *ring, unsigned char nbNodes );
             void ASM_init_header( Header_TM_LFR_SCIENCE_ASM_t *header);
             void ASM_send(Header_TM_LFR_SCIENCE_ASM_t *header, char *spectral_matrix,
                                 unsigned int sid, spw_ioctl_pkt_send *spw_ioctl_send, rtems_id queue_id);
             //*****************
             // Basic Parameters
             void BP_reset_current_ring_nodes( void );
             void BP_init_header( Header_TM_LFR_SCIENCE_BP_t *header,
                                  unsigned int apid, unsigned char sid,
                                  unsigned int packetLength , unsigned char blkNr);
             void BP_init_header_with_spare( Header_TM_LFR_SCIENCE_BP_with_spare_t *header,
                                             unsigned int apid, unsigned char sid,
                                             unsigned int packetLength, unsigned char blkNr );
             void BP_send( char *data,
                           rtems_id queue_id ,
                           unsigned int nbBytesToSend , unsigned int sid );
             //******************
             // general functions
             void reset_spectral_matrix_regs( void );
             void set_time(unsigned char *time, unsigned char *timeInBuffer );
             unsigned long long int get_acquisition_time( unsigned char *timePtr );
             void close_matrix_actions(unsigned int *nb_sm, unsigned int nb_sm_before_avf, rtems_id task_id,
                                        ring_node_sm *node_for_averaging, ring_node_sm *ringNode, unsigned long long int time);
             unsigned char getSID( rtems_event_set event );
             extern rtems_status_code get_message_queue_id_prc1( rtems_id *queue_id );
             extern rtems_status_code get_message_queue_id_prc2( rtems_id *queue_id );
             //***************************************
             // DEFINITIONS OF STATIC INLINE FUNCTIONS
             static inline void SM_average( float *averaged_spec_mat_NORM, float *averaged_spec_mat_SBM,
                               ring_node_sm *ring_node_tab[],
                               unsigned int nbAverageNORM, unsigned int nbAverageSBM );
             static inline void ASM_reorganize_and_divide(float *averaged_spec_mat, float *averaged_spec_mat_reorganized,
                                            float divider );
             static inline void ASM_compress_reorganize_and_divide(float *averaged_spec_mat, float *compressed_spec_mat,
                                               float divider,
                                               unsigned char nbBinsCompressedMatrix, unsigned char nbBinsToAverage , unsigned char ASMIndexStart);
             static inline void ASM_convert(volatile float *input_matrix, char *output_matrix);
             void SM_average( float *averaged_spec_mat_NORM, float *averaged_spec_mat_SBM,
                               ring_node_sm *ring_node_tab[],
                               unsigned int nbAverageNORM, unsigned int nbAverageSBM )
             {
                 float sum;
                 unsigned int i;
                 for(i=0; i<TOTAL_SIZE_SM; i++)
                 {
                     sum = ( (int *) (ring_node_tab[0]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[1]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[2]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[3]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[4]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[5]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[6]->buffer_address) ) [ i ]
                             + ( (int *) (ring_node_tab[7]->buffer_address) ) [ i ];
                     if ( (nbAverageNORM == 0) && (nbAverageSBM == 0) )
                     {
                         averaged_spec_mat_NORM[ i ] = sum;
                         averaged_spec_mat_SBM[  i ] = sum;
                     }
                     else if ( (nbAverageNORM != 0) && (nbAverageSBM != 0) )
                     {
                         averaged_spec_mat_NORM[ i ] = ( averaged_spec_mat_NORM[  i ] + sum );
                         averaged_spec_mat_SBM[  i ] = ( averaged_spec_mat_SBM[   i ] + sum );
                     }
                     else if ( (nbAverageNORM != 0) && (nbAverageSBM == 0) )
                     {
                         averaged_spec_mat_NORM[ i ] = ( averaged_spec_mat_NORM[ i ] + sum );
                         averaged_spec_mat_SBM[  i ] = sum;
                     }
                     else
                     {
                         PRINTF2("ERR *** in SM_average *** unexpected parameters %d %d\n", nbAverageNORM, nbAverageSBM)
                     }
                 }
             }
             void ASM_reorganize_and_divide( float *averaged_spec_mat, float *averaged_spec_mat_reorganized, float divider )
             {
+                // reorganize the data to have a matrix in the VHDL format
+                // INPUT	(VHDL format)
+                // component_0[0 .. 127] component_1[0 .. 127] .. component_24[0 .. 127]
+                // OUTPUT		(ICD format)
+                // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
                 int frequencyBin;
                 int asmComponent;
-                unsigned int offsetAveragedSpecMatReorganized;
+                unsigned int offsetASMReorganized;
-                unsigned int offsetAveragedSpecMat;
+                unsigned int offsetASM;
                 for (asmComponent = 0; asmComponent < NB_VALUES_PER_SM; asmComponent++)
                 {
                     for( frequencyBin = 0; frequencyBin < NB_BINS_PER_SM; frequencyBin++ )
                     {
-                        offsetAveragedSpecMatReorganized =
+                        offsetASM =
+                                asmComponent * NB_BINS_PER_SM
+                                + frequencyBin;
+                        offsetASMReorganized =
                                 frequencyBin * NB_VALUES_PER_SM
                                 + asmComponent;
-                        offsetAveragedSpecMat            =
+                        averaged_spec_mat_reorganized[ offsetASMReorganized  ] =
-                                asmComponent * NB_BINS_PER_SM
+                                averaged_spec_mat[ offsetASM ] / divider;
-                                + frequencyBin;
-                        averaged_spec_mat_reorganized[offsetAveragedSpecMatReorganized  ] =
-                                averaged_spec_mat[ offsetAveragedSpecMat ] / divider;
                     }
                 }
             }
             void ASM_compress_reorganize_and_divide(float *averaged_spec_mat, float *compressed_spec_mat , float divider,
                                              unsigned char nbBinsCompressedMatrix, unsigned char nbBinsToAverage, unsigned char ASMIndexStart )
             {
                 int frequencyBin;
                 int asmComponent;
                 int offsetASM;
                 int offsetCompressed;
                 int k;
                 // build data
                 for (asmComponent = 0; asmComponent < NB_VALUES_PER_SM; asmComponent++)
                 {
                     for( frequencyBin = 0; frequencyBin < nbBinsCompressedMatrix; frequencyBin++ )
                     {
                         offsetCompressed =  // NO TIME OFFSET
                                 frequencyBin * NB_VALUES_PER_SM
                                 + asmComponent;
                         offsetASM =         // NO TIME OFFSET
                                 asmComponent * NB_BINS_PER_SM
                                 + ASMIndexStart
                                 + frequencyBin * nbBinsToAverage;
                         compressed_spec_mat[ offsetCompressed ] = 0;
                         for ( k = 0; k < nbBinsToAverage; k++ )
                         {
                             compressed_spec_mat[offsetCompressed ] =
                                     ( compressed_spec_mat[ offsetCompressed ]
                                     + averaged_spec_mat[ offsetASM + k ] ) / (divider * nbBinsToAverage);
                         }
                     }
                 }
             }
             void ASM_convert( volatile float *input_matrix, char *output_matrix)
             {
+                // convert the data to have a matrix in compressed float, 16 bits  = [sign 1 bit *** exp 8 bits *** fraction 7 bits]
+                // INTPUT		(ICD format)
+                // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
+                // OUTPUT		(ICD format)
+                // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
                 unsigned int frequencyBin;
                 unsigned int asmComponent;
                 char * pt_char_input;
                 char * pt_char_output;
                 unsigned int offsetInput;
                 unsigned int offsetOutput;
                 pt_char_input = (char*) &input_matrix;
                 pt_char_output = (char*) &output_matrix;
                 // convert all other data
                 for( frequencyBin=0; frequencyBin<NB_BINS_PER_SM; frequencyBin++)
                 {
                     for ( asmComponent=0; asmComponent<NB_VALUES_PER_SM; asmComponent++)
                     {
                         offsetInput  =       (frequencyBin*NB_VALUES_PER_SM) + asmComponent   ;
                         offsetOutput = 2 * ( (frequencyBin*NB_VALUES_PER_SM) + asmComponent ) ;
                         pt_char_input =  (char*) &input_matrix [ offsetInput  ];
                         pt_char_output = (char*) &output_matrix[ offsetOutput ];
                         pt_char_output[0] = pt_char_input[0];   // bits 31 downto 24 of the float
                         pt_char_output[1] = pt_char_input[1];   // bits 23 downto 16 of the float
                     }
                 }
             }
             #endif // FSW_PROCESSING_H_INCLUDED

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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