HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r93:ffd04db5cce0

Minor changes

paul -

r93:ffd04db5cce0 VHDLib206

parent child

Context file:

r93:ffd04db5cce0

Collapse all files

FSW-qt/Makefile +1 -1

             #############################################################################
             # Makefile for building: bin/fsw-vhdl-dev
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Jan 27 07:11:41 2014
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Feb 6 09:29:25 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=1 -DPRINT_MESSAGES_ON_CONSOLE -DDEBUG_MESSAGES -DVHDL_DEV
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header
             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_processing.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
             OBJECTS       = obj/wf_handler.o \
             		obj/tc_handler.o \
             		obj/fsw_processing.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
             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-vhdl-dev
             DESTDIR       = bin/
             TARGET        = bin/fsw-vhdl-dev
             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/fsw-vhdl-dev1.0.0 || $(MKDIR) obj/fsw-vhdl-dev1.0.0
             	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw-vhdl-dev1.0.0/ && (cd `dirname obj/fsw-vhdl-dev1.0.0` && $(TAR) fsw-vhdl-dev1.0.0.tar fsw-vhdl-dev1.0.0 && $(COMPRESS) fsw-vhdl-dev1.0.0.tar) && $(MOVE) `dirname obj/fsw-vhdl-dev1.0.0`/fsw-vhdl-dev1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw-vhdl-dev1.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_processing.o: ../src/fsw_processing.c ../src/fsw_processing_globals.c
             	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/fsw_processing.o ../src/fsw_processing.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
             ####### Install
             install:   FORCE
             uninstall:   FORCE
             FORCE:

FSW-qt/fsw-qt.pro.user +104 -76

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.0, 2014-01-28T06:58:48. -->
+            <!-- Written by QtCreator 3.0.0, 2014-02-06T15:45:54. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
-              <value type="int">0</value>
+              <value type="int">1</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">System</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.DefaultDisplayName">Desktop</value>
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5289e843-9ef2-45ce-88c6-ad27d8e08def}</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e04e3924-0bd8-4708-be18-f1474e45608e}</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">1</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">/opt/DEV_PLE/FSW-qt</value>
+                <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">true</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">-r -w -j 4</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">-r -w clean</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">Qt 4.8.2 in PATH (System) Release</value>
+                <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">false</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>
-               <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+               <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-                <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/DEV_PLE/FSW-qt</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">false</value>
+                <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</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.Target.1</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">true</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">-r -w </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">-r -w clean</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">Qt 4.8.2 in PATH (System) Debug</value>
+                <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">2</value>
+                <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-                <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
+                <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
                </valuemap>
-               <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
+               <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">No deployment</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">false</value>
-               </valuemap>
-               <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
-                <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.CustomExecutableRunConfiguration.Arguments"></value>
-                <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">doxygen</value>
-                <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">true</value>
-                <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">/opt/DEV_PLE/doc</value>
-                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run doxygen</value>
-                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-                <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</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">2</value>
+               <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.TargetCount</variable>
-              <value type="int">1</value>
+              <value type="int">2</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/ccsds_types.h +8 -6

             #ifndef CCSDS_TYPES_H_INCLUDED
             #define CCSDS_TYPES_H_INCLUDED
             #define CCSDS_PROTOCOLE_EXTRA_BYTES 4
             #define CCSDS_TELEMETRY_HEADER_LENGTH 16+4
             #define CCSDS_TM_PKT_MAX_SIZE 4412
             #define CCSDS_TELECOMMAND_HEADER_LENGTH 10+4
             #define CCSDS_TC_PKT_MAX_SIZE 256
             #define CCSDS_TC_PKT_MIN_SIZE 16
             #define CCSDS_TC_TM_PACKET_OFFSET 7
             #define CCSDS_PROCESS_ID 76
             #define CCSDS_PACKET_CATEGORY 12
             #define CCSDS_NODE_ADDRESS 0xfe
             #define CCSDS_USER_APP 0x00
             #define DEFAULT_SPARE1_PUSVERSION_SPARE2 0x10
             #define DEFAULT_RESERVED 0x00
             #define DEFAULT_HKBIA 0x1e  // 0001 1110
             // PACKET ID
             #define TM_PACKET_ID_TC_EXE                     0x0cc1 // PID 76 CAT 1
             #define TM_PACKET_ID_HK                         0x0cc4 // PID 76 CAT 4
             #define TM_PACKET_ID_PARAMETER_DUMP             0x0cc9 // PID 76 CAT 9
             #define TM_PACKET_ID_SCIENCE_NORMAL_BURST       0x0ccc // PID 76 CAT 12
             #define TM_PACKET_ID_SCIENCE_SBM1_SBM2          0x0cfc // PID 79 CAT 12
             #define TM_PACKET_PID_DEFAULT                   76
             #define TM_PACKET_PID_BURST_SBM1_SBM2           79
             #define TM_PACKET_CAT_TC_EXE                    1
             #define TM_PACKET_CAT_HK                        4
             #define TM_PACKET_CAT_PARAMETER_DUMP            9
             #define TM_PACKET_CAT_SCIENCE                   12
             // PACKET SEQUENCE CONTROL
             #define TM_PACKET_SEQ_CTRL_CONTINUATION 0x00    // [0000 0000]
             #define TM_PACKET_SEQ_CTRL_FIRST        0x40    // [0100 0000]
             #define TM_PACKET_SEQ_CTRL_LAST         0x80    // [1000 0000]
             #define TM_PACKET_SEQ_CTRL_STANDALONE   0xc0    // [1100 0000]
             #define TM_PACKET_SEQ_CNT_DEFAULT       0x00    // [0000 0000]
             // DESTINATION ID
             #define TM_DESTINATION_ID_GROUND 0
             #define TM_DESTINATION_ID_MISSION_TIMELINE 110
             #define TM_DESTINATION_ID_TC_SEQUENCES 111
             #define TM_DESTINATION_ID_RECOVERY_ACTION_COMMAND 112
             #define TM_DESTINATION_ID_BACKUP_MISSION_TIMELINE 113
             #define TM_DESTINATION_ID_DIRECT_CMD 120
             #define TM_DESTINATION_ID_SPARE_GRD_SRC1 121
             #define TM_DESTINATION_ID_SPARE_GRD_SRC2 122
             #define TM_DESTINATION_ID_OBCP 15
             #define TM_DESTINATION_ID_SYSTEM_CONTROL 14
             #define TM_DESTINATION_ID_AOCS 11
             #define CCSDS_DESTINATION_ID 0x01
             #define CCSDS_PROTOCOLE_ID 0x02
             #define CCSDS_RESERVED 0x00
             #define CCSDS_USER_APP 0x00
             #define SIZE_TM_LFR_TC_EXE_NOT_IMPLEMENTED 24
             #define SIZE_TM_LFR_TC_EXE_CORRUPTED 32
             #define SIZE_HK_PARAMETERS 112
             // TC TYPES
             #define TC_TYPE_GEN 181
             #define TC_TYPE_TIME 9
             // TC SUBTYPES
             #define TC_SUBTYPE_RESET 1
             #define TC_SUBTYPE_LOAD_COMM 11
             #define TC_SUBTYPE_LOAD_NORM 13
             #define TC_SUBTYPE_LOAD_BURST 19
             #define TC_SUBTYPE_LOAD_SBM1 25
             #define TC_SUBTYPE_LOAD_SBM2 27
             #define TC_SUBTYPE_DUMP 31
             #define TC_SUBTYPE_ENTER 41
             #define TC_SUBTYPE_UPDT_INFO 51
             #define TC_SUBTYPE_EN_CAL 61
             #define TC_SUBTYPE_DIS_CAL 63
             #define TC_SUBTYPE_UPDT_TIME 129
             // TC LEN
             #define TC_LEN_RESET 12
             #define TC_LEN_LOAD_COMM 14
             #define TC_LEN_LOAD_NORM 22
             #define TC_LEN_LOAD_BURST 14
             #define TC_LEN_LOAD_SBM1 14
             #define TC_LEN_LOAD_SBM2 14
             #define TC_LEN_DUMP 12
             #define TC_LEN_ENTER 20
             #define TC_LEN_UPDT_INFO 46
             #define TC_LEN_EN_CAL 12
             #define TC_LEN_DIS_CAL 12
             #define TC_LEN_UPDT_TIME 18
             // TM TYPES
             #define TM_TYPE_TC_EXE 1
             #define TM_TYPE_HK 3
             #define TM_TYPE_PARAMETER_DUMP 3
             #define TM_TYPE_LFR_SCIENCE 21
             // TM SUBTYPES
             #define TM_SUBTYPE_EXE_OK 7
             #define TM_SUBTYPE_EXE_NOK 8
             #define TM_SUBTYPE_HK 25
             #define TM_SUBTYPE_PARAMETER_DUMP 25
             #define TM_SUBTYPE_SCIENCE 3
             #define TM_SUBTYPE_LFR_SCIENCE 3
             // FAILURE CODES
             #define ILLEGAL_APID        0
             #define WRONG_LEN_PKT       1
             #define INCOR_CHECKSUM      2
             #define ILL_TYPE            3
             #define ILL_SUBTYPE         4
             #define WRONG_APP_DATA      5       // 0x00 0x05
             #define TC_NOT_EXE          42000   // 0xa4 0x10
             #define WRONG_SRC_ID        42001   // 0xa4 0x11
             #define FUNCT_NOT_IMPL      42002   // 0xa4 0x12
             #define FAIL_DETECTED       42003   // 0xa4 0x13
             #define NOT_ALLOWED         42004   // 0xa4 0x14
             #define CORRUPTED           42005   // 0xa4 0x15
             #define CCSDS_TM_VALID      7
             // TC SID
             #define SID_TC_GROUND       0
             #define SID_TC_MISSION_TIMELINE         110
             #define SID_TC_TC_SEQUENCES             111
             #define SID_TC_RECOVERY_ACTION_CMD      112
             #define SID_TC_BACKUP_MISSION_TIMELINE  113
             #define SID_TC_DIRECT_CMD               120
             #define SID_TC_SPARE_GRD_SRC1           121
             #define SID_TC_SPARE_GRD_SRC2           122
             #define SID_TC_OBCP                     15
             #define SID_TC_SYSTEM_CONTROL           14
             #define SID_TC_AOCS                     11
             #define SID_TC_RPW_INTERNAL             254
             enum apid_destid{
                 GROUND,
                 MISSION_TIMELINE,
                 TC_SEQUENCES,
                 RECOVERY_ACTION_CMD,
                 BACKUP_MISSION_TIMELINE,
                 DIRECT_CMD,
                 SPARE_GRD_SRC1,
                 SPARE_GRD_SRC2,
                 OBCP,
                 SYSTEM_CONTROL,
                 AOCS,
                 RPW_INTERNAL
             };
             // SEQUENCE COUNTERS
             #define SEQ_CNT_MAX 16383
             #define SEQ_CNT_NB_DEST_ID 12
             // TM SID
             #define SID_HK 1
             #define SID_PARAMETER_DUMP 10
             #define SID_NORM_SWF_F0 3
             #define SID_NORM_SWF_F1 4
             #define SID_NORM_SWF_F2 5
             #define SID_NORM_CWF_F3 1
             #define SID_BURST_CWF_F2 2
             #define SID_SBM1_CWF_F1 24
             #define SID_SBM2_CWF_F2 25
             #define SID_NORM_ASM_F0 11
             #define SID_NORM_ASM_F1 12
             #define SID_NORM_ASM_F2 13
             #define SID_NORM_BP1_F0 14
             #define SID_NORM_BP1_F1 15
             #define SID_NORM_BP1_F2 16
             #define SID_NORM_BP2_F0 19
             #define SID_NORM_BP2_F1 20
             #define SID_NORM_BP2_F2 21
             #define SID_BURST_BP1_F0 17
             #define SID_BURST_BP2_F0 22
             #define SID_BURST_BP1_F1 18
             #define SID_BURST_BP2_F1 23
             #define SID_SBM1_BP1_F0 28
             #define SID_SBM1_BP2_F0 31
             #define SID_SBM2_BP1_F0 29
             #define SID_SBM2_BP2_F0 32
             #define SID_SBM2_BP1_F1 30
             #define SID_SBM2_BP2_F1 33
             #define SID_NORM_CWF_LONG_F3 34
             // LENGTH (BYTES)
             #define LENGTH_TM_LFR_TC_EXE_MAX 32
             #define LENGTH_TM_LFR_HK 126
             // HEADER_LENGTH
             #define TM_HEADER_LEN 16
             #define HEADER_LENGTH_TM_LFR_SCIENCE_ASM 28
             // PACKET_LENGTH
             #define PACKET_LENGTH_TC_EXE_SUCCESS            (20 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TC_EXE_INCONSISTENT       (26 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TC_EXE_NOT_EXECUTABLE     (26 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TC_EXE_NOT_IMPLEMENTED    (24 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TC_EXE_ERROR              (24 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TC_EXE_CORRUPTED          (32 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_HK                        (126 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_PARAMETER_DUMP            (34 - CCSDS_TC_TM_PACKET_OFFSET)
             #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM        (TOTAL_SIZE_SM + HEADER_LENGTH_TM_LFR_SCIENCE_ASM - CCSDS_TC_TM_PACKET_OFFSET)
             #define SPARE1_PUSVERSION_SPARE2 0x10
             #define LEN_TM_LFR_HK               130     // 126 + 4
             #define LEN_TM_LFR_TC_EXE_NOT_IMP   28      // 24 + 4
             // R1
             #define TM_LEN_SCI_SWF_340          4101    // 340 * 12 + 10 + 12 - 1
             #define TM_LEN_SCI_SWF_8            117     //   8 * 12 + 10 + 12 - 1
-            // R2
-            #define TM_LEN_SCI_SWF_304          3669    // 304 * 12 + 10 + 12 - 1
-            #define TM_LEN_SCI_SWF_224          2709    // 224 * 12 + 10 + 12 - 1
-            //
             #define TM_LEN_SCI_CWF_340          4099    // 340 * 12 + 10 + 10 - 1
             #define TM_LEN_SCI_CWF_8            115     //   8 * 12 + 10 + 10 - 1
             #define TM_LEN_SCI_CWF3_LIGHT_340   2059    // 340 * 6  + 10 + 10 - 1
             #define TM_LEN_SCI_CWF3_LIGHT_8     67      //   8 * 6  + 10 + 10 - 1
+            // R2
+            #define TM_LEN_SCI_SWF_304          3669    // 304 * 12 + 10 + 12 - 1
+            #define TM_LEN_SCI_SWF_224          2709    // 224 * 12 + 10 + 12 - 1
+            #define TM_LEN_SCI_CWF_336          4051    // 336 * 12 + 10 + 10 - 1
+            #define TM_LEN_SCI_CWF_672          4051    // 672 * 6 + 10 + 10 - 1
+            //
             #define DEFAULT_PKTCNT      0x07
-            #define BLK_NR_340      0x0154
-            #define BLK_NR_8        0x0008
             #define BLK_NR_304          0x0130
             #define BLK_NR_224          0x00e0
+            #define BLK_NR_CWF          0x0150  // 336
+            #define BLK_NR_CWF_SHORT_F3 0x02a0  // 672
             enum TM_TYPE{
                 TM_LFR_TC_EXE_OK,
                 TM_LFR_TC_EXE_ERR,
                 TM_LFR_HK,
                 TM_LFR_SCI,
                 TM_LFR_SCI_SBM,
                 TM_LFR_PAR_DUMP
             };
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
             } Packet_TM_LFR_TC_EXE_SUCCESS_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char tc_failure_code[2];
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
                 unsigned char tc_service;
                 unsigned char tc_subtype;
                 unsigned char byte_position;
                 unsigned char rcv_value;
             } Packet_TM_LFR_TC_EXE_INCONSISTENT_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char tc_failure_code[2];
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
                 unsigned char tc_service;
                 unsigned char tc_subtype;
                 unsigned char lfr_status_word[2];
             } Packet_TM_LFR_TC_EXE_NOT_EXECUTABLE_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char tc_failure_code[2];
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
                 unsigned char tc_service;
                 unsigned char tc_subtype;
             } Packet_TM_LFR_TC_EXE_NOT_IMPLEMENTED_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char tc_failure_code[2];
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
                 unsigned char tc_service;
                 unsigned char tc_subtype;
             } Packet_TM_LFR_TC_EXE_ERROR_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 // PACKET HEADER
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 //
                 unsigned char tc_failure_code[2];
                 unsigned char telecommand_pkt_id[2];
                 unsigned char pkt_seq_control[2];
                 unsigned char tc_service;
                 unsigned char tc_subtype;
                 unsigned char pkt_len_rcv_value[2];
                 unsigned char pkt_datafieldsize_cnt[2];
                 unsigned char rcv_crc[2];
                 unsigned char computed_crc[2];
             } Packet_TM_LFR_TC_EXE_CORRUPTED_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 // AUXILIARY HEADER
                 unsigned char sid;
                 unsigned char hkBIA;
                 unsigned char pktCnt;
                 unsigned char pktNr;
                 unsigned char acquisitionTime[6];
                 unsigned char blkNr[2];
             } Header_TM_LFR_SCIENCE_SWF_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 // AUXILIARY DATA HEADER
                 unsigned char sid;
                 unsigned char hkBIA;
                 unsigned char acquisitionTime[6];
                 unsigned char blkNr[2];
             } Header_TM_LFR_SCIENCE_CWF_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 // AUXILIARY HEADER
                 unsigned char sid;
                 unsigned char biaStatusInfo;
                 unsigned char cntASM;
                 unsigned char nrASM;
                 unsigned char acquisitionTime[6];
                 unsigned char blkNr[2];
             } Header_TM_LFR_SCIENCE_ASM_t;
             typedef struct {
                 //targetLogicalAddress is removed by the grspw module
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char headerFlag_pusVersion_Ack;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char sourceID;
                 unsigned char dataAndCRC[CCSDS_TC_PKT_MAX_SIZE-10];
             } ccsdsTelecommandPacket_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 unsigned char sid;
                 //**************
                 // HK PARAMETERS
                 unsigned char lfr_status_word[2];
                 unsigned char lfr_sw_version[4];
                 unsigned char lfr_fpga_version[3];
                 // ressource statistics
                 unsigned char hk_lfr_cpu_load;
                 unsigned char hk_lfr_load_max;
                 unsigned char hk_lfr_load_aver;
                 // tc statistics
                 unsigned char hk_lfr_update_info_tc_cnt[2];
                 unsigned char hk_lfr_update_time_tc_cnt[2];
                 unsigned char hk_lfr_exe_tc_cnt[2];
                 unsigned char hk_lfr_rej_tc_cnt[2];
                 unsigned char hk_lfr_last_exe_tc_id[2];
                 unsigned char hk_lfr_last_exe_tc_type[2];
                 unsigned char hk_lfr_last_exe_tc_subtype[2];
                 unsigned char hk_lfr_last_exe_tc_time[6];
                 unsigned char hk_lfr_last_rej_tc_id[2];
                 unsigned char hk_lfr_last_rej_tc_type[2];
                 unsigned char hk_lfr_last_rej_tc_subtype[2];
                 unsigned char hk_lfr_last_rej_tc_time[6];
                 // anomaly statistics
                 unsigned char hk_lfr_le_cnt[2];
                 unsigned char hk_lfr_me_cnt[2];
                 unsigned char hk_lfr_he_cnt[2];
                 unsigned char hk_lfr_last_er_rid[2];
                 unsigned char hk_lfr_last_er_code;
                 unsigned char hk_lfr_last_er_time[6];
                 // vhdl_blk_status
                 unsigned char hk_lfr_vhdl_aa_sm;
                 unsigned char hk_lfr_vhdl_fft_sr;
                 unsigned char hk_lfr_vhdl_cic_hk;
                 unsigned char hk_lfr_vhdl_iir_cal;
                 // spacewire_if_statistics
                 unsigned char hk_lfr_dpu_spw_pkt_rcv_cnt[2];
                 unsigned char hk_lfr_dpu_spw_pkt_sent_cnt[2];
                 unsigned char hk_lfr_dpu_spw_tick_out_cnt;
                 unsigned char hk_lfr_dpu_spw_last_timc;
                 // ahb error statistics
                 unsigned int hk_lfr_last_fail_addr;
                 // temperatures
                 unsigned char hk_lfr_temp_scm[2];
                 unsigned char hk_lfr_temp_pcb[2];
                 unsigned char hk_lfr_temp_fpga[2];
                 // spacecraft potential
                 unsigned char hk_lfr_sc_v_f3[2];
                 unsigned char hk_lfr_sc_e1_f3[2];
                 unsigned char hk_lfr_sc_e2_f3[2];
                 // error counters
                 unsigned char hk_lfr_dpu_spw_parity;
                 unsigned char hk_lfr_dpu_spw_disconnect;
                 unsigned char hk_lfr_dpu_spw_escape;
                 unsigned char hk_lfr_dpu_spw_credit;
                 unsigned char hk_lfr_dpu_spw_write_sync;
                 unsigned char hk_lfr_dpu_spw_rx_ahb;
                 unsigned char hk_lfr_dpu_spw_tx_ahb;
                 unsigned char hk_lfr_dpu_spw_early_eop;
                 unsigned char hk_lfr_dpu_spw_invalid_addr;
                 unsigned char hk_lfr_dpu_spw_eep;
                 unsigned char hk_lfr_dpu_spw_rx_too_big;
                 // timecode
                 unsigned char hk_lfr_timecode_erroneous;
                 unsigned char hk_lfr_timecode_missing;
                 unsigned char hk_lfr_timecode_invalid;
                 // time
                 unsigned char hk_lfr_time_timecode_it;
                 unsigned char hk_lfr_time_not_synchro;
                 unsigned char hk_lfr_time_timecode_ctr;
                 // hk_lfr_buffer_dpu_
                 unsigned char hk_lfr_buffer_dpu_tc_fifo;
                 unsigned char hk_lfr_buffer_dpu_tm_fifo;
                 // hk_lfr_ahb_
                 unsigned char hk_lfr_ahb_correctable;
                 unsigned char hk_lfr_ahb_uncorrectable;
                 // spare
                 unsigned char parameters_spare;
             } Packet_TM_LFR_HK_t;
             typedef struct {
                 unsigned char targetLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char reserved;
                 unsigned char userApplication;
                 unsigned char packetID[2];
                 unsigned char packetSequenceControl[2];
                 unsigned char packetLength[2];
                 // DATA FIELD HEADER
                 unsigned char spare1_pusVersion_spare2;
                 unsigned char serviceType;
                 unsigned char serviceSubType;
                 unsigned char destinationID;
                 unsigned char time[6];
                 unsigned char sid;
                 //******************
                 // COMMON PARAMETERS
                 unsigned char unused0;
                 unsigned char bw_sp0_sp1_r0_r1;
                 //******************
                 // NORMAL PARAMETERS
                 unsigned char sy_lfr_n_swf_l[2];
                 unsigned char sy_lfr_n_swf_p[2];
                 unsigned char sy_lfr_n_asm_p[2];
                 unsigned char sy_lfr_n_bp_p0;
                 unsigned char sy_lfr_n_bp_p1;
                 unsigned char sy_lfr_n_cwf_long_f3;
                 unsigned char lfr_normal_parameters_spare;
                 //*****************
                 // BURST PARAMETERS
                 unsigned char sy_lfr_b_bp_p0;
                 unsigned char sy_lfr_b_bp_p1;
                 //****************
                 // SBM1 PARAMETERS
                 unsigned char sy_lfr_s1_bp_p0;
                 unsigned char sy_lfr_s1_bp_p1;
                 //****************
                 // SBM2 PARAMETERS
                 unsigned char sy_lfr_s2_bp_p0;
                 unsigned char sy_lfr_s2_bp_p1;
             } Packet_TM_LFR_PARAMETER_DUMP_t;
             #endif // CCSDS_TYPES_H_INCLUDED

header/fsw_params.h +12 0

             #ifndef FSW_PARAMS_H_INCLUDED
             #define FSW_PARAMS_H_INCLUDED
             #include "grlib_regs.h"
             #include "fsw_params_processing.h"
             #include "tm_byte_positions.h"
             #include "ccsds_types.h"
             #define GRSPW_DEVICE_NAME "/dev/grspw0"
             #define UART_DEVICE_NAME "/dev/console"
+            typedef struct ring_node
+            {
+                struct ring_node *previous;
+                int buffer_address;
+                struct ring_node *next;
+                unsigned int status;
+            } ring_node;
             //************************
             // flight software version
             // this parameters is handled by the Qt project options
             //#define NB_SAMPLES_PER_SNAPSHOT 2048
             #define NB_SAMPLES_PER_SNAPSHOT 2352    // 336 * 7 = 2352
             #define TIME_OFFSET 2
+            #define TIME_OFFSET_IN_BYTES 8
             #define WAVEFORM_EXTENDED_HEADER_OFFSET 22
             #define NB_BYTES_SWF_BLK (2 * 6)
             #define NB_WORDS_SWF_BLK 3
             #define NB_BYTES_CWF3_LIGHT_BLK 6
             #define WFRM_INDEX_OF_LAST_PACKET 6  // waveforms are transmitted in groups of 2048 blocks, 6 packets of 340 and 1 of 8
             #define NB_RING_NODES_F0 3      // AT LEAST 3
             #define NB_RING_NODES_F1 5      // AT LEAST 3
             #define NB_RING_NODES_F2 5      // AT LEAST 3
+            #define NB_RING_NODES_ASM_F0 8  // AT LEAST 3
+            #define NB_RING_NODES_ASM_F1 2  // AT LEAST 3
+            #define NB_RING_NODES_ASM_F2 2  // AT LEAST 3
             //**********
             // LFR MODES
             #define LFR_MODE_STANDBY 0
             #define LFR_MODE_NORMAL 1
             #define LFR_MODE_BURST 2
             #define LFR_MODE_SBM1 3
             #define LFR_MODE_SBM2 4
             #define LFR_MODE_NORMAL_CWF_F3 5
             #define RTEMS_EVENT_MODE_STANDBY RTEMS_EVENT_0
             #define RTEMS_EVENT_MODE_NORMAL RTEMS_EVENT_1
             #define RTEMS_EVENT_MODE_BURST RTEMS_EVENT_2
             #define RTEMS_EVENT_MODE_SBM1 RTEMS_EVENT_3
             #define RTEMS_EVENT_MODE_SBM2 RTEMS_EVENT_4
             #define RTEMS_EVENT_MODE_SBM2_WFRM RTEMS_EVENT_5
             //****************************
             // LFR DEFAULT MODE PARAMETERS
             // COMMON
             #define DEFAULT_SY_LFR_COMMON0 0x00
             #define DEFAULT_SY_LFR_COMMON1 0x10 // default value 0 0 0 1 0 0 0 0
             // NORM
             #define SY_LFR_N_SWF_L 2048 // nb sample
             #define SY_LFR_N_SWF_P 20   // sec
             #define SY_LFR_N_ASM_P 3600 // sec
             #define SY_LFR_N_BP_P0 4    // sec
             #define SY_LFR_N_BP_P1 20   // sec
             #define MIN_DELTA_SNAPSHOT 16       // sec
             // BURST
             #define DEFAULT_SY_LFR_B_BP_P0 1    // sec
             #define DEFAULT_SY_LFR_B_BP_P1 5    // sec
             // SBM1
             #define DEFAULT_SY_LFR_S1_BP_P0 1   // sec
             #define DEFAULT_SY_LFR_S1_BP_P1 1   // sec
             // SBM2
             #define DEFAULT_SY_LFR_S2_BP_P0 1   // sec
             #define DEFAULT_SY_LFR_S2_BP_P1 5   // sec
             // ADDITIONAL PARAMETERS
             #define TIME_BETWEEN_TWO_SWF_PACKETS 30     // nb x 10 ms => 300 ms
             #define TIME_BETWEEN_TWO_CWF3_PACKETS 1000  // nb x 10 ms => 10 s
             // STATUS WORD
             #define DEFAULT_STATUS_WORD_BYTE0 0x0d  // [0000] [1] [101] mode 4 bits / SPW enabled 1 bit / state is run 3 bits
             #define DEFAULT_STATUS_WORD_BYTE1 0x00
             //
             #define SY_LFR_DPU_CONNECT_TIMEOUT 100  // 100 * 10 ms = 1 s
             #define SY_LFR_DPU_CONNECT_ATTEMPT 3
             //****************************
             //*****************************
             // APB REGISTERS BASE ADDRESSES
             #define REGS_ADDR_APBUART 0x80000100
             #define REGS_ADDR_GPTIMER 0x80000300
             #define REGS_ADDR_GRSPW 0x80000500
             #define REGS_ADDR_TIME_MANAGEMENT 0x80000600
             #define REGS_ADDR_SPECTRAL_MATRIX 0x80000f00
             #ifdef GSA
             #else
                 #define REGS_ADDR_WAVEFORM_PICKER 0x80000f20
             #endif
             #define APBUART_CTRL_REG_MASK_DB 0xfffff7ff
             #define APBUART_SCALER_RELOAD_VALUE 0x00000050      // 25 MHz => about 38400 (0x50)
             //**********
             // IRQ LINES
             #define IRQ_SM 9
             #define IRQ_SPARC_SM 0x19               // see sparcv8.pdf p.76 for interrupt levels
             #define IRQ_WF 10
             #define IRQ_SPARC_WF 0x1a               // see sparcv8.pdf p.76 for interrupt levels
             #define IRQ_TIME1 12
             #define IRQ_SPARC_TIME1 0x1c            // see sparcv8.pdf p.76 for interrupt levels
             #define IRQ_TIME2 13
             #define IRQ_SPARC_TIME2 0x1d            // see sparcv8.pdf p.76 for interrupt levels
             #define IRQ_WAVEFORM_PICKER 14
             #define IRQ_SPARC_WAVEFORM_PICKER 0x1e  // see sparcv8.pdf p.76 for interrupt levels
             #define IRQ_SPECTRAL_MATRIX 6
             #define IRQ_SPARC_SPECTRAL_MATRIX 0x16  // see sparcv8.pdf p.76 for interrupt levels
             //*****
             // TIME
             #define CLKDIV_SM_SIMULATOR (10000 - 1)     // 10 ms
             #define CLKDIV_WF_SIMULATOR (10000000 - 1)  // 10 000 000 * 1 us = 10 s
             #define TIMER_SM_SIMULATOR 1
             #define TIMER_WF_SIMULATOR 2
             #define HK_PERIOD 100 // 100 * 10ms => 1sec
             //**********
             // LPP CODES
             #define LFR_SUCCESSFUL 0
             #define LFR_DEFAULT 1
             //******
             // RTEMS
             #define TASKID_RECV 1
             #define TASKID_ACTN 2
             #define TASKID_SPIQ 3
             #define TASKID_SMIQ 4
             #define TASKID_STAT 5
             #define TASKID_AVF0 6
             #define TASKID_BPF0 7
             #define TASKID_WFRM 8
             #define TASKID_DUMB 9
             #define TASKID_HOUS 10
             #define TASKID_MATR 11
             #define TASKID_CWF3 12
             #define TASKID_CWF2 13
             #define TASKID_CWF1 14
             #define TASKID_SEND 15
             #define TASKID_WTDG 16
             #define TASK_PRIORITY_SPIQ 5
             #define TASK_PRIORITY_SMIQ 10
             #define TASK_PRIORITY_WTDG 20
             #define TASK_PRIORITY_HOUS 30
             #define TASK_PRIORITY_CWF1 35   // CWF1 and CWF2 are never running together
             #define TASK_PRIORITY_CWF2 35   //
             #define TASK_PRIORITY_WFRM 40
             #define TASK_PRIORITY_CWF3 40   // there is a printf in this function, be careful with its priority wrt CWF1
             #define TASK_PRIORITY_SEND 45
             #define TASK_PRIORITY_RECV 50
             #define TASK_PRIORITY_ACTN 50
             #define TASK_PRIORITY_AVF0 60
             #define TASK_PRIORITY_BPF0 60
             #define TASK_PRIORITY_MATR 100
             #define TASK_PRIORITY_STAT 200
             #define TASK_PRIORITY_DUMB 200
             #define ACTION_MSG_QUEUE_COUNT 10
             #define ACTION_MSG_PKTS_COUNT 50
             #define ACTION_MSG_PKTS_MAX_SIZE (PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES)
             #define ACTION_MSG_SPW_IOCTL_SEND_SIZE 24                   // hlen *hdr dlen *data sent options
             #define QUEUE_RECV 0
             #define QUEUE_SEND 1
             //*******
             // MACROS
             #ifdef PRINT_MESSAGES_ON_CONSOLE
             #define PRINTF(x) printf(x);
             #define PRINTF1(x,y) printf(x,y);
             #define PRINTF2(x,y,z) printf(x,y,z);
             #else
             #define PRINTF(x) ;
             #define PRINTF1(x,y) ;
             #define PRINTF2(x,y,z) ;
             #endif
             #ifdef BOOT_MESSAGES
             #define BOOT_PRINTF(x) printf(x);
             #define BOOT_PRINTF1(x,y) printf(x,y);
             #define BOOT_PRINTF2(x,y,z) printf(x,y,z);
             #else
             #define BOOT_PRINTF(x) ;
             #define BOOT_PRINTF1(x,y) ;
             #define BOOT_PRINTF2(x,y,z) ;
             #endif
             #ifdef DEBUG_MESSAGES
             #define DEBUG_PRINTF(x) printf(x);
             #define DEBUG_PRINTF1(x,y) printf(x,y);
             #define DEBUG_PRINTF2(x,y,z) printf(x,y,z);
             #else
             #define DEBUG_PRINTF(x) ;
             #define DEBUG_PRINTF1(x,y) ;
             #define DEBUG_PRINTF2(x,y,z) ;
             #endif
             #define CPU_USAGE_REPORT_PERIOD 6   // * 10 s = period
             struct param_local_str{
                 unsigned int local_sbm1_nb_cwf_sent;
                 unsigned int local_sbm1_nb_cwf_max;
                 unsigned int local_sbm2_nb_cwf_sent;
                 unsigned int local_sbm2_nb_cwf_max;
                 unsigned int local_nb_interrupt_f0_MAX;
             };
             #endif // FSW_PARAMS_H_INCLUDED

header/fsw_params_processing.h +4 -4

             #ifndef FSW_PARAMS_PROCESSING_H
             #define FSW_PARAMS_PROCESSING_H
-            #define NB_BINS_PER_SM 128
+            #define NB_BINS_PER_SM      128     //
-            #define NB_VALUES_PER_SM 25
+            #define NB_VALUES_PER_SM    25      //
-            #define TOTAL_SIZE_SM 0
+            #define TOTAL_SIZE_SM       3200    // 25 * 128
-            #define SM_HEADER 0
+            #define SM_HEADER           0       //
             #define NB_BINS_COMPRESSED_SM_F0 11
             #define NB_BINS_COMPRESSED_SM_F1 13
             #define NB_BINS_COMPRESSED_SM_F2 12
             #define TOTAL_SIZE_COMPRESSED_MATRIX_f0 (NB_BINS_COMPRESSED_SM_F0 * NB_VALUES_PER_SM)
             #define NB_AVERAGE_NORMAL_f0 96*4
             #define NB_SM_TO_RECEIVE_BEFORE_AVF0 8
             typedef struct {
                 volatile unsigned char PE[2];
                 volatile unsigned char PB[2];
                 volatile unsigned char V0;
                 volatile unsigned char V1;
                 volatile unsigned char V2_ELLIP_DOP;
                 volatile unsigned char SZ;
                 volatile unsigned char VPHI;
             } BP1_t;
             #endif // FSW_PARAMS_PROCESSING_H

header/fsw_processing.h +6 -18

             #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"
-            extern volatile int spec_mat_f0_0[ ];
+            extern volatile int sm_f0[ ][ SM_HEADER + TOTAL_SIZE_SM ];
-            extern volatile int spec_mat_f0_1[ ];
+            extern volatile int sm_f1[ ][ SM_HEADER + TOTAL_SIZE_SM ];
-            extern volatile int spec_mat_f0_a[ ];
+            extern volatile int sm_f2[ ][ SM_HEADER + TOTAL_SIZE_SM ];
-            extern volatile int spec_mat_f0_b[ ];
-            extern volatile int spec_mat_f0_c[ ];
-            extern volatile int spec_mat_f0_d[ ];
-            extern volatile int spec_mat_f0_e[ ];
-            extern volatile int spec_mat_f0_f[ ];
-            extern volatile int spec_mat_f0_g[ ];
-            extern volatile int spec_mat_f0_h[ ];
-            extern volatile int spec_mat_f1[ ];
-            extern volatile int spec_mat_f2[ ];
-            extern volatile int spec_mat_f1_bis[ ];
-            extern volatile int spec_mat_f2_bis[ ];
-            extern volatile int spec_mat_f0_0_bis[ ];
-            extern volatile int spec_mat_f0_1_bis[ ];
             // 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 */
+            //
+            void init_asm_rings( void );
             // ISR
             rtems_isr spectral_matrices_isr( rtems_vector_number vector );
             rtems_isr spectral_matrices_isr_simu( rtems_vector_number vector );
             // RTEMS TASKS
             rtems_task spw_bppr_task(rtems_task_argument argument);
             rtems_task avf0_task(rtems_task_argument argument);
             rtems_task bpf0_task(rtems_task_argument argument);
             rtems_task smiq_task(rtems_task_argument argument); // added to test the spectral matrix simulator
             rtems_task matr_task(rtems_task_argument argument);
             void matrix_compression(volatile float *averaged_spec_mat, unsigned char fChannel, float *compressed_spec_mat);
             void matrix_reset(volatile float *averaged_spec_mat);
             void BP1_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * LFR_BP1);
             void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat);
             //
             void init_header_asm( Header_TM_LFR_SCIENCE_ASM_t *header);
             void send_spectral_matrix(Header_TM_LFR_SCIENCE_ASM_t *header, char *spectral_matrix,
                                 unsigned int sid, spw_ioctl_pkt_send *spw_ioctl_send, rtems_id queue_id);
             void convert_averaged_spectral_matrix(volatile float *input_matrix, char *output_matrix);
             void fill_averaged_spectral_matrix( void );
             void reset_spectral_matrix_regs();
             #endif // FSW_PROCESSING_H_INCLUDED

header/wf_handler.h +2 -8

             #ifndef WF_HANDLER_H_INCLUDED
             #define WF_HANDLER_H_INCLUDED
             #include <rtems.h>
             #include <grspw.h>
             #include <stdio.h>
             #include <math.h>
             #include "fsw_params.h"
             #include "fsw_spacewire.h"
             #include "fsw_misc.h"
             #define pi 3.1415
-            typedef struct ring_node
-                struct ring_node *previous;
-                int buffer_address;
-                struct ring_node *next;
-                unsigned int status;
-            } ring_node;
             extern int fdSPW;
             //*****************
             // waveform buffers
             // F0
             //extern volatile int wf_snap_f0[ ];
             // F1 F2
             extern volatile int wf_snap_f0[ ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ];
             extern volatile int wf_snap_f1[ ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ];
             extern volatile int wf_snap_f2[ ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ];
             // F3
             extern volatile int wf_cont_f3_a[ ];
             extern volatile int wf_cont_f3_b[ ];
             extern char wf_cont_f3_light[ ];
             #ifdef VHDL_DEV
             extern waveform_picker_regs_new_t *waveform_picker_regs;
             #else
             extern waveform_picker_regs_t *waveform_picker_regs;
             #endif
             extern time_management_regs_t *time_management_regs;
             extern Packet_TM_LFR_HK_t housekeeping_packet;
             extern Packet_TM_LFR_PARAMETER_DUMP_t parameter_dump_packet;
             extern struct param_local_str param_local;
             extern unsigned short sequenceCounters_SCIENCE_NORMAL_BURST;
             extern unsigned short sequenceCounters_SCIENCE_SBM1_SBM2;
             extern rtems_id    Task_id[20];         /* array of task ids */
             extern unsigned char lfrCurrentMode;
             rtems_isr waveforms_isr( rtems_vector_number vector );
             rtems_task wfrm_task( rtems_task_argument argument );
             rtems_task cwf3_task( rtems_task_argument argument );
             rtems_task cwf2_task( rtems_task_argument argument );
             rtems_task cwf1_task( rtems_task_argument argument );
             //******************
             // general functions
             void init_waveforms( void );
             void init_waveform_rings( void );
             void reset_current_ring_nodes( void );
             //
             int init_header_snapshot_wf_table(      unsigned int sid, Header_TM_LFR_SCIENCE_SWF_t *headerSWF );
             int init_header_continuous_wf_table(    unsigned int sid, Header_TM_LFR_SCIENCE_CWF_t *headerCWF );
             int init_header_continuous_cwf3_light_table( Header_TM_LFR_SCIENCE_CWF_t *headerCWF );
             //
             int send_waveform_SWF(  volatile int *waveform, unsigned int sid, Header_TM_LFR_SCIENCE_SWF_t *headerSWF, rtems_id queue_id );
             int send_waveform_CWF(  volatile int *waveform, unsigned int sid, Header_TM_LFR_SCIENCE_CWF_t *headerCWF, rtems_id queue_id );
             int send_waveform_CWF3( volatile int *waveform, unsigned int sid, Header_TM_LFR_SCIENCE_CWF_t *headerCWF, rtems_id queue_id );
             int send_waveform_CWF3_light( volatile int *waveform, Header_TM_LFR_SCIENCE_CWF_t *headerCWF, rtems_id queue_id );
             //
+            void compute_acquisition_time(unsigned int *coarseTime, unsigned int *fineTime, unsigned int sid, unsigned char pa_lfr_pkt_nr );
+            //
             rtems_id get_pkts_queue_id( void );
             //**************
             // wfp registers
             void set_wfp_data_shaping();
             char set_wfp_delta_snapshot();
             void set_wfp_burst_enable_register( unsigned char mode );
             void reset_wfp_burst_enable();
             void reset_wfp_status();
             void reset_waveform_picker_regs();
             void reset_new_waveform_picker_regs();
             //*****************
             // local parameters
             void set_local_nb_interrupt_f0_MAX( void );
             void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid );
             #endif // WF_HANDLER_H_INCLUDED

src/fsw_globals.c +6 -21

             /** Global variables of the LFR flight software.
              *
              * @file
              * @author P. LEROY
              *
              * Among global variables, there are:
              * - RTEMS names and id.
              * - APB configuration registers.
              * - waveforms global buffers, used by the waveform picker hardware module to store data.
              * - spectral  matrices buffesr, used by the hardware module to store data.
              * - variable related to LFR modes parameters.
              * - the global HK packet buffer.
              * - the global dump parameter buffer.
              *
              */
             #include <rtems.h>
             #include <grspw.h>
             #include "ccsds_types.h"
             #include "grlib_regs.h"
             #include "fsw_params.h"
             // RTEMS GLOBAL VARIABLES
             rtems_name  misc_name[5];
             rtems_id    misc_id[5];
             rtems_name  Task_name[20];       /* array of task names */
             rtems_id    Task_id[20];         /* array of task ids */
             unsigned int maxCount;
             int fdSPW = 0;
             int fdUART = 0;
             unsigned char lfrCurrentMode;
             // WAVEFORMS GLOBAL VARIABLES // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
             // F0
             //volatile int wf_snap_f0                    [ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
             volatile int wf_snap_f0[ NB_RING_NODES_F0 ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
             // F1 F2
             volatile int wf_snap_f1[ NB_RING_NODES_F1 ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
             volatile int wf_snap_f2[ NB_RING_NODES_F2 ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
             // F3
-            volatile int wf_cont_f3_a[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ] __attribute__((aligned(0x100)));
+            volatile int wf_cont_f3_a    [ (NB_SAMPLES_PER_SNAPSHOT) * NB_WORDS_SWF_BLK        + TIME_OFFSET          ] __attribute__((aligned(0x100)));
-            volatile int wf_cont_f3_b[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ] __attribute__((aligned(0x100)));
+            volatile int wf_cont_f3_b    [ (NB_SAMPLES_PER_SNAPSHOT) * NB_WORDS_SWF_BLK        + TIME_OFFSET          ] __attribute__((aligned(0x100)));
-            char         wf_cont_f3_light[ NB_SAMPLES_PER_SNAPSHOT * NB_BYTES_CWF3_LIGHT_BLK    ] __attribute__((aligned(0x100)));
+            char         wf_cont_f3_light[ (NB_SAMPLES_PER_SNAPSHOT) * NB_BYTES_CWF3_LIGHT_BLK + TIME_OFFSET_IN_BYTES ] __attribute__((aligned(0x100)));
             // SPECTRAL MATRICES GLOBAL VARIABLES
-            volatile int spec_mat_f0_0[ SM_HEADER + TOTAL_SIZE_SM ];
+            volatile int sm_f0[ NB_RING_NODES_ASM_F0 ][ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_1[ SM_HEADER + TOTAL_SIZE_SM ];
+            volatile int sm_f1[ NB_RING_NODES_ASM_F1 ][ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_a[ SM_HEADER + TOTAL_SIZE_SM ];
+            volatile int sm_f2[ NB_RING_NODES_ASM_F2 ][ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_b[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_c[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_d[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_e[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_f[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_g[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_h[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_0_bis[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f0_1_bis[ SM_HEADER + TOTAL_SIZE_SM ];
-            //
-            volatile int spec_mat_f1[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f1_bis[ SM_HEADER + TOTAL_SIZE_SM ];
-            //
-            volatile int spec_mat_f2[ SM_HEADER + TOTAL_SIZE_SM ];
-            volatile int spec_mat_f2_bis[ SM_HEADER + TOTAL_SIZE_SM ];
             // APB CONFIGURATION REGISTERS
             time_management_regs_t      *time_management_regs   = (time_management_regs_t*)     REGS_ADDR_TIME_MANAGEMENT;
             gptimer_regs_t              *gptimer_regs           = (gptimer_regs_t *)            REGS_ADDR_GPTIMER;
             #ifdef VHDL_DEV
             waveform_picker_regs_new_t  *waveform_picker_regs   = (waveform_picker_regs_new_t*) REGS_ADDR_WAVEFORM_PICKER;
             #else
             waveform_picker_regs_t      *waveform_picker_regs   = (waveform_picker_regs_t*)     REGS_ADDR_WAVEFORM_PICKER;
             #endif
             spectral_matrix_regs_t      *spectral_matrix_regs   = (spectral_matrix_regs_t*)     REGS_ADDR_SPECTRAL_MATRIX;
             // MODE PARAMETERS
             Packet_TM_LFR_PARAMETER_DUMP_t parameter_dump_packet;
             struct param_local_str param_local;
             // HK PACKETS
             Packet_TM_LFR_HK_t housekeeping_packet;
             // sequence counters are incremented by APID (PID + CAT) and destination ID
             unsigned short sequenceCounters_SCIENCE_NORMAL_BURST;
             unsigned short sequenceCounters_SCIENCE_SBM1_SBM2;
             unsigned short sequenceCounters_TC_EXE[SEQ_CNT_NB_DEST_ID];
             spw_stats spacewire_stats;
             spw_stats spacewire_stats_backup;

src/fsw_processing.c +120 -117

             /** Functions related to data processing.
              *
              * @file
              * @author P. LEROY
              *
              * These function are related to data processing, i.e. spectral matrices averaging and basic parameters computation.
              *
              */
             #include <fsw_processing.h>
             #include "fsw_processing_globals.c"
+            //************************
+            // spectral matrices rings
+            ring_node sm_ring_f0[NB_RING_NODES_ASM_F0];
+            ring_node sm_ring_f1[NB_RING_NODES_ASM_F1];
+            ring_node sm_ring_f2[NB_RING_NODES_ASM_F2];
+            ring_node *current_ring_node_sm_f0;
+            ring_node *current_ring_node_sm_f1;
+            ring_node *current_ring_node_sm_f2;
             BP1_t data_BP1[ NB_BINS_COMPRESSED_SM_F0 ];
-            float averaged_spec_mat_f0[ TOTAL_SIZE_SM ];
+            float averaged_sm_f0[ TOTAL_SIZE_SM ];
-            char averaged_spec_mat_f0_char[ TOTAL_SIZE_SM * 2 ];
+            char averaged_sm_f0_char[ TOTAL_SIZE_SM * 2 ];
-            float compressed_spec_mat_f0[ TOTAL_SIZE_COMPRESSED_MATRIX_f0 ];
+            float compressed_sm_f0[ TOTAL_SIZE_COMPRESSED_MATRIX_f0 ];
+            void init_asm_rings( void )
+            {
+                unsigned char i;
+                // F0 RING
+                sm_ring_f0[0].next            = (ring_node*) &sm_ring_f0[1];
+                sm_ring_f0[0].previous        = (ring_node*) &sm_ring_f0[NB_RING_NODES_ASM_F0-1];
+                sm_ring_f0[0].buffer_address  = (int) &sm_f0[0][0];
+                sm_ring_f0[NB_RING_NODES_ASM_F0-1].next           = (ring_node*) &sm_ring_f0[0];
+                sm_ring_f0[NB_RING_NODES_ASM_F0-1].previous       = (ring_node*) &sm_ring_f0[NB_RING_NODES_ASM_F0-2];
+                sm_ring_f0[NB_RING_NODES_ASM_F0-1].buffer_address = (int) &sm_f0[NB_RING_NODES_ASM_F0-1][0];
+                for(i=1; i<NB_RING_NODES_ASM_F0-1; i++)
+                {
+                    sm_ring_f0[i].next            = (ring_node*) &sm_ring_f0[i+1];
+                    sm_ring_f0[i].previous        = (ring_node*) &sm_ring_f0[i-1];
+                    sm_ring_f0[i].buffer_address  = (int) &sm_f0[i][0];
+                }
+                DEBUG_PRINTF1("asm_ring_f0 @%x\n", (unsigned int) sm_ring_f0)
+            }
+            void reset_current_sm_ring_nodes( void )
+            {
+                current_ring_node_sm_f0    = sm_ring_f0;
+            }
             //***********************************************************
             // Interrupt Service Routine for spectral matrices processing
             rtems_isr spectral_matrices_isr( rtems_vector_number vector )
             {
                 unsigned char status;
                 unsigned char i;
                 status = spectral_matrix_regs->status; //[f2 f1 f0_1 f0_0]
                 for (i=0; i<4; i++)
                 {
                     if ( ( (status >> i) & 0x01) == 1)  // (1) buffer rotation
                     {
                         switch(i)
                         {
                         case 0:
-                            if (spectral_matrix_regs->matrixF0_Address0 == (int) spec_mat_f0_0)
+                            current_ring_node_sm_f0 = current_ring_node_sm_f0->next;
+                            spectral_matrix_regs->matrixF0_Address0 = current_ring_node_sm_f0->buffer_address;
-                                spectral_matrix_regs->matrixF0_Address0 = (int) spec_mat_f0_0_bis;
-                            else
-                                spectral_matrix_regs->matrixF0_Address0 = (int) spec_mat_f0_0;
                             spectral_matrix_regs->status = spectral_matrix_regs->status & 0xfffffffe;
                             break;
                         case 1:
-                            if (spectral_matrix_regs->matrixFO_Address1 == (int) spec_mat_f0_1)
-                                spectral_matrix_regs->matrixFO_Address1 = (int) spec_mat_f0_1_bis;
-                            else
-                                spectral_matrix_regs->matrixFO_Address1 = (int) spec_mat_f0_1;
-                            spectral_matrix_regs->status = spectral_matrix_regs->status & 0xfffffffd;
                             break;
                         case 2:
-                            if (spectral_matrix_regs->matrixF1_Address == (int) spec_mat_f1)
-                                spectral_matrix_regs->matrixF1_Address = (int) spec_mat_f1_bis;
-                            else
-                                spectral_matrix_regs->matrixF1_Address = (int) spec_mat_f1;
-                            spectral_matrix_regs->status = spectral_matrix_regs->status & 0xfffffffb;
-                            break;
-                        case 3:
-                            if (spectral_matrix_regs->matrixF2_Address == (int) spec_mat_f2)
-                                spectral_matrix_regs->matrixF2_Address = (int) spec_mat_f2_bis;
-                            else
-                                spectral_matrix_regs->matrixF2_Address = (int) spec_mat_f2;
-                            spectral_matrix_regs->status = spectral_matrix_regs->status & 0xfffffff7;
                             break;
                         default:
                             break;
                         }
                     }
                 }
                 // reset error codes to 0
                 spectral_matrix_regs->status = spectral_matrix_regs->status & 0xffffffcf; // [1100 1111]
                 if (rtems_event_send( Task_id[TASKID_SMIQ], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
                     rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_4 );
                 }
             }
             rtems_isr spectral_matrices_isr_simu( rtems_vector_number vector )
             {
                 if (rtems_event_send( Task_id[TASKID_SMIQ], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
                     rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_4 );
                 }
             }
             //************
             // RTEMS TASKS
             rtems_task smiq_task(rtems_task_argument argument) // process the Spectral Matrices IRQ
             {
                 rtems_event_set event_out;
                 unsigned int nb_interrupt_f0 = 0;
                 BOOT_PRINTF("in SMIQ *** \n")
                 while(1){
                     rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out); // wait for an RTEMS_EVENT0
                     nb_interrupt_f0 = nb_interrupt_f0 + 1;
                     if (nb_interrupt_f0 == NB_SM_TO_RECEIVE_BEFORE_AVF0 ){
                         if (rtems_event_send( Task_id[TASKID_AVF0], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL)
                         {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_3 );
                         }
                         nb_interrupt_f0 = 0;
                     }
                 }
             }
             rtems_task spw_bppr_task(rtems_task_argument argument)
             {
                 rtems_status_code status;
                 rtems_event_set event_out;
                 BOOT_PRINTF("in BPPR ***\n");
                 while( true ){ // wait for an event to begin with the processing
                     status = rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out);
                 }
             }
             rtems_task avf0_task(rtems_task_argument argument)
             {
                 int i;
                 static int nb_average;
                 rtems_event_set event_out;
                 rtems_status_code status;
                 nb_average = 0;
                 BOOT_PRINTF("in AVFO *** \n")
                 while(1){
                     rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out); // wait for an RTEMS_EVENT0
                     for(i=0; i<TOTAL_SIZE_SM; i++){
-                        averaged_spec_mat_f0[i] = averaged_spec_mat_f0[i] + spec_mat_f0_a[i]
+                        averaged_sm_f0[i] = current_ring_node_sm_f0[0].buffer_address
-                                                        + spec_mat_f0_b[i]
+                                + current_ring_node_sm_f0[1].buffer_address
-                                                        + spec_mat_f0_c[i]
+                                + current_ring_node_sm_f0[2].buffer_address
-                                                        + spec_mat_f0_d[i]
+                                + current_ring_node_sm_f0[3].buffer_address
-                                                        + spec_mat_f0_e[i]
+                                + current_ring_node_sm_f0[4].buffer_address
-                                                        + spec_mat_f0_f[i]
+                                + current_ring_node_sm_f0[5].buffer_address
-                                                        + spec_mat_f0_g[i]
+                                + current_ring_node_sm_f0[6].buffer_address
-                                                        + spec_mat_f0_h[i];
+                                + current_ring_node_sm_f0[7].buffer_address;
                     }
                     nb_average = nb_average + NB_SM_TO_RECEIVE_BEFORE_AVF0;
                     if (nb_average == NB_AVERAGE_NORMAL_f0) {
                         nb_average = 0;
                         status = rtems_event_send( Task_id[TASKID_MATR], RTEMS_EVENT_0 ); // sending an event to the task 7, BPF0
                         if (status != RTEMS_SUCCESSFUL) {
                             printf("in AVF0 *** Error sending RTEMS_EVENT_0, code %d\n", status);
                         }
                     }
                 }
             }
             rtems_task bpf0_task(rtems_task_argument argument)
             {
                 rtems_event_set event_out;
                 static unsigned char LFR_BP1_F0[ NB_BINS_COMPRESSED_SM_F0 * 9 ];
                 BOOT_PRINTF("in BPFO *** \n")
                 while(1){
                     rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out); // wait for an RTEMS_EVENT0
-                    matrix_compression(averaged_spec_mat_f0, 0, compressed_spec_mat_f0);
+                    matrix_compression(averaged_sm_f0, 0, compressed_sm_f0);
-                    BP1_set(compressed_spec_mat_f0, NB_BINS_COMPRESSED_SM_F0, LFR_BP1_F0);
+                    BP1_set(compressed_sm_f0, NB_BINS_COMPRESSED_SM_F0, LFR_BP1_F0);
                 }
             }
             rtems_task matr_task(rtems_task_argument argument)
             {
                 spw_ioctl_pkt_send spw_ioctl_send_ASM;
                 rtems_event_set event_out;
                 rtems_status_code status;
                 rtems_id queue_id;
                 Header_TM_LFR_SCIENCE_ASM_t headerASM;
                 init_header_asm( &headerASM );
                 status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in MATR *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in MATR *** \n")
                 fill_averaged_spectral_matrix( );
                 while(1){
                     rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out); // wait for an RTEMS_EVENT0
                     // 1) convert the float array in a char array
-                    convert_averaged_spectral_matrix( averaged_spec_mat_f0, averaged_spec_mat_f0_char);
+                    convert_averaged_spectral_matrix( averaged_sm_f0, averaged_sm_f0_char);
                     // 2) send the spectral matrix packets
-                    send_spectral_matrix( &headerASM, averaged_spec_mat_f0_char, SID_NORM_ASM_F0, &spw_ioctl_send_ASM, queue_id);
+                    send_spectral_matrix( &headerASM, averaged_sm_f0_char, SID_NORM_ASM_F0, &spw_ioctl_send_ASM, queue_id);
                 }
             }
             //*****************************
             // Spectral matrices processing
             void matrix_reset(volatile float *averaged_spec_mat)
             {
                 int i;
                 for(i=0; i<TOTAL_SIZE_SM; i++){
                     averaged_spec_mat[i] = 0;
                 }
             }
             void matrix_compression(volatile float *averaged_spec_mat, unsigned char fChannel, float *compressed_spec_mat)
             {
                 int i;
                 int j;
                 switch (fChannel){
                     case 0:
                             for(i=0;i<NB_BINS_COMPRESSED_SM_F0;i++){
                                 j = 17 + (i * 8);
                                 compressed_spec_mat[i] = (averaged_spec_mat[j]
                                                                 + averaged_spec_mat[j+1]
                                                                 + averaged_spec_mat[j+2]
                                                                 + averaged_spec_mat[j+3]
                                                                 + averaged_spec_mat[j+4]
                                                                 + averaged_spec_mat[j+5]
                                                                 + averaged_spec_mat[j+6]
                                                                 + averaged_spec_mat[j+7])/(8*NB_AVERAGE_NORMAL_f0);
                             }
                         break;
                     case 1:
                         // case fChannel = f1 to be completed later
                         break;
                     case 2:
                         // case fChannel = f1 to be completed later
                         break;
                     default:
                         break;
                 }
             }
             void BP1_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * LFR_BP1){
                 int i;
                 int j;
                 unsigned char tmp_u_char;
                 unsigned char * pt_char = NULL;
                 float PSDB, PSDE;
                 float NVEC_V0;
                 float NVEC_V1;
                 float NVEC_V2;
                 //float significand;
                 //int exponent;
                 float aux;
                 float tr_SB_SB;
                 float tmp;
                 float sx_re;
                 float sx_im;
                 float nebx_re = 0;
                 float nebx_im = 0;
                 float ny = 0;
                 float nz = 0;
                 float bx_bx_star = 0;
                 for(i=0; i<nb_bins_compressed_spec_mat; i++){
                     //==============================================
                     // BP1 PSD == B PAR_LFR_SC_BP1_PE_FL0 == 16 bits
                     PSDB = compressed_spec_mat[i*30]      // S11
                         + compressed_spec_mat[(i*30) + 10]    // S22
                         + compressed_spec_mat[(i*30) + 18];   // S33
                     //significand = frexp(PSDB, &exponent);
                     pt_char = (unsigned char*) &PSDB;
                     LFR_BP1[(i*9) + 2] = pt_char[0]; // bits 31 downto 24 of the float
                     LFR_BP1[(i*9) + 3] = pt_char[1];  // bits 23 downto 16 of the float
                     //==============================================
                     // BP1 PSD == E PAR_LFR_SC_BP1_PB_FL0 == 16 bits
                     PSDE = compressed_spec_mat[(i*30) + 24] * K44_pe     // S44
                         + compressed_spec_mat[(i*30) + 28] * K55_pe      // S55
                         + compressed_spec_mat[(i*30) + 26] * K45_pe_re   // S45
                         - compressed_spec_mat[(i*30) + 27] * K45_pe_im;  // S45
                     pt_char = (unsigned char*) &PSDE;
                     LFR_BP1[(i*9) + 0] = pt_char[0]; // bits 31 downto 24 of the float
                     LFR_BP1[(i*9) + 1] = pt_char[1]; // bits 23 downto 16 of the float
                     //==============================================================================
                     // BP1 normal wave vector == PAR_LFR_SC_BP1_NVEC_V0_F0 == 8 bits
                                            // == PAR_LFR_SC_BP1_NVEC_V1_F0 == 8 bits
                                            // == PAR_LFR_SC_BP1_NVEC_V2_F0 == 1 bits
                     tmp = sqrt(
                                 compressed_spec_mat[(i*30) + 3]*compressed_spec_mat[(i*30) + 3]     //Im S12
                                 +compressed_spec_mat[(i*30) + 5]*compressed_spec_mat[(i*30) + 5]    //Im S13
                                 +compressed_spec_mat[(i*30) + 13]*compressed_spec_mat[(i*30) + 13]   //Im S23
                                 );
                     NVEC_V0 = compressed_spec_mat[(i*30) + 13] / tmp;  // Im S23
                     NVEC_V1 = -compressed_spec_mat[(i*30) + 5] / tmp;  // Im S13
                     NVEC_V2 = compressed_spec_mat[(i*30) + 3] / tmp;   // Im S12
                     LFR_BP1[(i*9) + 4] = (char) (NVEC_V0*127);
                     LFR_BP1[(i*9) + 5] = (char) (NVEC_V1*127);
                     pt_char = (unsigned char*) &NVEC_V2;
                     LFR_BP1[(i*9) + 6] = pt_char[0] & 0x80;  // extract the sign of NVEC_V2
                     //=======================================================
                     // BP1 ellipticity == PAR_LFR_SC_BP1_ELLIP_F0   == 4 bits
                     aux = 2*tmp / PSDB;                                             // compute the ellipticity
                     tmp_u_char = (unsigned char) (aux*(16-1));                      // convert the ellipticity
                     LFR_BP1[i*9+6] = LFR_BP1[i*9+6] | ((tmp_u_char&0x0f)<<3); // keeps 4 bits of the resulting unsigned char
                     //==============================================================
                     // BP1 degree of polarization == PAR_LFR_SC_BP1_DOP_F0 == 3 bits
                     for(j = 0; j<NB_VALUES_PER_SM;j++){
                         tr_SB_SB = compressed_spec_mat[i*30] * compressed_spec_mat[i*30]
                                 + compressed_spec_mat[(i*30) + 10] * compressed_spec_mat[(i*30) + 10]
                                 + compressed_spec_mat[(i*30) + 18] * compressed_spec_mat[(i*30) + 18]
                                 + 2 * compressed_spec_mat[(i*30) + 2] * compressed_spec_mat[(i*30) + 2]
                                 + 2 * compressed_spec_mat[(i*30) + 3] * compressed_spec_mat[(i*30) + 3]
                                 + 2 * compressed_spec_mat[(i*30) + 4] * compressed_spec_mat[(i*30) + 4]
                                 + 2 * compressed_spec_mat[(i*30) + 5] * compressed_spec_mat[(i*30) + 5]
                                 + 2 * compressed_spec_mat[(i*30) + 12] * compressed_spec_mat[(i*30) + 12]
                                 + 2 * compressed_spec_mat[(i*30) + 13] * compressed_spec_mat[(i*30) + 13];
                     }
                     aux = PSDB*PSDB;
                     tmp = sqrt( abs( ( 3*tr_SB_SB - aux ) / ( 2 * aux ) ) );
                     tmp_u_char = (unsigned char) (NVEC_V0*(8-1));
                     LFR_BP1[(i*9) + 6] = LFR_BP1[(i*9) + 6] | (tmp_u_char & 0x07); // keeps 3 bits of the resulting unsigned char
                     //=======================================================================================
                     // BP1 x-component of the normalized Poynting flux == PAR_LFR_SC_BP1_SZ_F0 == 8 bits (7+1)
                     sx_re = compressed_spec_mat[(i*30) + 20] * K34_sx_re
                                     + compressed_spec_mat[(i*30) + 6] * K14_sx_re
                                     + compressed_spec_mat[(i*30) + 8] * K15_sx_re
                                     + compressed_spec_mat[(i*30) + 14] * K24_sx_re
                                     + compressed_spec_mat[(i*30) + 16] * K25_sx_re
                                     + compressed_spec_mat[(i*30) + 22] * K35_sx_re;
                     sx_im = compressed_spec_mat[(i*30) + 21] * K34_sx_im
                                     + compressed_spec_mat[(i*30) + 7] * K14_sx_im
                                     + compressed_spec_mat[(i*30) + 9] * K15_sx_im
                                     + compressed_spec_mat[(i*30) + 15] * K24_sx_im
                                     + compressed_spec_mat[(i*30) + 17] * K25_sx_im
                                     + compressed_spec_mat[(i*30) + 23] * K35_sx_im;
                     LFR_BP1[(i*9) + 7] = ((unsigned char) (sx_re * 128)) & 0x7f; // cf DOC for the compression
                     if ( abs(sx_re) > abs(sx_im) ) {
                         LFR_BP1[(i*9) + 7] = LFR_BP1[(i*9) + 1] | (0x80);  // extract the sector of sx
                     }
                     else {
                         LFR_BP1[(i*9) + 7] = LFR_BP1[(i*9) + 1] & (0x7f);  // extract the sector of sx
                     }
                     //======================================================================
                     // BP1 phase velocity estimator == PAR_LFR_SC_BP1_VPHI_F0 == 8 bits (7+1)
                     ny = sin(Alpha_M)*NVEC_V1 + cos(Alpha_M)*NVEC_V2;
                     nz = NVEC_V0;
                     bx_bx_star = cos(Alpha_M) * cos(Alpha_M) * compressed_spec_mat[i*30+10]            // re S22
                                     + sin(Alpha_M) * sin(Alpha_M) * compressed_spec_mat[i*30+18]       // re S33
                                     - 2 * sin(Alpha_M) * cos(Alpha_M) * compressed_spec_mat[i*30+12];  // re S23
                     nebx_re = ny * (compressed_spec_mat[(i*30) + 14] * K24_ny_re
                                                     +compressed_spec_mat[(i*30) + 16] * K25_ny_re
                                                     +compressed_spec_mat[(i*30) + 20] * K34_ny_re
                                                     +compressed_spec_mat[(i*30) + 22] * K35_ny_re)
                                             + nz * (compressed_spec_mat[(i*30) + 14] * K24_nz_re
                                                     +compressed_spec_mat[(i*30) + 16] * K25_nz_re
                                                     +compressed_spec_mat[(i*30) + 20] * K34_nz_re
                                                     +compressed_spec_mat[(i*30) + 22] * K35_nz_re);
                     nebx_im = ny * (compressed_spec_mat[(i*30) + 15]*K24_ny_re
                                                     +compressed_spec_mat[(i*30) + 17] * K25_ny_re
                                                     +compressed_spec_mat[(i*30) + 21] * K34_ny_re
                                                     +compressed_spec_mat[(i*30) + 23] * K35_ny_re)
                                             + nz * (compressed_spec_mat[(i*30) + 15] * K24_nz_im
                                                     +compressed_spec_mat[(i*30) + 17] * K25_nz_im
                                                     +compressed_spec_mat[(i*30) + 21] * K34_nz_im
                                                     +compressed_spec_mat[(i*30) + 23] * K35_nz_im);
                     tmp = nebx_re / bx_bx_star;
                     LFR_BP1[(i*9) + 8] = ((unsigned char) (tmp * 128)) & 0x7f; // cf DOC for the compression
                     if ( abs(nebx_re) > abs(nebx_im) ) {
                         LFR_BP1[(i*9) + 8] = LFR_BP1[(i*9) + 8] | (0x80);  // extract the sector of nebx
                     }
                     else {
                         LFR_BP1[(i*9) + 8] = LFR_BP1[(i*9) + 8] & (0x7f);  // extract the sector of nebx
                     }
                 }
             }
             void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat){
                 // BP2 autocorrelation
                 int i;
                 int aux = 0;
                 for(i = 0; i<nb_bins_compressed_spec_mat; i++){
                     // S12
                     aux = sqrt(compressed_spec_mat[i*30]*compressed_spec_mat[(i*30) + 10]);
                     compressed_spec_mat[(i*30) + 2] = compressed_spec_mat[(i*30) + 2] / aux;
                     compressed_spec_mat[(i*30) + 3] = compressed_spec_mat[(i*30) + 3] / aux;
                     // S13
                     aux = sqrt(compressed_spec_mat[i*30]*compressed_spec_mat[(i*30) + 18]);
                     compressed_spec_mat[(i*30) + 4] = compressed_spec_mat[(i*30) + 4] / aux;
                     compressed_spec_mat[(i*30) + 5] = compressed_spec_mat[(i*30) + 5] / aux;
                     // S23
                     aux = sqrt(compressed_spec_mat[i*30+12]*compressed_spec_mat[(i*30) + 18]);
                     compressed_spec_mat[(i*30) + 12] = compressed_spec_mat[(i*30) + 12] / aux;
                     compressed_spec_mat[(i*30) + 13] = compressed_spec_mat[(i*30) + 13] / aux;
                     // S45
                     aux = sqrt(compressed_spec_mat[i*30+24]*compressed_spec_mat[(i*30) + 28]);
                     compressed_spec_mat[(i*30) + 26] = compressed_spec_mat[(i*30) + 26] / aux;
                     compressed_spec_mat[(i*30) + 27] = compressed_spec_mat[(i*30) + 27] / aux;
                     // S14
                     aux = sqrt(compressed_spec_mat[i*30]*compressed_spec_mat[(i*30)  +24]);
                     compressed_spec_mat[(i*30) + 6] = compressed_spec_mat[(i*30) + 6] / aux;
                     compressed_spec_mat[(i*30) + 7] = compressed_spec_mat[(i*30) + 7] / aux;
                     // S15
                     aux = sqrt(compressed_spec_mat[i*30]*compressed_spec_mat[(i*30) + 28]);
                     compressed_spec_mat[(i*30) + 8] = compressed_spec_mat[(i*30) + 8] / aux;
                     compressed_spec_mat[(i*30) + 9] = compressed_spec_mat[(i*30) + 9] / aux;
                     // S24
                     aux = sqrt(compressed_spec_mat[i*10]*compressed_spec_mat[(i*30) + 24]);
                     compressed_spec_mat[(i*30) + 14] = compressed_spec_mat[(i*30) + 14] / aux;
                     compressed_spec_mat[(i*30) + 15] = compressed_spec_mat[(i*30) + 15] / aux;
                     // S25
                     aux = sqrt(compressed_spec_mat[i*10]*compressed_spec_mat[(i*30) + 28]);
                     compressed_spec_mat[(i*30) + 16] = compressed_spec_mat[(i*30) + 16] / aux;
                     compressed_spec_mat[(i*30) + 17] = compressed_spec_mat[(i*30) + 17] / aux;
                     // S34
                     aux = sqrt(compressed_spec_mat[i*18]*compressed_spec_mat[(i*30) + 24]);
                     compressed_spec_mat[(i*30) + 20] = compressed_spec_mat[(i*30) + 20] / aux;
                     compressed_spec_mat[(i*30) + 21] = compressed_spec_mat[(i*30) + 21] / aux;
                     // S35
                     aux = sqrt(compressed_spec_mat[i*18]*compressed_spec_mat[(i*30) + 28]);
                     compressed_spec_mat[(i*30) + 22] = compressed_spec_mat[(i*30) + 22] / aux;
                     compressed_spec_mat[(i*30) + 23] = compressed_spec_mat[(i*30) + 23] / aux;
                 }
             }
             void init_header_asm( Header_TM_LFR_SCIENCE_ASM_t *header)
             {
                 header->targetLogicalAddress = CCSDS_DESTINATION_ID;
                 header->protocolIdentifier = CCSDS_PROTOCOLE_ID;
                 header->reserved = 0x00;
                 header->userApplication = CCSDS_USER_APP;
                 header->packetID[0] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST >> 8);
                 header->packetID[1] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST);
                 header->packetSequenceControl[0] = 0xc0;
                 header->packetSequenceControl[1] = 0x00;
                 header->packetLength[0] = 0x00;
                 header->packetLength[1] = 0x00;
                 // DATA FIELD HEADER
                 header->spare1_pusVersion_spare2 = 0x10;
                 header->serviceType = TM_TYPE_LFR_SCIENCE; // service type
                 header->serviceSubType = TM_SUBTYPE_LFR_SCIENCE; // service subtype
                 header->destinationID = TM_DESTINATION_ID_GROUND;
                 // AUXILIARY DATA HEADER
                 header->sid = 0x00;
                 header->biaStatusInfo = 0x00;
                 header->cntASM = 0x00;
                 header->nrASM = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->blkNr[0] = 0x00;  // BLK_NR MSB
                 header->blkNr[1] = 0x00;  // BLK_NR LSB
             }
             void send_spectral_matrix(Header_TM_LFR_SCIENCE_ASM_t *header, char *spectral_matrix,
                                 unsigned int sid, spw_ioctl_pkt_send *spw_ioctl_send, rtems_id queue_id)
             {
                 unsigned int i;
                 unsigned int length = 0;
                 rtems_status_code status;
                 header->sid = (unsigned char) sid;
                 for (i=0; i<2; i++)
                 {
                     // BUILD THE DATA
                     spw_ioctl_send->dlen = TOTAL_SIZE_SM;
                     spw_ioctl_send->data = &spectral_matrix[ i * TOTAL_SIZE_SM];
                     spw_ioctl_send->hlen = HEADER_LENGTH_TM_LFR_SCIENCE_ASM + CCSDS_PROTOCOLE_EXTRA_BYTES;
                     spw_ioctl_send->hdr = (char *) header;
                     spw_ioctl_send->options = 0;
                     // BUILD THE HEADER
                     length = PACKET_LENGTH_TM_LFR_SCIENCE_ASM;
                     header->packetLength[0] = (unsigned char) (length>>8);
                     header->packetLength[1] = (unsigned char) (length);
                     header->sid = (unsigned char) sid;   // SID
                     header->cntASM = 2;
                     header->nrASM = (unsigned char) (i+1);
                     header->blkNr[0] =(unsigned char)  ( (NB_BINS_PER_SM/2) >> 8 ); // BLK_NR MSB
                     header->blkNr[1] = (unsigned char)   (NB_BINS_PER_SM/2);        // BLK_NR LSB
                     // SET PACKET TIME
                     header->time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                     header->time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                     header->time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                     header->time[3] = (unsigned char) (time_management_regs->coarse_time);
                     header->time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                     header->time[5] = (unsigned char) (time_management_regs->fine_time);
                     header->acquisitionTime[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                     header->acquisitionTime[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                     header->acquisitionTime[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                     header->acquisitionTime[3] = (unsigned char) (time_management_regs->coarse_time);
                     header->acquisitionTime[4] = (unsigned char) (time_management_regs->fine_time>>8);
                     header->acquisitionTime[5] = (unsigned char) (time_management_regs->fine_time);
                     // SEND PACKET
                     status =  rtems_message_queue_send( queue_id, spw_ioctl_send, ACTION_MSG_SPW_IOCTL_SEND_SIZE);
                     if (status != RTEMS_SUCCESSFUL) {
                         printf("in send_spectral_matrix *** ERR %d\n", (int) status);
                     }
                 }
             }
             void convert_averaged_spectral_matrix( volatile float *input_matrix, char *output_matrix)
             {
                 unsigned int i;
                 unsigned int j;
                 char * pt_char_input;
                 char * pt_char_output;
                 pt_char_input = NULL;
                 pt_char_output = NULL;
                 for( i=0; i<NB_BINS_PER_SM; i++)
                 {
                     for ( j=0; j<NB_VALUES_PER_SM; j++)
                     {
                         pt_char_input =  (char*) &input_matrix [       (i*NB_VALUES_PER_SM) + j   ];
                         pt_char_output = (char*) &output_matrix[ 2 * ( (i*NB_VALUES_PER_SM) + j ) ];
                         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
                     }
                 }
             }
             void fill_averaged_spectral_matrix(void)
             {
                 /** This function fills spectral matrices related buffers with arbitrary data.
                  *
                  *  This function is for testing purpose only.
                  *
                  */
                 float offset;
                 float coeff;
                 offset = 10.;
                 coeff = 100000.;
-                averaged_spec_mat_f0[ 0 + 25 * 0  ] = 0. + offset;
+                averaged_sm_f0[ 0 + 25 * 0  ] = 0. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 1  ] = 1. + offset;
+                averaged_sm_f0[ 0 + 25 * 1  ] = 1. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 2  ] = 2. + offset;
+                averaged_sm_f0[ 0 + 25 * 2  ] = 2. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 3  ] = 3. + offset;
+                averaged_sm_f0[ 0 + 25 * 3  ] = 3. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 4  ] = 4. + offset;
+                averaged_sm_f0[ 0 + 25 * 4  ] = 4. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 5  ] = 5. + offset;
+                averaged_sm_f0[ 0 + 25 * 5  ] = 5. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 6  ] = 6. + offset;
+                averaged_sm_f0[ 0 + 25 * 6  ] = 6. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 7  ] = 7. + offset;
+                averaged_sm_f0[ 0 + 25 * 7  ] = 7. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 8  ] = 8. + offset;
+                averaged_sm_f0[ 0 + 25 * 8  ] = 8. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 9  ] = 9. + offset;
+                averaged_sm_f0[ 0 + 25 * 9  ] = 9. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 10 ] = 10. + offset;
+                averaged_sm_f0[ 0 + 25 * 10 ] = 10. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 11 ] = 11. + offset;
+                averaged_sm_f0[ 0 + 25 * 11 ] = 11. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 12 ] = 12. + offset;
+                averaged_sm_f0[ 0 + 25 * 12 ] = 12. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 13 ] = 13. + offset;
+                averaged_sm_f0[ 0 + 25 * 13 ] = 13. + offset;
-                averaged_spec_mat_f0[ 0 + 25 * 14 ] = 14. + offset;
+                averaged_sm_f0[ 0 + 25 * 14 ] = 14. + offset;
-                averaged_spec_mat_f0[ 9 + 25 * 0  ] = -(0. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 0  ] = -(0. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 1  ] = -(1. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 1  ] = -(1. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 2  ] = -(2. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 2  ] = -(2. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 3  ] = -(3. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 3  ] = -(3. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 4  ] = -(4. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 4  ] = -(4. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 5  ] = -(5. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 5  ] = -(5. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 6  ] = -(6. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 6  ] = -(6. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 7  ] = -(7. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 7  ] = -(7. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 8  ] = -(8. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 8  ] = -(8. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 9  ] = -(9. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 9  ] = -(9. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 10 ] = -(10. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 10 ] = -(10. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 11 ] = -(11. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 11 ] = -(11. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 12 ] = -(12. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 12 ] = -(12. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 13 ] = -(13. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 13 ] = -(13. + offset)* coeff;
-                averaged_spec_mat_f0[ 9 + 25 * 14 ] = -(14. + offset)* coeff;
+                averaged_sm_f0[ 9 + 25 * 14 ] = -(14. + offset)* coeff;
                 offset = 10000000;
-                averaged_spec_mat_f0[ 16 + 25 * 0  ] = (0. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 0  ] = (0. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 1  ] = (1. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 1  ] = (1. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 2  ] = (2. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 2  ] = (2. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 3  ] = (3. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 3  ] = (3. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 4  ] = (4. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 4  ] = (4. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 5  ] = (5. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 5  ] = (5. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 6  ] = (6. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 6  ] = (6. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 7  ] = (7. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 7  ] = (7. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 8  ] = (8. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 8  ] = (8. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 9  ] = (9. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 9  ] = (9. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 10 ] = (10. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 10 ] = (10. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 11 ] = (11. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 11 ] = (11. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 12 ] = (12. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 12 ] = (12. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 13 ] = (13. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 13 ] = (13. + offset)* coeff;
-                averaged_spec_mat_f0[ 16 + 25 * 14 ] = (14. + offset)* coeff;
+                averaged_sm_f0[ 16 + 25 * 14 ] = (14. + offset)* coeff;
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 0 ] = averaged_spec_mat_f0[ 0 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 0 ] = averaged_sm_f0[ 0 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 1 ] = averaged_spec_mat_f0[ 1 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 1 ] = averaged_sm_f0[ 1 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 2 ] = averaged_spec_mat_f0[ 2 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 2 ] = averaged_sm_f0[ 2 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 3 ] = averaged_spec_mat_f0[ 3 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 3 ] = averaged_sm_f0[ 3 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 4 ] = averaged_spec_mat_f0[ 4 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 4 ] = averaged_sm_f0[ 4 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 5 ] = averaged_spec_mat_f0[ 5 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 5 ] = averaged_sm_f0[ 5 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 6 ] = averaged_spec_mat_f0[ 6 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 6 ] = averaged_sm_f0[ 6 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 7 ] = averaged_spec_mat_f0[ 7 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 7 ] = averaged_sm_f0[ 7 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 8 ] = averaged_spec_mat_f0[ 8 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 8 ] = averaged_sm_f0[ 8 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 9 ] = averaged_spec_mat_f0[ 9 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 9 ] = averaged_sm_f0[ 9 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 10 ] = averaged_spec_mat_f0[ 10 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 10 ] = averaged_sm_f0[ 10 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 11 ] = averaged_spec_mat_f0[ 11 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 11 ] = averaged_sm_f0[ 11 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 12 ] = averaged_spec_mat_f0[ 12 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 12 ] = averaged_sm_f0[ 12 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 13 ] = averaged_spec_mat_f0[ 13 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 13 ] = averaged_sm_f0[ 13 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 14 ] = averaged_spec_mat_f0[ 14 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 14 ] = averaged_sm_f0[ 14 ];
-                averaged_spec_mat_f0[ (TOTAL_SIZE_SM/2) + 15 ] = averaged_spec_mat_f0[ 15 ];
+                averaged_sm_f0[ (TOTAL_SIZE_SM/2) + 15 ] = averaged_sm_f0[ 15 ];
             }
             void reset_spectral_matrix_regs()
             {
                 /** This function resets the spectral matrices module registers.
                  *
                  * The registers affected by this function are located at the following offset addresses:
                  *
                  * - 0x00 config
                  * - 0x04 status
                  * - 0x08 matrixF0_Address0
                  * - 0x10 matrixFO_Address1
                  * - 0x14 matrixF1_Address
                  * - 0x18 matrixF2_Address
                  *
                  */
             #ifdef GSA
             #else
-                spectral_matrix_regs->matrixF0_Address0 = (int) spec_mat_f0_0;
+                spectral_matrix_regs->matrixF0_Address0 = current_ring_node_sm_f0->buffer_address;
-                spectral_matrix_regs->matrixFO_Address1 = (int) spec_mat_f0_1;
+                spectral_matrix_regs->matrixFO_Address1 = current_ring_node_sm_f0->buffer_address;
-                spectral_matrix_regs->matrixF1_Address = (int) spec_mat_f1;
+                spectral_matrix_regs->matrixF1_Address = current_ring_node_sm_f1->buffer_address;
-                spectral_matrix_regs->matrixF2_Address = (int) spec_mat_f2;
+                spectral_matrix_regs->matrixF2_Address = current_ring_node_sm_f2->buffer_address;
             #endif
             }
             //******************
             // general functions

src/wf_handler.c +154 -85

             /** Functions and tasks related to waveform packet generation.
              *
              * @file
              * @author P. LEROY
              *
              * A group of functions to handle waveforms, in snapshot or continuous format.\n
              *
              */
             #include "wf_handler.h"
             //*****************
             // waveform headers
             // SWF
             Header_TM_LFR_SCIENCE_SWF_t headerSWF_F0[7];
             Header_TM_LFR_SCIENCE_SWF_t headerSWF_F1[7];
             Header_TM_LFR_SCIENCE_SWF_t headerSWF_F2[7];
             // CWF
             Header_TM_LFR_SCIENCE_CWF_t headerCWF_F1[7];
             Header_TM_LFR_SCIENCE_CWF_t headerCWF_F2_BURST[7];
             Header_TM_LFR_SCIENCE_CWF_t headerCWF_F2_SBM2[7];
             Header_TM_LFR_SCIENCE_CWF_t headerCWF_F3[7];
             Header_TM_LFR_SCIENCE_CWF_t headerCWF_F3_light[7];
             //**************
             // waveform ring
             ring_node waveform_ring_f0[NB_RING_NODES_F0];
             ring_node waveform_ring_f1[NB_RING_NODES_F1];
             ring_node waveform_ring_f2[NB_RING_NODES_F2];
             ring_node *current_ring_node_f0;
             ring_node *ring_node_to_send_swf_f0;
             ring_node *current_ring_node_f1;
             ring_node *ring_node_to_send_swf_f1;
             ring_node *ring_node_to_send_cwf_f1;
             ring_node *current_ring_node_f2;
             ring_node *ring_node_to_send_swf_f2;
             ring_node *ring_node_to_send_cwf_f2;
-            unsigned char doubleSendCWF2 = 0;
             rtems_isr waveforms_isr( rtems_vector_number vector )
             {
                 /** This is the interrupt sub routine called by the waveform picker core.
                  *
                  * This ISR launch different actions depending mainly on two pieces of information:
                  * 1. the values read in the registers of the waveform picker.
                  * 2. the current LFR mode.
                  *
                  */
+                static unsigned char nb_swf = 0;
                 if ( (lfrCurrentMode == LFR_MODE_NORMAL)
                      || (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) )
                 { // in modes other than STANDBY and BURST, send the CWF_F3 data
                     if ((waveform_picker_regs->status & 0x08) == 0x08){     // [1000] f3 is full
                         // (1) change the receiving buffer for the waveform picker
                         if (waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3_a) {
                             waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_b);
                         }
                         else {
                             waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_a);
                         }
                         // (2) send an event for the waveforms transmission
                         if (rtems_event_send( Task_id[TASKID_CWF3], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffff777; // reset f3 bits to 0, [1111 0111 0111 0111]
                     }
                 }
                 switch(lfrCurrentMode)
                 {
                     //********
                     // STANDBY
                     case(LFR_MODE_STANDBY):
                     break;
                     //******
                     // NORMAL
                     case(LFR_MODE_NORMAL):
                     if ( (waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full
                         // change F0 ring node
                         ring_node_to_send_swf_f0 = current_ring_node_f0;
                         current_ring_node_f0 = current_ring_node_f0->next;
                         waveform_picker_regs->addr_data_f0 = current_ring_node_f0->buffer_address;
                         // change F1 ring node
                         ring_node_to_send_swf_f1 = current_ring_node_f1;
                         current_ring_node_f1 = current_ring_node_f1->next;
                         waveform_picker_regs->addr_data_f1 = current_ring_node_f1->buffer_address;
                         // change F2 ring node
                         ring_node_to_send_swf_f2 = current_ring_node_f2;
                         current_ring_node_f2 = current_ring_node_f2->next;
                         waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address;
                         // send an event to the WFRM task
                         if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
+            //            nb_swf = nb_swf + 1;
+            //            if (nb_swf == 2)
+            //            {
+            //                reset_wfp_burst_enable();
+            //            }
+            //            else
+            //            {
                             waveform_picker_regs->status = waveform_picker_regs->status & 0xfffff888; // [1000 1000 1000]
-            //            rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_7 );
+            //            }
-            //            reset_wfp_burst_enable();
                     }
                     break;
                     //******
                     // BURST
                     case(LFR_MODE_BURST):
                     if ( (waveform_picker_regs->status & 0x04) == 0x04 ){ // [0100] check the f2 full bit
                         // (1) change the receiving buffer for the waveform picker
                         ring_node_to_send_cwf_f2 = current_ring_node_f2;
                         current_ring_node_f2 = current_ring_node_f2->next;
                         waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address;
                         // (2) send an event for the waveforms transmission
                         if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_BURST ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bit = 0
                     }
                     break;
                     //*****
                     // SBM1
                     case(LFR_MODE_SBM1):
                     if ( (waveform_picker_regs->status & 0x02) == 0x02 ) { // [0010] check the f1 full bit
                         // (1) change the receiving buffer for the waveform picker
                         ring_node_to_send_cwf_f1 = current_ring_node_f1;
                         current_ring_node_f1 = current_ring_node_f1->next;
                         waveform_picker_regs->addr_data_f1 = current_ring_node_f1->buffer_address;
                         // (2) send an event for the waveforms transmission
                         if (rtems_event_send( Task_id[TASKID_CWF1], RTEMS_EVENT_MODE_SBM1 ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffddd; // [1111 1101 1101 1101] f1 bit = 0
                     }
                     if ( (waveform_picker_regs->status & 0x01) == 0x01 ) { // [0001] check the f0 full bit
                         ring_node_to_send_swf_f1 = current_ring_node_f1->previous;
                     }
                     if ( (waveform_picker_regs->status & 0x04) == 0x04 ) { // [0100] check the f2 full bit
                         if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffaaa; // [1111 1010 1010 1010] f2 and f0 bits = 0
                     }
                     break;
                     //*****
                     // SBM2
                     case(LFR_MODE_SBM2):
                     if ( (waveform_picker_regs->status & 0x04) == 0x04 ){ // [0100] check the f2 full bit
                         // (1) change the receiving buffer for the waveform picker
                         ring_node_to_send_cwf_f2 = current_ring_node_f2;
                         current_ring_node_f2 = current_ring_node_f2->next;
                         waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address;
                         // (2) send an event for the waveforms transmission
                         if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_SBM2 ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bit = 0
                     }
                     if ( (waveform_picker_regs->status & 0x01) == 0x01 ) { // [0001] check the f0 full bit
                         ring_node_to_send_swf_f2 = current_ring_node_f2->previous;
                     }
                     if ( (waveform_picker_regs->status & 0x02) == 0x02 ) { // [0010] check the f1 full bit
                         if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffccc; // [1111 1100 1100 1100] f1, f0 bits = 0
                     }
                     break;
                     //********
                     // DEFAULT
                     default:
                     break;
                 }
             }
             rtems_task wfrm_task(rtems_task_argument argument) //used with the waveform picker VHDL IP
             {
                 /** This RTEMS task is dedicated to the transmission of snapshots of the NORMAL mode.
                  *
                  * @param unused is the starting argument of the RTEMS task
                  *
                  * The following data packets are sent by this task:
                  * - TM_LFR_SCIENCE_NORMAL_SWF_F0
                  * - TM_LFR_SCIENCE_NORMAL_SWF_F1
                  * - TM_LFR_SCIENCE_NORMAL_SWF_F2
                  *
                  */
                 rtems_event_set event_out;
                 rtems_id queue_id;
                 rtems_status_code status;
                 init_header_snapshot_wf_table( SID_NORM_SWF_F0, headerSWF_F0 );
                 init_header_snapshot_wf_table( SID_NORM_SWF_F1, headerSWF_F1 );
                 init_header_snapshot_wf_table( SID_NORM_SWF_F2, headerSWF_F2 );
                 init_waveforms();
                 status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in WFRM *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in WFRM ***\n")
                 while(1){
                     // wait for an RTEMS_EVENT
                     rtems_event_receive(RTEMS_EVENT_MODE_NORMAL | RTEMS_EVENT_MODE_SBM1
                                         | RTEMS_EVENT_MODE_SBM2 | RTEMS_EVENT_MODE_SBM2_WFRM,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     if (event_out == RTEMS_EVENT_MODE_NORMAL)
                     {
+                        PRINTF1("status %x\n", waveform_picker_regs->status )
                         send_waveform_SWF((volatile int*) ring_node_to_send_swf_f0->buffer_address, SID_NORM_SWF_F0, headerSWF_F0, queue_id);
                         send_waveform_SWF((volatile int*) ring_node_to_send_swf_f1->buffer_address, SID_NORM_SWF_F1, headerSWF_F1, queue_id);
                         send_waveform_SWF((volatile int*) ring_node_to_send_swf_f2->buffer_address, SID_NORM_SWF_F2, headerSWF_F2, queue_id);
+                        waveform_picker_regs->status = waveform_picker_regs->status & 0xfffff888; // [1000 1000 1000]
                     }
                     else
                     {
                         PRINTF("in WFRM *** unexpected event")
                     }
                 }
             }
             rtems_task cwf3_task(rtems_task_argument argument) //used with the waveform picker VHDL IP
             {
                 /** This RTEMS task is dedicated to the transmission of continuous waveforms at f3.
                  *
                  * @param unused is the starting argument of the RTEMS task
                  *
                  * The following data packet is sent by this task:
                  * - TM_LFR_SCIENCE_NORMAL_CWF_F3
                  *
                  */
                 rtems_event_set event_out;
                 rtems_id queue_id;
                 rtems_status_code status;
                 init_header_continuous_wf_table( SID_NORM_CWF_LONG_F3, headerCWF_F3 );
                 init_header_continuous_cwf3_light_table( headerCWF_F3_light );
                 status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in CWF3 *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in CWF3 ***\n")
                 while(1){
                     // wait for an RTEMS_EVENT
                     rtems_event_receive( RTEMS_EVENT_0,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     PRINTF("send CWF F3 \n")
                     if (waveform_picker_regs->addr_data_f3 == (int) wf_cont_f3_a) {
                         if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x01)
                         {
                             send_waveform_CWF( wf_cont_f3_b, SID_NORM_CWF_LONG_F3, headerCWF_F3, queue_id );
                         }
                         else
                         {
                             send_waveform_CWF3_light( wf_cont_f3_b, headerCWF_F3_light, queue_id );
                         }
                     }
                     else
                     {
                         if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x00)
                         {
                             send_waveform_CWF( wf_cont_f3_a, SID_NORM_CWF_LONG_F3, headerCWF_F3, queue_id );
                         }
                         else
                         {
                             send_waveform_CWF3_light( wf_cont_f3_a, headerCWF_F3_light, queue_id );
                         }
                     }
                 }
             }
             rtems_task cwf2_task(rtems_task_argument argument)  // ONLY USED IN BURST AND SBM2
             {
                 /** This RTEMS task is dedicated to the transmission of continuous waveforms at f2.
                  *
                  * @param unused is the starting argument of the RTEMS task
                  *
                  * The following data packet is sent by this function:
                  * - TM_LFR_SCIENCE_BURST_CWF_F2
                  * - TM_LFR_SCIENCE_SBM2_CWF_F2
                  *
                  */
                 rtems_event_set event_out;
                 rtems_id queue_id;
                 rtems_status_code status;
                 init_header_continuous_wf_table( SID_BURST_CWF_F2, headerCWF_F2_BURST );
                 init_header_continuous_wf_table( SID_SBM2_CWF_F2, headerCWF_F2_SBM2 );
                 status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in CWF2 *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in CWF2 ***\n")
                 while(1){
                     // wait for an RTEMS_EVENT
                     rtems_event_receive( RTEMS_EVENT_MODE_BURST | RTEMS_EVENT_MODE_SBM2,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     if (event_out == RTEMS_EVENT_MODE_BURST)
                     {
                         send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2->buffer_address, SID_BURST_CWF_F2, headerCWF_F2_BURST, queue_id );
                     }
                     if (event_out == RTEMS_EVENT_MODE_SBM2)
                     {
                         send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2->buffer_address, SID_SBM2_CWF_F2, headerCWF_F2_SBM2, queue_id );
                     }
                 }
             }
             rtems_task cwf1_task(rtems_task_argument argument)  // ONLY USED IN SBM1
             {
                 /** This RTEMS task is dedicated to the transmission of continuous waveforms at f1.
                  *
                  * @param unused is the starting argument of the RTEMS task
                  *
                  * The following data packet is sent by this function:
                  * - TM_LFR_SCIENCE_SBM1_CWF_F1
                  *
                  */
                 rtems_event_set event_out;
                 rtems_id queue_id;
                 rtems_status_code status;
                 init_header_continuous_wf_table( SID_SBM1_CWF_F1, headerCWF_F1 );
                 status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in CWF1 *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in CWF1 ***\n")
                 while(1){
                     // wait for an RTEMS_EVENT
                     rtems_event_receive( RTEMS_EVENT_MODE_SBM1,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     send_waveform_CWF( (volatile int*) ring_node_to_send_cwf_f1->buffer_address, SID_SBM1_CWF_F1, headerCWF_F1, queue_id );
                 }
             }
             //******************
             // general functions
             void init_waveforms( void )
             {
                 int i = 0;
                 for (i=0; i< NB_SAMPLES_PER_SNAPSHOT; i++)
                 {
                     //***
                     // F0
             //        wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET ] = 0x88887777;     //
             //        wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = 0x22221111;    //
             //        wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET  ] = 0x44443333;    //
                     //***
                     // F1
             //        wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = 0x22221111;
             //        wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = 0x44443333;
             //        wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET  ] = 0xaaaa0000;
                     //***
                     // F2
             //        wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = 0x44443333;
             //        wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = 0x22221111;
             //        wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET  ] = 0xaaaa0000;
                     //***
                     // F3
             //        wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 0 ] = val1;
             //        wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 1 ] = val2;
             //        wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 2 ] = 0xaaaa0000;
                 }
             }
             void init_waveform_rings( void )
             {
                 unsigned char i;
                 // F0 RING
                 waveform_ring_f0[0].next            = (ring_node*) &waveform_ring_f0[1];
                 waveform_ring_f0[0].previous        = (ring_node*) &waveform_ring_f0[NB_RING_NODES_F0-1];
                 waveform_ring_f0[0].buffer_address  = (int) &wf_snap_f0[0][0];
                 waveform_ring_f0[NB_RING_NODES_F0-1].next           = (ring_node*) &waveform_ring_f0[0];
                 waveform_ring_f0[NB_RING_NODES_F0-1].previous       = (ring_node*) &waveform_ring_f0[NB_RING_NODES_F0-2];
                 waveform_ring_f0[NB_RING_NODES_F0-1].buffer_address = (int) &wf_snap_f0[NB_RING_NODES_F0-1][0];
                 for(i=1; i<NB_RING_NODES_F0-1; i++)
                 {
                     waveform_ring_f0[i].next            = (ring_node*) &waveform_ring_f0[i+1];
                     waveform_ring_f0[i].previous        = (ring_node*) &waveform_ring_f0[i-1];
                     waveform_ring_f0[i].buffer_address  = (int) &wf_snap_f0[i][0];
                 }
                 // F1 RING
                 waveform_ring_f1[0].next            = (ring_node*) &waveform_ring_f1[1];
                 waveform_ring_f1[0].previous        = (ring_node*) &waveform_ring_f1[NB_RING_NODES_F1-1];
                 waveform_ring_f1[0].buffer_address  = (int) &wf_snap_f1[0][0];
                 waveform_ring_f1[NB_RING_NODES_F1-1].next           = (ring_node*) &waveform_ring_f1[0];
                 waveform_ring_f1[NB_RING_NODES_F1-1].previous       = (ring_node*) &waveform_ring_f1[NB_RING_NODES_F1-2];
                 waveform_ring_f1[NB_RING_NODES_F1-1].buffer_address = (int) &wf_snap_f1[NB_RING_NODES_F1-1][0];
                 for(i=1; i<NB_RING_NODES_F1-1; i++)
                 {
                     waveform_ring_f1[i].next            = (ring_node*) &waveform_ring_f1[i+1];
                     waveform_ring_f1[i].previous        = (ring_node*) &waveform_ring_f1[i-1];
                     waveform_ring_f1[i].buffer_address  = (int) &wf_snap_f1[i][0];
                 }
                 // F2 RING
                 waveform_ring_f2[0].next            = (ring_node*) &waveform_ring_f2[1];
                 waveform_ring_f2[0].previous        = (ring_node*) &waveform_ring_f2[NB_RING_NODES_F2-1];
                 waveform_ring_f2[0].buffer_address  = (int) &wf_snap_f2[0][0];
                 waveform_ring_f2[NB_RING_NODES_F2-1].next           = (ring_node*) &waveform_ring_f2[0];
                 waveform_ring_f2[NB_RING_NODES_F2-1].previous       = (ring_node*) &waveform_ring_f2[NB_RING_NODES_F2-2];
                 waveform_ring_f2[NB_RING_NODES_F2-1].buffer_address = (int) &wf_snap_f2[NB_RING_NODES_F2-1][0];
                 for(i=1; i<NB_RING_NODES_F2-1; i++)
                 {
                     waveform_ring_f2[i].next            = (ring_node*) &waveform_ring_f2[i+1];
                     waveform_ring_f2[i].previous        = (ring_node*) &waveform_ring_f2[i-1];
                     waveform_ring_f2[i].buffer_address  = (int) &wf_snap_f2[i][0];
                 }
                 DEBUG_PRINTF1("waveform_ring_f0 @%x\n", (unsigned int) waveform_ring_f0)
                 DEBUG_PRINTF1("waveform_ring_f1 @%x\n", (unsigned int) waveform_ring_f1)
                 DEBUG_PRINTF1("waveform_ring_f2 @%x\n", (unsigned int) waveform_ring_f2)
             }
             void reset_current_ring_nodes( void )
             {
                 current_ring_node_f0        = waveform_ring_f0;
                 ring_node_to_send_swf_f0    = waveform_ring_f0;
                 current_ring_node_f1        = waveform_ring_f1;
                 ring_node_to_send_cwf_f1    = waveform_ring_f1;
                 ring_node_to_send_swf_f1    = waveform_ring_f1;
                 current_ring_node_f2        = waveform_ring_f2;
                 ring_node_to_send_cwf_f2    = waveform_ring_f2;
                 ring_node_to_send_swf_f2    = waveform_ring_f2;
             }
             int init_header_snapshot_wf_table( unsigned int sid, Header_TM_LFR_SCIENCE_SWF_t *headerSWF)
             {
                 unsigned char i;
                 for (i=0; i<7; i++)
                 {
                     headerSWF[ i ].targetLogicalAddress = CCSDS_DESTINATION_ID;
                     headerSWF[ i ].protocolIdentifier = CCSDS_PROTOCOLE_ID;
                     headerSWF[ i ].reserved = DEFAULT_RESERVED;
                     headerSWF[ i ].userApplication = CCSDS_USER_APP;
                     headerSWF[ i ].packetID[0] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST >> 8);
                     headerSWF[ i ].packetID[1] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST);
                     headerSWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_STANDALONE;
                     if (i == 6)
                     {
                         headerSWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_SWF_224 >> 8);
                         headerSWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_SWF_224     );
                         headerSWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_224 >> 8);
                         headerSWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_224     );
                     }
                     else
                     {
                         headerSWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_SWF_304 >> 8);
                         headerSWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_SWF_304     );
                         headerSWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_304 >> 8);
                         headerSWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_304     );
                     }
                     headerSWF[ i ].packetSequenceControl[1] = TM_PACKET_SEQ_CNT_DEFAULT;
                     headerSWF[ i ].pktCnt = DEFAULT_PKTCNT;  // PKT_CNT
                     headerSWF[ i ].pktNr = i+1;    // PKT_NR
                     // DATA FIELD HEADER
                     headerSWF[ i ].spare1_pusVersion_spare2 = DEFAULT_SPARE1_PUSVERSION_SPARE2;
                     headerSWF[ i ].serviceType = TM_TYPE_LFR_SCIENCE; // service type
                     headerSWF[ i ].serviceSubType = TM_SUBTYPE_LFR_SCIENCE; // service subtype
                     headerSWF[ i ].destinationID = TM_DESTINATION_ID_GROUND;
                     // AUXILIARY DATA HEADER
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].time[0] = 0x00;
                     headerSWF[ i ].sid = sid;
                     headerSWF[ i ].hkBIA = DEFAULT_HKBIA;
                 }
                 return LFR_SUCCESSFUL;
             }
             int init_header_continuous_wf_table( unsigned int sid, Header_TM_LFR_SCIENCE_CWF_t *headerCWF )
             {
                 unsigned int i;
                 for (i=0; i<7; i++)
                 {
                     headerCWF[ i ].targetLogicalAddress = CCSDS_DESTINATION_ID;
                     headerCWF[ i ].protocolIdentifier = CCSDS_PROTOCOLE_ID;
                     headerCWF[ i ].reserved = DEFAULT_RESERVED;
                     headerCWF[ i ].userApplication = CCSDS_USER_APP;
                     if ( (sid == SID_SBM1_CWF_F1) || (sid == SID_SBM2_CWF_F2) )
                     {
                         headerCWF[ i ].packetID[0] = (unsigned char) (TM_PACKET_ID_SCIENCE_SBM1_SBM2 >> 8);
                         headerCWF[ i ].packetID[1] = (unsigned char) (TM_PACKET_ID_SCIENCE_SBM1_SBM2);
                     }
                     else
                     {
                         headerCWF[ i ].packetID[0] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST >> 8);
                         headerCWF[ i ].packetID[1] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST);
                     }
-                    if (i == 0)
+                    headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_STANDALONE;
+                    headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF_336 >> 8);
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_FIRST;
+                    headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF_336     );
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF_340 >> 8);
+                    headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_CWF >> 8);
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF_340     );
+                    headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_CWF     );
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_340 >> 8);
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_340     );
-                    else if (i == 6)
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_LAST;
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF_8 >> 8);
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF_8     );
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_8 >> 8);
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_8     );
-                    else
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_CONTINUATION;
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF_340 >> 8);
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF_340     );
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_340 >> 8);
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_340     );
                     headerCWF[ i ].packetSequenceControl[1] = TM_PACKET_SEQ_CNT_DEFAULT;
-                    // PKT_CNT
-                    // PKT_NR
                     // DATA FIELD HEADER
                     headerCWF[ i ].spare1_pusVersion_spare2 = DEFAULT_SPARE1_PUSVERSION_SPARE2;
                     headerCWF[ i ].serviceType = TM_TYPE_LFR_SCIENCE; // service type
                     headerCWF[ i ].serviceSubType = TM_SUBTYPE_LFR_SCIENCE; // service subtype
                     headerCWF[ i ].destinationID = TM_DESTINATION_ID_GROUND;
                     // AUXILIARY DATA HEADER
                     headerCWF[ i ].sid = sid;
                     headerCWF[ i ].hkBIA = DEFAULT_HKBIA;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                 }
                 return LFR_SUCCESSFUL;
             }
             int init_header_continuous_cwf3_light_table( Header_TM_LFR_SCIENCE_CWF_t *headerCWF )
             {
                 unsigned int i;
                 for (i=0; i<7; i++)
                 {
                     headerCWF[ i ].targetLogicalAddress = CCSDS_DESTINATION_ID;
                     headerCWF[ i ].protocolIdentifier = CCSDS_PROTOCOLE_ID;
                     headerCWF[ i ].reserved = DEFAULT_RESERVED;
                     headerCWF[ i ].userApplication = CCSDS_USER_APP;
                     headerCWF[ i ].packetID[0] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST >> 8);
                     headerCWF[ i ].packetID[1] = (unsigned char) (TM_PACKET_ID_SCIENCE_NORMAL_BURST);
-                    if (i == 0)
+                    headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_STANDALONE;
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_FIRST;
+                    headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF_672 >> 8);
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_340 >> 8);
+                    headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF_672     );
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_340     );
+                    headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_CWF_SHORT_F3 >> 8);
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_340 >> 8);
+                    headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_CWF_SHORT_F3     );
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_340     );
-                    else if (i == 6)
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_LAST;
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_8 >> 8);
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_8     );
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_8 >> 8);
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_8     );
-                    else
-                        headerCWF[ i ].packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_CONTINUATION;
-                        headerCWF[ i ].packetLength[0] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_340 >> 8);
-                        headerCWF[ i ].packetLength[1] = (unsigned char) (TM_LEN_SCI_CWF3_LIGHT_340     );
-                        headerCWF[ i ].blkNr[0] = (unsigned char) (BLK_NR_340 >> 8);
-                        headerCWF[ i ].blkNr[1] = (unsigned char) (BLK_NR_340     );
                     headerCWF[ i ].packetSequenceControl[1] = TM_PACKET_SEQ_CNT_DEFAULT;
                     // DATA FIELD HEADER
                     headerCWF[ i ].spare1_pusVersion_spare2 = DEFAULT_SPARE1_PUSVERSION_SPARE2;
                     headerCWF[ i ].serviceType = TM_TYPE_LFR_SCIENCE; // service type
                     headerCWF[ i ].serviceSubType = TM_SUBTYPE_LFR_SCIENCE; // service subtype
                     headerCWF[ i ].destinationID = TM_DESTINATION_ID_GROUND;
                     // AUXILIARY DATA HEADER
                     headerCWF[ i ].sid = SID_NORM_CWF_F3;
                     headerCWF[ i ].hkBIA = DEFAULT_HKBIA;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                     headerCWF[ i ].time[0] = 0x00;
                 }
                 return LFR_SUCCESSFUL;
             }
             int send_waveform_SWF( volatile int *waveform, unsigned int sid,
                                    Header_TM_LFR_SCIENCE_SWF_t *headerSWF, rtems_id queue_id )
             {
                 /** This function sends SWF CCSDS packets (F2, F1 or F0).
                  *
                  * @param waveform points to the buffer containing the data that will be send.
                  * @param sid is the source identifier of the data that will be sent.
                  * @param headerSWF points to a table of headers that have been prepared for the data transmission.
                  * @param queue_id is the id of the rtems queue to which spw_ioctl_pkt_send structures will be send. The structures
                  * contain information to setup the transmission of the data packets.
                  *
                  * One group of 2048 samples is sent as 7 consecutive packets, 6 packets containing 340 blocks and 8 packets containing 8 blocks.
                  *
                  */
                 unsigned int i;
                 int ret;
+                unsigned int coarseTime;
+                unsigned int fineTime;
                 rtems_status_code status;
                 spw_ioctl_pkt_send spw_ioctl_send_SWF;
                 spw_ioctl_send_SWF.hlen = TM_HEADER_LEN + 4 + 12; // + 4 is for the protocole extra header, + 12 is for the auxiliary header
                 spw_ioctl_send_SWF.options = 0;
                 ret = LFR_DEFAULT;
+                PRINTF1("sid = %d, ", sid)
+                PRINTF2("coarse = %x, fine = %x\n", waveform[0], waveform[1])
                 for (i=0; i<7; i++) // send waveform
                 {
             #ifdef VHDL_DEV
-                    spw_ioctl_send_SWF.data = (char*) &waveform[ (i * 304 * NB_WORDS_SWF_BLK) + TIME_OFFSET];
+                    spw_ioctl_send_SWF.data = (char*) &waveform[ (i * BLK_NR_304 * NB_WORDS_SWF_BLK) + TIME_OFFSET];
             #else
-                    spw_ioctl_send_SWF.data = (char*) &waveform[ (i * 304 * NB_WORDS_SWF_BLK) ];
+                    spw_ioctl_send_SWF.data = (char*) &waveform[ (i * BLK_NR_304 * NB_WORDS_SWF_BLK) ];
             #endif
                     spw_ioctl_send_SWF.hdr = (char*) &headerSWF[ i ];
                     // BUILD THE DATA
                     if (i==6) {
-                        spw_ioctl_send_SWF.dlen = 224 * NB_BYTES_SWF_BLK;
+                        spw_ioctl_send_SWF.dlen = BLK_NR_224 * NB_BYTES_SWF_BLK;
                     }
                     else {
-                        spw_ioctl_send_SWF.dlen = 304 * NB_BYTES_SWF_BLK;
+                        spw_ioctl_send_SWF.dlen = BLK_NR_304 * NB_BYTES_SWF_BLK;
                     }
                     // SET PACKET SEQUENCE COUNTER
                     increment_seq_counter_source_id( headerSWF[ i ].packetSequenceControl, sid );
                     // SET PACKET TIME
+            #ifdef VHDL_DEV
+                    coarseTime = waveform[0];
+                    fineTime   = waveform[1];
+                    compute_acquisition_time( &coarseTime, &fineTime, sid, i);
+                    headerSWF[ i ].acquisitionTime[0] = (unsigned char) (coarseTime >> 24 );
+                    headerSWF[ i ].acquisitionTime[1] = (unsigned char) (coarseTime >> 16 );
+                    headerSWF[ i ].acquisitionTime[2] = (unsigned char) (coarseTime >> 8  );
+                    headerSWF[ i ].acquisitionTime[3] = (unsigned char) (coarseTime       );
+                    headerSWF[ i ].acquisitionTime[4] = (unsigned char) (fineTime   >>  8 );
+                    headerSWF[ i ].acquisitionTime[5] = (unsigned char) (fineTime         );
+            #else
                     headerSWF[ i ].acquisitionTime[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                     headerSWF[ i ].acquisitionTime[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                     headerSWF[ i ].acquisitionTime[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                     headerSWF[ i ].acquisitionTime[3] = (unsigned char) (time_management_regs->coarse_time);
                     headerSWF[ i ].acquisitionTime[4] = (unsigned char) (time_management_regs->fine_time>>8);
                     headerSWF[ i ].acquisitionTime[5] = (unsigned char) (time_management_regs->fine_time);
+            #endif
                     headerSWF[ i ].time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                     headerSWF[ i ].time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                     headerSWF[ i ].time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                     headerSWF[ i ].time[3] = (unsigned char) (time_management_regs->coarse_time);
                     headerSWF[ i ].time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                     headerSWF[ i ].time[5] = (unsigned char) (time_management_regs->fine_time);
                     // SEND PACKET
                     status =  rtems_message_queue_send( queue_id, &spw_ioctl_send_SWF, ACTION_MSG_SPW_IOCTL_SEND_SIZE);
                     if (status != RTEMS_SUCCESSFUL) {
                         printf("%d-%d, ERR %d\n", sid, i, (int) status);
                         ret = LFR_DEFAULT;
                     }
                     rtems_task_wake_after(TIME_BETWEEN_TWO_SWF_PACKETS);  // 300 ms between each packet => 7 * 3 = 21 packets => 6.3 seconds
                 }
                 return ret;
             }
             int send_waveform_CWF(volatile int *waveform, unsigned int sid,
                                   Header_TM_LFR_SCIENCE_CWF_t *headerCWF, rtems_id queue_id)
             {
                 /** This function sends CWF CCSDS packets (F2, F1 or F0).
                  *
                  * @param waveform points to the buffer containing the data that will be send.
                  * @param sid is the source identifier of the data that will be sent.
                  * @param headerCWF points to a table of headers that have been prepared for the data transmission.
                  * @param queue_id is the id of the rtems queue to which spw_ioctl_pkt_send structures will be send. The structures
                  * contain information to setup the transmission of the data packets.
                  *
                  * One group of 2048 samples is sent as 7 consecutive packets, 6 packets containing 340 blocks and 8 packets containing 8 blocks.
                  *
                  */
                 unsigned int i;
                 int ret;
+                unsigned char *coarseTimePtr;
+                unsigned char *fineTimePtr;
                 rtems_status_code status;
                 spw_ioctl_pkt_send spw_ioctl_send_CWF;
                 spw_ioctl_send_CWF.hlen = TM_HEADER_LEN + 4 + 10; // + 4 is for the protocole extra header, + 10 is for the auxiliary header
                 spw_ioctl_send_CWF.options = 0;
                 ret = LFR_DEFAULT;
                 for (i=0; i<7; i++) // send waveform
                 {
                     int coarseTime = 0x00;
                     int fineTime = 0x00;
             #ifdef VHDL_DEV
-                    spw_ioctl_send_CWF.data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) + TIME_OFFSET];
+                    spw_ioctl_send_CWF.data = (char*) &waveform[ (i * BLK_NR_CWF * NB_WORDS_SWF_BLK) + TIME_OFFSET];
             #else
-                    spw_ioctl_send_CWF.data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) ];
+                    spw_ioctl_send_CWF.data = (char*) &waveform[ (i * BLK_NR_CWF * NB_WORDS_SWF_BLK) ];
             #endif
                     spw_ioctl_send_CWF.hdr = (char*) &headerCWF[ i ];
                     // BUILD THE DATA
-                    if (i==6) {
+                    spw_ioctl_send_CWF.dlen = BLK_NR_CWF * NB_BYTES_SWF_BLK;
-                        spw_ioctl_send_CWF.dlen = 8 * NB_BYTES_SWF_BLK;
-                    else {
-                        spw_ioctl_send_CWF.dlen = 340 * NB_BYTES_SWF_BLK;
                     // SET PACKET SEQUENCE COUNTER
                     increment_seq_counter_source_id( headerCWF[ i ].packetSequenceControl, sid );
                     // SET PACKET TIME
+            #ifdef VHDL_DEV
+                    coarseTimePtr = (unsigned char *) &waveform;
+                    fineTimePtr   = (unsigned char *) &waveform[1];
+                    headerCWF[ i ].acquisitionTime[0] = coarseTimePtr[2];
+                    headerCWF[ i ].acquisitionTime[1] = coarseTimePtr[3];
+                    headerCWF[ i ].acquisitionTime[2] = coarseTimePtr[0];
+                    headerCWF[ i ].acquisitionTime[3] = coarseTimePtr[1];
+                    headerCWF[ i ].acquisitionTime[4] = fineTimePtr[0];
+                    headerCWF[ i ].acquisitionTime[5] = fineTimePtr[1];
+            #else
                     coarseTime = time_management_regs->coarse_time;
                     fineTime = time_management_regs->fine_time;
                     headerCWF[ i ].acquisitionTime[0] = (unsigned char) (coarseTime>>24);
                     headerCWF[ i ].acquisitionTime[1] = (unsigned char) (coarseTime>>16);
                     headerCWF[ i ].acquisitionTime[2] = (unsigned char) (coarseTime>>8);
                     headerCWF[ i ].acquisitionTime[3] = (unsigned char) (coarseTime);
                     headerCWF[ i ].acquisitionTime[4] = (unsigned char) (fineTime>>8);
                     headerCWF[ i ].acquisitionTime[5] = (unsigned char) (fineTime);
+            #endif
                     headerCWF[ i ].time[0] = (unsigned char) (coarseTime>>24);
                     headerCWF[ i ].time[1] = (unsigned char) (coarseTime>>16);
                     headerCWF[ i ].time[2] = (unsigned char) (coarseTime>>8);
                     headerCWF[ i ].time[3] = (unsigned char) (coarseTime);
                     headerCWF[ i ].time[4] = (unsigned char) (fineTime>>8);
                     headerCWF[ i ].time[5] = (unsigned char) (fineTime);
                     // SEND PACKET
                     if (sid == SID_NORM_CWF_LONG_F3)
                     {
                         status =  rtems_message_queue_send( queue_id, &spw_ioctl_send_CWF, sizeof(spw_ioctl_send_CWF));
                         if (status != RTEMS_SUCCESSFUL) {
                             printf("%d-%d, ERR %d\n", sid, i, (int) status);
                             ret = LFR_DEFAULT;
                         }
                         rtems_task_wake_after(TIME_BETWEEN_TWO_CWF3_PACKETS);
                     }
                     else
                     {
                         status =  rtems_message_queue_send( queue_id, &spw_ioctl_send_CWF, sizeof(spw_ioctl_send_CWF));
                         if (status != RTEMS_SUCCESSFUL) {
                             printf("%d-%d, ERR %d\n", sid, i, (int) status);
                             ret = LFR_DEFAULT;
                         }
                     }
                 }
                 return ret;
             }
             int send_waveform_CWF3_light(volatile int *waveform, Header_TM_LFR_SCIENCE_CWF_t *headerCWF, rtems_id queue_id)
             {
                 /** This function sends CWF_F3 CCSDS packets without the b1, b2 and b3 data.
                  *
                  * @param waveform points to the buffer containing the data that will be send.
                  * @param headerCWF points to a table of headers that have been prepared for the data transmission.
                  * @param queue_id is the id of the rtems queue to which spw_ioctl_pkt_send structures will be send. The structures
                  * contain information to setup the transmission of the data packets.
                  *
                  * By default, CWF_F3 packet are send without the b1, b2 and b3 data. This function rebuilds a data buffer
                  * from the incoming data and sends it in 7 packets, 6 containing 340 blocks and 1 one containing 8 blocks.
                  *
                  */
                 unsigned int i;
                 int ret;
+                unsigned char *coarseTimePtr;
+                unsigned char *fineTimePtr;
                 rtems_status_code status;
                 spw_ioctl_pkt_send spw_ioctl_send_CWF;
                 char *sample;
                 spw_ioctl_send_CWF.hlen = TM_HEADER_LEN + 4 + 10; // + 4 is for the protocole extra header, + 10 is for the auxiliary header
                 spw_ioctl_send_CWF.options = 0;
                 ret = LFR_DEFAULT;
                 //**********************
                 // BUILD CWF3_light DATA
-                for ( i=0; i< 2048; i++)
+                for ( i=0; i< NB_SAMPLES_PER_SNAPSHOT; i++)
                 {
             #ifdef VHDL_DEV
                     sample = (char*) &waveform[ (i * NB_WORDS_SWF_BLK) + TIME_OFFSET ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK)     + TIME_OFFSET_IN_BYTES ] = sample[ 0 ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 1 + TIME_OFFSET_IN_BYTES ] = sample[ 1 ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 2 + TIME_OFFSET_IN_BYTES ] = sample[ 2 ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 3 + TIME_OFFSET_IN_BYTES ] = sample[ 3 ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 4 + TIME_OFFSET_IN_BYTES ] = sample[ 4 ];
+                    wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 5 + TIME_OFFSET_IN_BYTES ] = sample[ 5 ];
             #else
                     sample = (char*) &waveform[ i * NB_WORDS_SWF_BLK ];
-            #endif
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK)     ] = sample[ 0 ];
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 1 ] = sample[ 1 ];
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 2 ] = sample[ 2 ];
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 3 ] = sample[ 3 ];
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 4 ] = sample[ 4 ];
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 5 ] = sample[ 5 ];
+            #endif
                 }
                 //*********************
                 // SEND CWF3_light DATA
                 for (i=0; i<7; i++) // send waveform
                 {
                     int coarseTime = 0x00;
                     int fineTime = 0x00;
-                    spw_ioctl_send_CWF.data = (char*) &wf_cont_f3_light[ (i * 340 * NB_BYTES_CWF3_LIGHT_BLK) ];
+            #ifdef VHDL_DEV
+                    spw_ioctl_send_CWF.data = (char*) &wf_cont_f3_light[ (i * BLK_NR_CWF_SHORT_F3 * NB_BYTES_CWF3_LIGHT_BLK) + TIME_OFFSET_IN_BYTES];
+            #else
+                    spw_ioctl_send_CWF.data = (char*) &wf_cont_f3_light[ (i * BLK_NR_CWF_SHORT_F3 * NB_BYTES_CWF3_LIGHT_BLK) ];
+            #endif
                     spw_ioctl_send_CWF.hdr = (char*) &headerCWF[ i ];
                     // BUILD THE DATA
-                    if ( i == WFRM_INDEX_OF_LAST_PACKET ) {
+                    spw_ioctl_send_CWF.dlen = BLK_NR_CWF_SHORT_F3 * NB_BYTES_CWF3_LIGHT_BLK;
-                        spw_ioctl_send_CWF.dlen = 8 * NB_BYTES_CWF3_LIGHT_BLK;
-                    else {
-                        spw_ioctl_send_CWF.dlen = 340 * NB_BYTES_CWF3_LIGHT_BLK;
                     // SET PACKET SEQUENCE COUNTER
                     increment_seq_counter_source_id( headerCWF[ i ].packetSequenceControl, SID_NORM_CWF_F3 );
                     // SET PACKET TIME
+            #ifdef VHDL_DEV
+                    coarseTimePtr = (unsigned char *) &waveform;
+                    fineTimePtr   = (unsigned char *) &waveform[1];
+                    headerCWF[ i ].acquisitionTime[0] = coarseTimePtr[2];
+                    headerCWF[ i ].acquisitionTime[1] = coarseTimePtr[3];
+                    headerCWF[ i ].acquisitionTime[2] = coarseTimePtr[0];
+                    headerCWF[ i ].acquisitionTime[3] = coarseTimePtr[1];
+                    headerCWF[ i ].acquisitionTime[4] = fineTimePtr[0];
+                    headerCWF[ i ].acquisitionTime[5] = fineTimePtr[1];
+            #else
                     coarseTime = time_management_regs->coarse_time;
                     fineTime = time_management_regs->fine_time;
                     headerCWF[ i ].acquisitionTime[0] = (unsigned char) (coarseTime>>24);
                     headerCWF[ i ].acquisitionTime[1] = (unsigned char) (coarseTime>>16);
                     headerCWF[ i ].acquisitionTime[2] = (unsigned char) (coarseTime>>8);
                     headerCWF[ i ].acquisitionTime[3] = (unsigned char) (coarseTime);
                     headerCWF[ i ].acquisitionTime[4] = (unsigned char) (fineTime>>8);
                     headerCWF[ i ].acquisitionTime[5] = (unsigned char) (fineTime);
+            #endif
                     headerCWF[ i ].time[0] = (unsigned char) (coarseTime>>24);
                     headerCWF[ i ].time[1] = (unsigned char) (coarseTime>>16);
                     headerCWF[ i ].time[2] = (unsigned char) (coarseTime>>8);
                     headerCWF[ i ].time[3] = (unsigned char) (coarseTime);
                     headerCWF[ i ].time[4] = (unsigned char) (fineTime>>8);
                     headerCWF[ i ].time[5] = (unsigned char) (fineTime);
                     // SEND PACKET
                     status =  rtems_message_queue_send( queue_id, &spw_ioctl_send_CWF, sizeof(spw_ioctl_send_CWF));
                     if (status != RTEMS_SUCCESSFUL) {
                         printf("%d-%d, ERR %d\n", SID_NORM_CWF_F3, i, (int) status);
                         ret = LFR_DEFAULT;
                     }
                     rtems_task_wake_after(TIME_BETWEEN_TWO_CWF3_PACKETS);
                 }
                 return ret;
             }
+            void compute_acquisition_time( unsigned int *coarseTime, unsigned int *fineTime, unsigned int sid, unsigned char pa_lfr_pkt_nr )
+            {
+                unsigned long long int acquisitionTimeAsLong;
+                unsigned char acquisitionTime[6];
+                float deltaT = 0.;
+                acquisitionTime[0] = (unsigned char) ( *coarseTime >>  8 );
+                acquisitionTime[1] = (unsigned char) ( *coarseTime       );
+                acquisitionTime[2] = (unsigned char) ( *coarseTime >> 24 );
+                acquisitionTime[3] = (unsigned char) ( *coarseTime >> 16 );
+                acquisitionTime[4] = (unsigned char) ( *fineTime   >> 24 );
+                acquisitionTime[5] = (unsigned char) ( *fineTime   >> 16 );
+                acquisitionTimeAsLong = ( (unsigned long long int) acquisitionTime[0] << 40 )
+                        + ( (unsigned long long int) acquisitionTime[1] << 32 )
+                        + ( acquisitionTime[2] << 24 )
+                        + ( acquisitionTime[3] << 16 )
+                        + ( acquisitionTime[4] << 8  )
+                        + ( acquisitionTime[5]       );
+                switch( sid )
+                {
+                case SID_NORM_SWF_F0:
+                        deltaT = ( (float ) (pa_lfr_pkt_nr) ) * BLK_NR_304 * 65536. / 24576. ;
+                        break;
+                case SID_NORM_SWF_F1:
+                        deltaT = ( (float ) (pa_lfr_pkt_nr) ) * BLK_NR_304 * 65536. / 4096. ;
+                        break;
+                case SID_NORM_SWF_F2:
+                        deltaT = ( (float ) (pa_lfr_pkt_nr) ) * BLK_NR_304 * 65536. / 256. ;
+                        break;
+                default:
+                    deltaT = 0.;
+                    break;
+                }
+                acquisitionTimeAsLong = acquisitionTimeAsLong + (unsigned long long int) deltaT;
+                *coarseTime = (unsigned int) (acquisitionTimeAsLong >> 16);
+                *fineTime   = (unsigned int) (acquisitionTimeAsLong & 0xffff);
+            }
             //**************
             // wfp registers
             void set_wfp_data_shaping()
             {
                 /** This function sets the data_shaping register of the waveform picker module.
                  *
                  * The value is read from one field of the parameter_dump_packet structure:\n
                  * bw_sp0_sp1_r0_r1
                  *
                  */
                 unsigned char data_shaping;
                 // get the parameters for the data shaping [BW SP0 SP1 R0 R1] in sy_lfr_common1 and configure the register
                 // waveform picker : [R1 R0 SP1 SP0 BW]
                 data_shaping = parameter_dump_packet.bw_sp0_sp1_r0_r1;
             #ifdef GSA
             #else
                 waveform_picker_regs->data_shaping =
                           ( (data_shaping & 0x10) >> 4 )     // BW
                         + ( (data_shaping & 0x08) >> 2 )     // SP0
                         + ( (data_shaping & 0x04)      )     // SP1
                         + ( (data_shaping & 0x02) << 2 )     // R0
                         + ( (data_shaping & 0x01) << 4 );    // R1
             #endif
             }
             char set_wfp_delta_snapshot()
             {
                 /** This function sets the delta_snapshot register of the waveform picker module.
                  *
                  * The value is read from two (unsigned char) of the parameter_dump_packet structure:
                  * - sy_lfr_n_swf_p[0]
                  * - sy_lfr_n_swf_p[1]
                  *
                  */
                 char ret;
                 unsigned int delta_snapshot;
                 unsigned int aux;
                 aux = 0;
                 ret = LFR_DEFAULT;
                 delta_snapshot = parameter_dump_packet.sy_lfr_n_swf_p[0]*256
                         + parameter_dump_packet.sy_lfr_n_swf_p[1];
             #ifdef GSA
             #else
                 if ( delta_snapshot < MIN_DELTA_SNAPSHOT )
                 {
                     aux = MIN_DELTA_SNAPSHOT;
                     ret = LFR_DEFAULT;
                 }
                 else
                 {
                     aux = delta_snapshot ;
                     ret = LFR_SUCCESSFUL;
                 }
                 waveform_picker_regs->delta_snapshot = aux - 1;             // max 2 bytes
             #endif
                 return ret;
             }
             #ifdef VHDL_DEV
             void set_wfp_burst_enable_register( unsigned char mode )
             {
                 /** This function sets the waveform picker burst_enable register depending on the mode.
                  *
                  * @param mode is the LFR mode to launch.
                  *
                  * The burst bits shall be before the enable bits.
                  *
                  */
                 // [0000 0000] burst f2, f1, f0 enable f3 f2 f1 f0
                 // the burst bits shall be set first, before the enable bits
                 switch(mode) {
                 case(LFR_MODE_NORMAL):
                     waveform_picker_regs->run_burst_enable = 0x00;  // [0000 0000] no burst enable
                     waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
                     break;
                 case(LFR_MODE_BURST):
                     waveform_picker_regs->run_burst_enable = 0x40;  // [0100 0000] f2 burst enabled
                     waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x04; // [0100] enable f2
                     break;
                 case(LFR_MODE_SBM1):
                     waveform_picker_regs->run_burst_enable = 0x20;  // [0010 0000] f1 burst enabled
                     waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
                     break;
                 case(LFR_MODE_SBM2):
                     waveform_picker_regs->run_burst_enable = 0x40;  // [0100 0000] f2 burst enabled
                     waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
                     break;
                 default:
                     waveform_picker_regs->run_burst_enable = 0x00;  // [0000 0000] no burst enabled, no waveform enabled
                     break;
                 }
             }
             #else
             void set_wfp_burst_enable_register( unsigned char mode )
             {
                 /** This function sets the waveform picker burst_enable register depending on the mode.
                  *
                  * @param mode is the LFR mode to launch.
                  *
                  * The burst bits shall be before the enable bits.
                  *
                  */
                 // [0000 0000] burst f2, f1, f0 enable f3 f2 f1 f0
                 // the burst bits shall be set first, before the enable bits
                 switch(mode) {
                 case(LFR_MODE_NORMAL):
                     waveform_picker_regs->burst_enable = 0x00;  // [0000 0000] no burst enable
                     waveform_picker_regs->burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
                     break;
                 case(LFR_MODE_BURST):
                     waveform_picker_regs->burst_enable = 0x40;  // [0100 0000] f2 burst enabled
                     waveform_picker_regs->burst_enable =  waveform_picker_regs->burst_enable | 0x04; // [0100] enable f2
                     break;
                 case(LFR_MODE_SBM1):
                     waveform_picker_regs->burst_enable = 0x20;  // [0010 0000] f1 burst enabled
                     waveform_picker_regs->burst_enable =  waveform_picker_regs->burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
                     break;
                 case(LFR_MODE_SBM2):
                     waveform_picker_regs->burst_enable = 0x40;  // [0100 0000] f2 burst enabled
                     waveform_picker_regs->burst_enable =  waveform_picker_regs->burst_enable | 0x0f; // [1111] enable f3 f2 f1 f0
                     break;
                 default:
                     waveform_picker_regs->burst_enable = 0x00;  // [0000 0000] no burst enabled, no waveform enabled
                     break;
                 }
             }
             #endif
             void reset_wfp_burst_enable()
             {
                 /** This function resets the waveform picker burst_enable register.
                  *
                  * The burst bits [f2 f1 f0] and the enable bits [f3 f2 f1 f0] are set to 0.
                  *
                  */
             #ifdef VHDL_DEV
                 waveform_picker_regs->run_burst_enable = 0x00;              // burst f2, f1, f0     enable f3, f2, f1, f0
             #else
                 waveform_picker_regs->burst_enable = 0x00;              // burst f2, f1, f0     enable f3, f2, f1, f0
             #endif
             }
             void reset_wfp_status()
             {
                 /** This function resets the waveform picker status register.
                  *
                  * All status bits are set to 0 [new_err full_err full].
                  *
                  */
             #ifdef GSA
             #else
                 waveform_picker_regs->status = 0x00;              // burst f2, f1, f0     enable f3, f2, f1, f0
             #endif
             }
             #ifdef VHDL_DEV
             void reset_waveform_picker_regs()
             {
                 /** This function resets the waveform picker module registers.
                 *
                 * The registers affected by this function are located at the following offset addresses:
                 * - 0x00 data_shaping
                 * - 0x04 run_burst_enable
                 * - 0x08 addr_data_f0
                 * - 0x0C addr_data_f1
                 * - 0x10 addr_data_f2
                 * - 0x14 addr_data_f3
                 * - 0x18 status
                 * - 0x1C delta_snapshot
                 * - 0x20 delta_f0
                 * - 0x24 delta_f0_2
                 * - 0x28 delta_f1
                 * - 0x2c delta_f2
                 * - 0x30 nb_data_by_buffer
                 * - 0x34 nb_snapshot_param
                 * - 0x38 start_date
                 * - 0x3c nb_word_in_buffer
                 *
                 */
                 waveform_picker_regs->data_shaping = 0x01; // 0x00 *** R1 R0 SP1 SP0 BW
                 waveform_picker_regs->run_burst_enable = 0x00; // 0x04 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
                 //waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0); // 0x08
                 waveform_picker_regs->addr_data_f0 = current_ring_node_f0->buffer_address; // 0x08
                 waveform_picker_regs->addr_data_f1 = current_ring_node_f1->buffer_address; // 0x0c
                 waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address; // 0x10
                 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_a); // 0x14
                 waveform_picker_regs->status = 0x00; // 0x18
-                // waveform_picker_regs->delta_snapshot = 0x12800; // 0x1c 296 * 256 = 75776
+                //
-                waveform_picker_regs->delta_snapshot = 0x1000; // 0x1c 16 * 256 = 4096
+            //    waveform_picker_regs->delta_snapshot = 0x1000;  // 0x1c *** 4096 =   16 * 256
-                //waveform_picker_regs->delta_snapshot = 0x2000; // 0x1c 32 * 256 = 8192
+            //    waveform_picker_regs->delta_f0 = 0xc0b;         // 0x20 *** 3083 = 4096 - 1013
-                waveform_picker_regs->delta_f0 = 0xbf5; // 0x20 *** 1013
+            //    waveform_picker_regs->delta_f0_2 = 0x7;         // 0x24 *** 7 [7 bits]
+            //    waveform_picker_regs->delta_f1 = 0xc40;         // 0x28 *** 3136 = 4096 - 960
+            //    waveform_picker_regs->delta_f2 = 0xc00;         // 0x2c *** 3072 =   12 * 256
+                //
+                waveform_picker_regs->delta_snapshot = 0x1000;  // 0x1c *** 4096 =   16 * 256
+                waveform_picker_regs->delta_f0 = 0x1;           // 0x20 ***
                 waveform_picker_regs->delta_f0_2 = 0x7;         // 0x24 *** 7 [7 bits]
-                waveform_picker_regs->delta_f1 = 0xbc0; // 0x28 *** 960
+                waveform_picker_regs->delta_f1 = 0x1;           // 0x28 ***
-                // waveform_picker_regs->delta_f2 = 0x12200; // 0x2c *** 290 * 256 = 74240
+                waveform_picker_regs->delta_f2 = 0x1;           // 0x2c ***
-                waveform_picker_regs->delta_f2 = 0xc00;             // 0x2c *** 12 * 256 = 3072
+                // 2048
-                waveform_picker_regs->nb_data_by_buffer = 0x7ff;    // 0x30 *** 2048 -1 => nb samples -1
+            //    waveform_picker_regs->nb_data_by_buffer = 0x7ff;    // 0x30 *** 2048 -1 => nb samples -1
-                waveform_picker_regs->snapshot_param = 0x800; // 0x34 *** 2048 => nb samples
+            //    waveform_picker_regs->snapshot_param = 0x800;       // 0x34 *** 2048 => nb samples
+            //    waveform_picker_regs->start_date = 0x00;            // 0x38
+            //    waveform_picker_regs->nb_word_in_buffer = 0x1802;   // 0x3c *** 2048 * 3 + 2 = 6146
+                // 2352 = 7 * 336
+                waveform_picker_regs->nb_data_by_buffer = 0x92f;    // 0x30 *** 2352 - 1 => nb samples -1
+                waveform_picker_regs->snapshot_param = 0x930;       // 0x34 *** 2352 => nb samples
                 waveform_picker_regs->start_date = 0x00;            // 0x38
-                waveform_picker_regs->nb_word_in_buffer = 0x1802; // 0x3c *** 2048 * 3 + 2 = 6146
+                waveform_picker_regs->nb_word_in_buffer = 0x1b92;   // 0x3c *** 2352 * 3 + 2 = 7058
             }
             #else
             void reset_waveform_picker_regs()
             {
                 /** This function resets the waveform picker module registers.
                  *
                  * The registers affected by this function are located at the following offset addresses:
                  * - 0x00 data_shaping
                  * - 0x04 burst_enable
                  * - 0x08 addr_data_f0
                  * - 0x0C addr_data_f1
                  * - 0x10 addr_data_f2
                  * - 0x14 addr_data_f3
                  * - 0x18 status
                  * - 0x1C delta_snapshot
                  * - 0x20 delta_f2_f1
                  * - 0x24 delta_f2_f0
                  * - 0x28 nb_burst
                  * - 0x2C nb_snapshot
                  *
                  */
                 reset_wfp_burst_enable();
                 reset_wfp_status();
                 // set buffer addresses
                 waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0);
                 waveform_picker_regs->addr_data_f1 = current_ring_node_f1->buffer_address;
                 waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address;
                 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3_a);
                 // set other parameters
                 set_wfp_data_shaping();
                 set_wfp_delta_snapshot();                           // time in seconds between two snapshots
                 waveform_picker_regs->delta_f2_f1 = 0xffff;         // 0x16800 => 92160 (max 4 bytes)
                 waveform_picker_regs->delta_f2_f0 = 0x17c00;        // 97 280 (max 5 bytes)
             //    waveform_picker_regs->nb_burst_available = 0x180;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
             //                                                        // 3 * 2048 / 16 = 384
             //    waveform_picker_regs->nb_snapshot_param = 0x7ff;    // max 3 octets, 2048 - 1
                 waveform_picker_regs->nb_burst_available = 0x1b9;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
                                                                     // 3 * 2352 / 16 = 441
                 waveform_picker_regs->nb_snapshot_param = 0x944;    // max 3 octets, 2372 - 1
             }
             #endif
             //*****************
             // local parameters
             void set_local_nb_interrupt_f0_MAX( void )
             {
                 /** This function sets the value of the nb_interrupt_f0_MAX local parameter.
                  *
                  * This parameter is used for the SM validation only.\n
                  * The software waits param_local.local_nb_interrupt_f0_MAX interruptions from the spectral matrices
                  * module before launching a basic processing.
                  *
                  */
                 param_local.local_nb_interrupt_f0_MAX = ( (parameter_dump_packet.sy_lfr_n_asm_p[0]) * 256
                         + parameter_dump_packet.sy_lfr_n_asm_p[1] ) * 100;
             }
             void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid )
             {
                 unsigned short *sequence_cnt;
                 unsigned short segmentation_grouping_flag;
                 unsigned short new_packet_sequence_control;
                 if ( (sid ==SID_NORM_SWF_F0)    || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
                      || (sid ==SID_NORM_CWF_F3) || (sid==SID_NORM_CWF_LONG_F3) || (sid ==SID_BURST_CWF_F2) )
                 {
                     sequence_cnt = &sequenceCounters_SCIENCE_NORMAL_BURST;
                 }
                 else if ( (sid ==SID_SBM1_CWF_F1) || (sid ==SID_SBM2_CWF_F2) )
                 {
                     sequence_cnt = &sequenceCounters_SCIENCE_SBM1_SBM2;
                 }
                 else
                 {
                     sequence_cnt = NULL;
                     PRINTF1("in increment_seq_counter_source_id *** ERR apid_destid %d not known\n", sid)
                 }
                 if (sequence_cnt != NULL)
                 {
                     segmentation_grouping_flag  = (packet_sequence_control[ 0 ] & 0xc0) << 8;
                     *sequence_cnt                = (*sequence_cnt) & 0x3fff;
                     new_packet_sequence_control = segmentation_grouping_flag | *sequence_cnt ;
                     packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
                     packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control     );
                     // increment the sequence counter for the next packet
                     if ( *sequence_cnt < SEQ_CNT_MAX)
                     {
                         *sequence_cnt = *sequence_cnt + 1;
                     }
                     else
                     {
                         *sequence_cnt = 0;
                     }
                 }
             }

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