HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r11:0c9852fa341b

Plugin modified to allow the launch of interactiv tests from the python interpreter...

leroy -

r11:0c9852fa341b default

parent child

Context file:

r11:0c9852fa341b

Makefile +1 -1

             #############################################################################
             # Makefile for building: PAULs_LPPMON_PLUGINS
-            # Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 09:02:30 2012
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Mar 5 08:11:23 2013
             # Project:  PAULs_LPPMON_PLUGINS.pro
             # Template: subdirs
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             #############################################################################
             first: make_default
             MAKEFILE      = Makefile
             QMAKE         = /usr/bin/qmake-qt4
             DEL_FILE      = rm -f
             CHK_DIR_EXISTS= test -d
             MKDIR         = mkdir -p
             COPY          = cp -f
             COPY_FILE     = $(COPY)
             COPY_DIR      = $(COPY) -r
             INSTALL_FILE  = install -m 644 -p
             INSTALL_PROGRAM = install -m 755 -p
             INSTALL_DIR   = $(COPY_DIR)
             DEL_FILE      = rm -f
             SYMLINK       = ln -f -s
             DEL_DIR       = rmdir
             MOVE          = mv -f
             CHK_DIR_EXISTS= test -d
             MKDIR         = mkdir -p
             SUBTARGETS    =  \
             		sub-rmapplugin
             rmapplugin/$(MAKEFILE):
             	@$(CHK_DIR_EXISTS) rmapplugin/ || $(MKDIR) rmapplugin/
             	cd rmapplugin/ && $(QMAKE) /opt/LPPMON_PLUGINS_PAUL/rmapplugin/rmapplugin.pro -spec /usr/lib64/qt4/mkspecs/linux-g++ -o $(MAKEFILE)
             sub-rmapplugin-qmake_all:  FORCE
             	@$(CHK_DIR_EXISTS) rmapplugin/ || $(MKDIR) rmapplugin/
             	cd rmapplugin/ && $(QMAKE) /opt/LPPMON_PLUGINS_PAUL/rmapplugin/rmapplugin.pro -spec /usr/lib64/qt4/mkspecs/linux-g++ -o $(MAKEFILE)
             sub-rmapplugin: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_default-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_default: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_first-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) first
             sub-rmapplugin-make_first: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) first
             sub-rmapplugin-all-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) all
             sub-rmapplugin-all: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) all
             sub-rmapplugin-clean-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) clean
             sub-rmapplugin-clean: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) clean
             sub-rmapplugin-distclean-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) distclean
             sub-rmapplugin-distclean: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) distclean
             sub-rmapplugin-install_subtargets-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) install
             sub-rmapplugin-install_subtargets: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) install
             sub-rmapplugin-uninstall_subtargets-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) uninstall
             sub-rmapplugin-uninstall_subtargets: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) uninstall
             Makefile: PAULs_LPPMON_PLUGINS.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_version.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 \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.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 PAULs_LPPMON_PLUGINS.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_version.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:
             /usr/lib64/qt4/mkspecs/features/release.prf:
             /usr/lib64/qt4/mkspecs/features/default_post.prf:
             /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
             /usr/lib64/qt4/mkspecs/features/warn_on.prf:
             /usr/lib64/qt4/mkspecs/features/qt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/thread.prf:
             /usr/lib64/qt4/mkspecs/features/moc.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: qmake_all FORCE
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             qmake_all: sub-rmapplugin-qmake_all FORCE
             make_default: sub-rmapplugin-make_default-ordered FORCE
             make_first: sub-rmapplugin-make_first-ordered FORCE
             all: sub-rmapplugin-all-ordered FORCE
             clean: sub-rmapplugin-clean-ordered FORCE
             distclean: sub-rmapplugin-distclean-ordered FORCE
             	-$(DEL_FILE) Makefile
             install_subtargets: sub-rmapplugin-install_subtargets-ordered FORCE
             uninstall_subtargets: sub-rmapplugin-uninstall_subtargets-ordered FORCE
             sub-rmapplugin-check_ordered: rmapplugin/$(MAKEFILE)
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) check
             check: sub-rmapplugin-check_ordered
             mocclean: compiler_moc_header_clean compiler_moc_source_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
             install: install_subtargets  FORCE
             uninstall:  uninstall_subtargets FORCE
             FORCE:

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2012-12-11T14:32:09. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-03-21T08:38:26. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
               <value type="int">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.EditorSettings</variable>
               <valuemap type="QVariantMap">
                <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
                <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
                 <value type="QString" key="language">Cpp</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="QString" 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="QString" 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="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
                <value type="int" key="EditorConfiguration.IndentSize">4</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</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</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.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <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="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="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>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="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>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
                 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) 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="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
                </valuemap>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
                 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <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="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="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>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="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>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
                 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Debug</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="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</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.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.RunConfiguration.0">
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <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.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">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.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</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.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</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>
                 <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="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
                 <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">lppmon</value>
                 <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run lppmon</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.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.TargetCount</variable>
               <value type="int">1</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
               <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
               <value type="int">10</value>
              </data>
             </qtcreator>

common_PLE/qipdialogbox.cpp +12 -2

             #include "qipdialogbox.h"
             #include <QSpinBox>
             #include <QHBoxLayout>
             #include <QVBoxLayout>
             #include <QLabel>
             #include <QString>
             #include <QLocale>
             QIPDialogBox::QIPDialogBox(QWidget *parent) :
                 QWidget(parent)
             {
                 //labelGRESBIP = new QLabel(tr("IP not set"));
                 QHBoxLayout *addressLayout = new QHBoxLayout;
                 QVBoxLayout *mainLayout = new QVBoxLayout;
                 addressPart1 = new QSpinBox;
                 addressPart2 = new QSpinBox;
                 addressPart3 = new QSpinBox;
                 addressPart4 = new QSpinBox;
                 addressPart1->setRange(0, 255);
                 addressPart1->setValue(129);
                 addressPart1->setButtonSymbols(QAbstractSpinBox::NoButtons);
                 addressPart2->setRange(0, 255);
                 addressPart2->setValue(104);
                 addressPart2->setButtonSymbols(QAbstractSpinBox::NoButtons);
                 addressPart3->setRange(0, 255);
                 addressPart3->setValue(27);
                 addressPart3->setButtonSymbols(QAbstractSpinBox::NoButtons);
                 addressPart4->setRange(0, 255);
                 addressPart4->setValue(113);
                 addressPart4->setButtonSymbols(QAbstractSpinBox::NoButtons);
                 valueChanged();
                 connect(addressPart1, SIGNAL(valueChanged(int)), this, SLOT(valueChanged()));
                 connect(addressPart2, SIGNAL(valueChanged(int)), this, SLOT(valueChanged()));
                 connect(addressPart3, SIGNAL(valueChanged(int)), this, SLOT(valueChanged()));
                 connect(addressPart4, SIGNAL(valueChanged(int)), this, SLOT(valueChanged()));
                 addressLayout->addWidget(addressPart1);
                 addressLayout->addWidget(addressPart2);
                 addressLayout->addWidget(addressPart3);
                 addressLayout->addWidget(addressPart4);
                 mainLayout->addLayout(addressLayout);
                 //mainLayout->addWidget(labelGRESBIP);
                 setLayout(mainLayout);
             }
             void QIPDialogBox::valueChanged() // SLOT
             {
                 gresbIP = addressPart1->cleanText();
                 gresbIP.append(".");
                 gresbIP.append(addressPart2->cleanText());
                 gresbIP.append(".");
                 gresbIP.append(addressPart3->cleanText());
                 gresbIP.append(".");
                 gresbIP.append(addressPart4->cleanText());
-                //labelGRESBIP->setText("IP used for the gresb module: " + gresbIP);
             }
-            QString QIPDialogBox::getGRESBIP()
+            QString QIPDialogBox::getIP()
             {
                 return(gresbIP);
             }
+            void QIPDialogBox::setIP(unsigned char address1, unsigned char address2, unsigned char address3, unsigned char address4)
+            {
+                addressPart1->setValue(address1);
+                addressPart2->setValue(address2);
+                addressPart3->setValue(address3);
+                addressPart4->setValue(address4);
+                addressPart1->repaint();
+                addressPart2->repaint();
+                addressPart3->repaint();
+                addressPart4->repaint();
+            }

common_PLE/qipdialogbox.h +2 -1

             #ifndef WIDGETADDRESS_H
             #define WIDGETADDRESS_H
             #include <QWidget>
             #include <QSpinBox>
             #include <QString>
             #include <QLabel>
             class QIPDialogBox : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit QIPDialogBox(QWidget *parent = 0);
-                QString getGRESBIP();
+                void setIP(unsigned char address1, unsigned char address2, unsigned char address3, unsigned char address4);
             signals:
             public slots:
                 void valueChanged();
+                QString getIP();
             private:
                 QSpinBox *addressPart1;
                 QSpinBox *addressPart2;
                 QSpinBox *addressPart3;
                 QSpinBox *addressPart4;
                 //QLabel * labelGRESBIP;
                 QString gresbIP;
             };
             #endif // WIDGETADDRESS_H

rmapplugin/Makefile +39 -29

             #############################################################################
             # Makefile for building: librmapplugin.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 16:03:39 2012
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Mar 19 07:43:19 2013
             # Project:  rmapplugin.pro
             # Template: lib
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             #############################################################################
             ####### Compiler, tools and options
             CC            = gcc
             CXX           = g++
-            DEFINES       = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+            DEFINES       = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
             CFLAGS        = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
             CXXFLAGS      = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-            INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.61/inc -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc
+            INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.61/inc -I/usr/include/lppmon/common -I/usr/include/lppmon -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc
             LINK          = g++
             LFLAGS        = -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,librmapplugin.so.1
-            LIBS          = $(SUBLIBS)  -L/usr/lib64 ../spw_usb_driver_v2.61/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.61/lib/x86_64/libConfigLibraryUSB.so -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtGui -lQtNetwork -lQtCore -lpthread
+            LIBS          = $(SUBLIBS)  -L/usr/lib64 ../spw_usb_driver_v2.61/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.61/lib/x86_64/libConfigLibraryUSB.so -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
             AR            = ar cqs
             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         =
             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       = rmapplugin.cpp \
             		rmappluginui.cpp \
             		rmapoperations.cpp \
             		ccsds.cpp \
             		../common_PLE/qipdialogbox.cpp \
             		../common_PLE/gresbstatusenquiry.cpp \
             		spectralmatricesdmasimulator.cpp \
             		rmappluginpythonwrapper.cpp \
             		stardundee.cpp \
             		gresb.cpp \
-            		bridge.cpp \
+            		tcpackettosend.cpp \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \
             		moc/moc_rmapplugin.cpp \
             		moc/moc_qipdialogbox.cpp \
             		moc/moc_gresbstatusenquiry.cpp \
             		moc/moc_spectralmatricesdmasimulator.cpp \
             		moc/moc_rmappluginpythonwrapper.cpp \
             		moc/moc_stardundee.cpp \
             		moc/moc_gresb.cpp \
-            		moc/moc_bridge.cpp \
+            		moc/moc_tcpackettosend.cpp \
             		moc/moc_genericPySysdriver.cpp \
             		moc/moc_lppmonplugin.cpp
             OBJECTS       = obj/rmapplugin.o \
             		obj/rmappluginui.o \
             		obj/rmapoperations.o \
             		obj/ccsds.o \
             		obj/qipdialogbox.o \
             		obj/gresbstatusenquiry.o \
             		obj/spectralmatricesdmasimulator.o \
             		obj/rmappluginpythonwrapper.o \
             		obj/stardundee.o \
             		obj/gresb.o \
-            		obj/bridge.o \
+            		obj/tcpackettosend.o \
             		obj/lppmonplugininterface.o \
             		obj/moc_rmappluginui.o \
             		obj/moc_rmapplugin.o \
             		obj/moc_qipdialogbox.o \
             		obj/moc_gresbstatusenquiry.o \
             		obj/moc_spectralmatricesdmasimulator.o \
             		obj/moc_rmappluginpythonwrapper.o \
             		obj/moc_stardundee.o \
             		obj/moc_gresb.o \
-            		obj/moc_bridge.o \
+            		obj/moc_tcpackettosend.o \
             		obj/moc_genericPySysdriver.o \
             		obj/moc_lppmonplugin.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_version.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 \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/lppmonplugin.prf \
             		/usr/lib64/qt4/mkspecs/features/pythonqt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.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 \
             		rmapplugin.pro
             QMAKE_TARGET  = rmapplugin
             DESTDIR       = bin/
             TARGET        = librmapplugin.so.1.0.0
             TARGETA       = bin/librmapplugin.a
             TARGETD       = librmapplugin.so.1.0.0
             TARGET0       = librmapplugin.so
             TARGET1       = librmapplugin.so.1
             TARGET2       = librmapplugin.so.1.0
             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  bin/$(TARGET)
             bin/$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)
             	@$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/
             	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
             	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
             	-ln -s $(TARGET) $(TARGET0)
             	-ln -s $(TARGET) $(TARGET1)
             	-ln -s $(TARGET) $(TARGET2)
             	-$(DEL_FILE) bin/$(TARGET)
             	-$(DEL_FILE) bin/$(TARGET0)
             	-$(DEL_FILE) bin/$(TARGET1)
             	-$(DEL_FILE) bin/$(TARGET2)
             	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) bin/
             staticlib: $(TARGETA)
             $(TARGETA):  $(OBJECTS) $(OBJCOMP)
             	-$(DEL_FILE) $(TARGETA)
             	$(AR) $(TARGETA) $(OBJECTS)
             Makefile: rmapplugin.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_version.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 \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/lppmonplugin.prf \
             		/usr/lib64/qt4/mkspecs/features/pythonqt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.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 \
+            		/usr/lib64/libQtXml.prl \
+            		/usr/lib64/libQtCore.prl \
             		/usr/lib64/libQtGui.prl \
-            		/usr/lib64/libQtCore.prl \
             		/usr/lib64/libQtNetwork.prl
             	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.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_version.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:
             /usr/lib64/qt4/mkspecs/features/release.prf:
             /usr/lib64/qt4/mkspecs/features/default_post.prf:
             /usr/lib64/qt4/mkspecs/features/lppmonplugin.prf:
             /usr/lib64/qt4/mkspecs/features/pythonqt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
             /usr/lib64/qt4/mkspecs/features/warn_on.prf:
             /usr/lib64/qt4/mkspecs/features/qt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/thread.prf:
             /usr/lib64/qt4/mkspecs/features/moc.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:
+            /usr/lib64/libQtXml.prl:
+            /usr/lib64/libQtCore.prl:
             /usr/lib64/libQtGui.prl:
-            /usr/lib64/libQtCore.prl:
             /usr/lib64/libQtNetwork.prl:
             qmake:  FORCE
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             dist:
             	@$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h bridge.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp bridge.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
             clean:compiler_clean
             	-$(DEL_FILE) $(OBJECTS)
             	-$(DEL_FILE) *~ core *.core
             ####### Sub-libraries
             distclean: clean
             	-$(DEL_FILE) bin/$(TARGET)
             	-$(DEL_FILE) bin/$(TARGET0) bin/$(TARGET1) bin/$(TARGET2) $(TARGETA)
             	-$(DEL_FILE) Makefile
             check: first
             mocclean: compiler_moc_header_clean compiler_moc_source_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-            compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
+            compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
             compiler_moc_header_clean:
-            	-$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
+            	-$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
             moc/moc_rmappluginui.cpp: rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		ccsds.h \
             		gresb.h \
             		rmappluginui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
             moc/moc_rmapplugin.cpp: rmappluginui.h \
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		ccsds.h \
             		gresb.h \
-            		ccsds.h \
             		rmapplugin.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp
             moc/moc_qipdialogbox.cpp: ../common_PLE/qipdialogbox.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/qipdialogbox.h -o moc/moc_qipdialogbox.cpp
             moc/moc_gresbstatusenquiry.cpp: ../common_PLE/gresbstatusenquiry.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/gresbstatusenquiry.h -o moc/moc_gresbstatusenquiry.cpp
             moc/moc_spectralmatricesdmasimulator.cpp: spectralmatricesdmasimulator.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) spectralmatricesdmasimulator.h -o moc/moc_spectralmatricesdmasimulator.cpp
-            moc/moc_rmappluginpythonwrapper.cpp: rmappluginpythonwrapper.h
+            moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \
+            		ccsds.h \
+            		rmappluginpythonwrapper.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp
             moc/moc_stardundee.cpp: rmapoperations.h \
+            		ccsds.h \
             		stardundee.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp
             moc/moc_gresb.cpp: rmapoperations.h \
+            		ccsds.h \
             		gresb.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp
-            moc/moc_bridge.cpp: rmapoperations.h \
+            moc/moc_tcpackettosend.cpp: tcpackettosend.h
-            		bridge.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tcpackettosend.h -o moc/moc_tcpackettosend.cpp
-            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) bridge.h -o moc/moc_bridge.cpp
             moc/moc_genericPySysdriver.cpp: /usr/include/genericPySysdriver.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp
             moc/moc_lppmonplugin.cpp: /usr/include/lppmonplugin.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmonplugin.h -o moc/moc_lppmonplugin.cpp
             compiler_rcc_make_all:
             compiler_rcc_clean:
             compiler_image_collection_make_all: qmake_image_collection.cpp
             compiler_image_collection_clean:
             	-$(DEL_FILE) qmake_image_collection.cpp
             compiler_moc_source_make_all:
             compiler_moc_source_clean:
             compiler_uic_make_all:
             compiler_uic_clean:
             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: compiler_moc_header_clean
             ####### Compile
             obj/rmapplugin.o: rmapplugin.cpp rmapplugin.h \
             		rmappluginui.h \
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		ccsds.h \
             		gresb.h \
-            		ccsds.h \
             		rmappluginpythonwrapper.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapplugin.o rmapplugin.cpp
             obj/rmappluginui.o: rmappluginui.cpp rmapplugin.h \
             		rmappluginui.h \
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
-            		gresb.h \
+            		ccsds.h \
-            		ccsds.h
+            		gresb.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
             obj/rmapoperations.o: rmapoperations.cpp rmapoperations.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapoperations.o rmapoperations.cpp
             obj/ccsds.o: ccsds.cpp ccsds.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ccsds.o ccsds.cpp
             obj/qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qipdialogbox.o ../common_PLE/qipdialogbox.cpp
             obj/gresbstatusenquiry.o: ../common_PLE/gresbstatusenquiry.cpp ../common_PLE/gresbstatusenquiry.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresbstatusenquiry.o ../common_PLE/gresbstatusenquiry.cpp
             obj/spectralmatricesdmasimulator.o: spectralmatricesdmasimulator.cpp spectralmatricesdmasimulator.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/spectralmatricesdmasimulator.o spectralmatricesdmasimulator.cpp
-            obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h
+            obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h \
+            		rmapoperations.h \
+            		ccsds.h \
+            		tcpackettosend.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginpythonwrapper.o rmappluginpythonwrapper.cpp
             obj/stardundee.o: stardundee.cpp stardundee.h \
-            		rmapoperations.h
+            		rmapoperations.h \
+            		ccsds.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/stardundee.o stardundee.cpp
             obj/gresb.o: gresb.cpp gresb.h \
-            		rmapoperations.h
+            		rmapoperations.h \
+            		ccsds.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp
-            obj/bridge.o: bridge.cpp bridge.h \
+            obj/tcpackettosend.o: tcpackettosend.cpp tcpackettosend.h
-            		rmapoperations.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tcpackettosend.o tcpackettosend.cpp
-            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/bridge.o bridge.cpp
             obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp
             obj/moc_rmappluginui.o: moc/moc_rmappluginui.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmappluginui.o moc/moc_rmappluginui.cpp
             obj/moc_rmapplugin.o: moc/moc_rmapplugin.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmapplugin.o moc/moc_rmapplugin.cpp
             obj/moc_qipdialogbox.o: moc/moc_qipdialogbox.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_qipdialogbox.o moc/moc_qipdialogbox.cpp
             obj/moc_gresbstatusenquiry.o: moc/moc_gresbstatusenquiry.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresbstatusenquiry.o moc/moc_gresbstatusenquiry.cpp
             obj/moc_spectralmatricesdmasimulator.o: moc/moc_spectralmatricesdmasimulator.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_spectralmatricesdmasimulator.o moc/moc_spectralmatricesdmasimulator.cpp
             obj/moc_rmappluginpythonwrapper.o: moc/moc_rmappluginpythonwrapper.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmappluginpythonwrapper.o moc/moc_rmappluginpythonwrapper.cpp
             obj/moc_stardundee.o: moc/moc_stardundee.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_stardundee.o moc/moc_stardundee.cpp
             obj/moc_gresb.o: moc/moc_gresb.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresb.o moc/moc_gresb.cpp
-            obj/moc_bridge.o: moc/moc_bridge.cpp
+            obj/moc_tcpackettosend.o: moc/moc_tcpackettosend.cpp
-            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_bridge.o moc/moc_bridge.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tcpackettosend.o moc/moc_tcpackettosend.cpp
             obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp
             obj/moc_lppmonplugin.o: moc/moc_lppmonplugin.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_lppmonplugin.o moc/moc_lppmonplugin.cpp
             ####### Install
             install_target: first FORCE
             	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/ || $(MKDIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
             	-$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
             uninstall_target:  FORCE
             	-$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
             	-$(DEL_DIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
             install:  install_target  FORCE
             uninstall: uninstall_target   FORCE
             FORCE:

rmapplugin/ccsds.h +9 0

             #ifndef CCSDS_H
             #define CCSDS_H
+            #define CCSDS_MAX_PACKET_LENGTH 4412        // in bytes, specified in the LFR Software Requirements Specification
+            struct ccsdsPacketToProcess_str
+            {
+                unsigned int size;
+                unsigned char data[CCSDS_MAX_PACKET_LENGTH];
+            };
+            typedef ccsdsPacketToProcess_str ccsdsPacketToProcess_t;
             struct ccsds_telecommand_source_packet_hdr_str
             {
                 unsigned char packetId1;
                 unsigned char packetId0;
                 unsigned char packetSequenceControl1;
                 unsigned char packetSequenceControl0;
                 unsigned char packetLength1;
                 unsigned char packetLength0;
                 unsigned char dataFieldHeader3;
                 unsigned char dataFieldHeader2;
                 unsigned char dataFieldHeader1;
                 unsigned char dataFieldHeader0;
             };
             typedef ccsds_telecommand_source_packet_hdr_str ccsds_telecommand_source_packet_hdr_t;
             struct ccsdsSourcePacket_pachetHeader_str
             {
                 unsigned char packetId1;
                 unsigned char packetId0;
                 unsigned char packetSequenceControl1;
                 unsigned char packetSequenceControl0;
                 unsigned char packetLength1;
                 unsigned char packetLength0;
             };
             typedef ccsdsSourcePacket_pachetHeader_str ccsdsSourcePacket_pachetHeader_t;
             struct ccsdsTelemetrySourcePacket_dataFieldHeader_str
             {
                 unsigned char spare_PUS_spare;
                 unsigned char serviceType;
                 unsigned char serviceSubtype;
                 unsigned char destinationID;
                 unsigned char SCTime[6];
             };
             typedef ccsdsTelemetrySourcePacket_dataFieldHeader_str ccsdsTelemetrySourcePacket_dataFieldHeader_t;
             class ccsds
             {
             public:
                 ccsds(unsigned char data_field_header, unsigned char processID, unsigned int sequence_count, unsigned int packet_length, unsigned char acceptance, unsigned int completion,
                       unsigned char service_type, unsigned char service_subtype, unsigned char sourceID);
                 ccsds_telecommand_source_packet_hdr_t *ccsds_header;
             };
             #endif // CCSDS_H

rmapplugin/gresb.cpp +54 -22

             #include "gresb.h"
             #include <QTime>
             #include <QHostAddress>
             gresb::gresb(QWidget *parent) :
                 QWidget(parent)
             {
                 RMAPSend_SOCKET = new QTcpSocket;
                 RMAPReceive_SOCKET = new QTcpSocket;
                 GRESBStatusQuery_SOCKET = new QTcpSocket;
                 rmapPacketSEMAPHORE = new QSemaphore;
                 ccsdsPacketSEMAPHORE = new QSemaphore;
                 rmapPacket = (char*) malloc(RMAP_MAX_PACKET_LENGTH);
                 ccsdsPacket = (unsigned char*) malloc(CCSDS_MAX_PACKET_LENGTH);
                 spwPacket = (char*) malloc( qMax(RMAP_MAX_PACKET_LENGTH, CCSDS_MAX_PACKET_LENGTH) );
                 commandCode = invalid0; // initialization of the command code for the RMAP transfers
+                rmapTargetLogicalAddress = DEFAULT_TARGET;
+                rmapSourceLogicalAddress = DEFAULT_SOURCE;
                 //*** QLABEL ***//
                 gresbBridgeIPLabel = new QLabel(tr("GRESB Bridge IP: "));
                 gresbVirtualLinkLabel = new QLabel(tr("GRESB Virtual Link: "));
                 spwLinkLabel = new QLabel(tr("GRESB SPW Link: "));
-                rmapSourceLogicalAddressLabel = new QLabel(tr("RMAP Source Logical Address: "));
                 rmapSendStateLabel = new QLabel(tr("RMAP Send Socket State: waiting for connection"));
                 rmapReceiveStateLabel = new QLabel(tr("RMAP Receive Socket State: waiting for connection"));
                 gresbStatusQueryLabel = new QLabel(tr("GRESB status query socket (port 3010): waiting for connection"));
                 gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running"));
                 //*** SPINBOX ***//
                 gresbVirtualLinkSpinBox = new QSpinBox;
-                rmapSourceLogicalAddressSpinBox = new QSpinBox;
                 spwLinkSpinBox = new QSpinBox;;
                 gresbVirtualLinkSpinBox->setRange(0, 4);
                 gresbVirtualLinkSpinBox->setValue(1);
-                rmapSourceLogicalAddressSpinBox->setRange(0, 255);
-                rmapSourceLogicalAddressSpinBox->setValue(33);
                 spwLinkSpinBox->setRange(0, 2);
                 spwLinkSpinBox->setValue(0);
                 //*** QPUSHBUTTON ***//
                 gresbStatusQueryRetryButton = new QPushButton(tr("Retry"));
                 gresbStatusQueryAbortButton = new QPushButton(tr("Abort"));
                 //*** LAYOUT ***//
                 connectionLayout = new QGridLayout;
                 //*** MISC ***//
                 gresbStatusQueryDialog = new QDialog;
                 gresbBridgeIPDialogBox = new QIPDialogBox;
                 spwLinkStatusEnquiry = new gresbStatusEnquiry;
                 connectionLayout->addWidget(gresbBridgeIPLabel, 0, 0, 0);
                 connectionLayout->addWidget(gresbBridgeIPDialogBox, 0, 1, 0);
                 connectionLayout->addWidget(gresbVirtualLinkLabel, 1, 0, 0);
                 connectionLayout->addWidget(gresbVirtualLinkSpinBox, 1, 1, 0);
                 connectionLayout->addWidget(spwLinkLabel, 2, 0, 0);
                 connectionLayout->addWidget(spwLinkSpinBox, 2, 1, 0);
-                connectionLayout->addWidget(rmapSourceLogicalAddressLabel, 3, 0, 0);
+                connectionLayout->addWidget(rmapSendStateLabel, 3, 0, 1, 2);
-                connectionLayout->addWidget(rmapSourceLogicalAddressSpinBox, 3, 1, 0);
+                connectionLayout->addWidget(rmapReceiveStateLabel, 4, 0, 1, 2);
-                connectionLayout->addWidget(rmapSendStateLabel, 4, 0, 1, 2);
+                connectionLayout->addWidget(gresbStatusQueryLabel, 5, 0, 1, 2);
-                connectionLayout->addWidget(rmapReceiveStateLabel, 5, 0, 1, 2);
-                connectionLayout->addWidget(gresbStatusQueryLabel, 6, 0, 1, 2);
-                connectionLayout->setRowStretch(7, 1);
+                connectionLayout->setRowStretch(6, 1);
                 connectionLayout->setColumnStretch(2, 1);
                 // GRESB STATUS QUERY DIALOG
                 gresbStatusQueryDialogLayout = new QGridLayout;
                 gresbStatusQueryDialogLayout->addWidget(gresbStatusQueryDialogLabel, 0, 0, 1, 2);
                 gresbStatusQueryDialogLayout->addWidget(gresbStatusQueryRetryButton, 1, 0, 0);
                 gresbStatusQueryDialogLayout->addWidget(gresbStatusQueryAbortButton, 1, 1, 0);
                 gresbStatusQueryDialog->setLayout(gresbStatusQueryDialogLayout);
                 this->setLayout(connectionLayout);
                 connect(RMAPSend_SOCKET, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(RMAPSendConnectionState(QAbstractSocket::SocketState)));
                 connect(RMAPReceive_SOCKET, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(RMAPReceiveConnectionState(QAbstractSocket::SocketState)));
                 connect(GRESBStatusQuery_SOCKET, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(GRESBConnectionState(QAbstractSocket::SocketState)));
                 connect(gresbStatusQueryRetryButton, SIGNAL(clicked()), this, SLOT(reTestSPWLink()));
                 connect(gresbStatusQueryAbortButton, SIGNAL(clicked()), gresbStatusQueryDialog, SLOT(reject()));
                 connect(spwLinkStatusEnquiry->readSPWStatusButton, SIGNAL(clicked()), this, SLOT(GRESBStatusQuery()));
-                connect(this->RMAPReceive_SOCKET, SIGNAL(readyRead()), this, SLOT(receiveSPWPacket()));
+                connect(this->RMAPReceive_SOCKET, SIGNAL(readyRead()), this, SLOT(receiveSPWPacketLoop()));
             }
             gresb::~gresb()
             {
                 free(rmapPacket);
                 free(ccsdsPacket);
                 free(spwPacket);
             }
             unsigned int gresb::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int remainingCount = count;
                 unsigned int iOffset = 0;
                 QString console_message;
                 char* data;
                 if(rmapPacketSEMAPHORE->available()!=0)
                 {
                     emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP request already running, WRITE access stopped");
                     return 1;
                 }
                 RMAP_write_reply_setText("reply to the write command required\nlast reply status: unavailable");
                 data = (char*) malloc(READ_WRITE_MAX_COUNTS*4);
                 emit appendToLog(QString("*** START *** WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                     for (int i = 0; i<READ_WRITE_MAX_COUNTS; i++)
                     {
                         data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
                         data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
                         data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
                         data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
                     }
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Write ")+ QString::number(READ_WRITE_MAX_COUNTS*4) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if(WriteBLOCK(data, READ_WRITE_MAX_COUNTS*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
                         return 1;
                     }
                     remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
                     address = address + READ_WRITE_MAX_COUNTS * 4;
                     iOffset = iOffset + READ_WRITE_MAX_COUNTS;
                 }
                 if (remainingCount > 0)
                 {
                     for (unsigned int i = 0; i<remainingCount; i++)
                     {
                         data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
                         data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
                         data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
                         data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
                     }
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Write ")+ QString::number(remainingCount*4) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (WriteBLOCK(data, remainingCount*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
                         return 1;
                     }
                 }
                 emit appendToLog(QString("*** STOP *** WRITE"));
                 free(data);
                 return count;
             }
             unsigned int gresb::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int remainingCount = count;
                 unsigned int iOffset = 0;
                 QString console_message;
                 if(rmapPacketSEMAPHORE->available()!=0)
                 {
                     emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP request already running, READ access stopped");
                     return 1;
                 }
                 emit appendToLog(QString("*** START *** READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Read ")+ QString::number(4*READ_WRITE_MAX_COUNTS) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (ReadBLOCK(READ_WRITE_MAX_COUNTS*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
                         return 1;
                     }
                     for(int i=0;i<READ_WRITE_MAX_COUNTS;i++)
                     {
                         Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
                         for(int j=1;j<4;j++)
                         {
                             Value[i+iOffset]= ((unsigned char)(rmapPacket[i*4+j+RMAP_READ_REPLY_HEADER_LENGTH])) + Value[i+iOffset]*256;
                         }
                     }
                     remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
                     address = address + READ_WRITE_MAX_COUNTS * 4;
                     iOffset = iOffset + READ_WRITE_MAX_COUNTS;
                     rmapPacketSEMAPHORE->acquire();
                 }
                 if (remainingCount > 0)
                 {
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Read ")+ QString::number(4*remainingCount) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (ReadBLOCK(4*remainingCount, address)==0)
                     {
                         emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
                         return 1;
                     }
                     for(unsigned int i=0;i<remainingCount;i++)
                     {
                         Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
                         for(int j=1;j<4;j++)
                         {
                             Value[i+iOffset]= ((unsigned char)(rmapPacket[i*4+j+RMAP_READ_REPLY_HEADER_LENGTH])) + Value[i+iOffset]*256;
                         }
                     }
                     rmapPacketSEMAPHORE->acquire();
                 }
                 emit appendToLog(QString("*** STOP *** READ "));
                 return count;
             }
             unsigned int gresb::WriteBLOCK(char *data, unsigned int nbBytes, unsigned int address)
             {
                 QTime RMAPTimeout;
                 RMAP *RMAPCommand;
                 int errorCode;
                 QString console_message;
                 if (GRESBStatusQueryRequest(LinkStatus, spwLinkSpinBox->value()) == 1)
                 {
                     this->Close();
                     return 1;
                 }
                 RMAPCommand = new RMAP(commandCode,
                                        rmapTargetLogicalAddress,
-                                       rmapSourceLogicalAddressSpinBox->value(),
+                                       rmapSourceLogicalAddress,
                                        address,
                                        nbBytes,
                                        data);
                 // SEND GRESB HEADER
                 RMAPSend_SOCKET->write((char*) ((void*) &RMAPCommand->GRESBHeader), 4);
                 // SEND SPACEWIRE PACKET HEADER
                 RMAPSend_SOCKET->write((char*) ((void*) &RMAPCommand->RMAPHeader), sizeof(RMAPCommand->RMAPHeader));
                 // SEND DATA
                 RMAPSend_SOCKET->write( data, nbBytes);
                 // SEND DATA CRC
                 RMAPSend_SOCKET->write((char*) ((void*) &RMAPCommand->dataCRC), 1);
                 RMAPTimeout.start();
                 while(RMAPSend_SOCKET->bytesToWrite() > 0)
                 {
                     RMAPSend_SOCKET->waitForBytesWritten(100);
                     if(RMAPTimeout.elapsed()>1000)
                     {
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** sending Write RMAP Command timeout");
                         return 0;
                     }
                 }
                 if ( (commandCode == writeSingle_noVer_Rep) | (commandCode == writeInc_noVer_Rep) |
                      (commandCode == writeSingle_ver_rep) | (commandCode == writeInc_ver_rep) )
                 {
                     // WAIT FOR THE RMAP REPLY PACKET
                     errorCode = receiveSPWPacket(1);
                     if (errorCode<=0)
                     {
                         emit appendToLog("WARNING === in function WriteBLOCK of rmapplugin *** RMAP packet reception failed with code " + QString::number(errorCode));
                         return 0;
                     }
                     if(rmapPacketSize != 8)
                      {
                         console_message.sprintf("WARNING === in function WRITE (with reply) of rmapplugin *** write reply format not compliant\n");
                         emit appendToLog(console_message);
                         return 0;
                      }
                     switch (rmapPacket[3]) // byte 4 is the status byte in the reply
                     {
                     case 0:
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 0 Successfull");
                         break;
                     case 1:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** General error code");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 1 General error code");
                         break;
                     case 2:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Unused RMAP packet type or command code");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 2 Unused RMAP packet type or command code");
                         break;
                     case 3:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid key");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 3 Invalid key");
                         break;
                     case 4:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid data CRC");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 4 Invalid data CRC");
                         break;
                     case 5:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Early EOP");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 5 Early EOP");
                         break;
                     case 6:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Too much data");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 6 Too much data");
                         break;
                     case 7:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** EEP");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 7 EEP");
                         break;
                     case 8:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Reserved");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 8 Reserved");
                         break;
                     case 9:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Verify buffer overrun");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 9 Verify buffer overrun");
                         break;
                     case 10:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** RMAP command not implemented or not authorised");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 10 RMAP command not implemented or not authorised");
                         break;
                     case 11:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** RMW data length error");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 11 RMAP RMW data length error");
                         break;
                     case 12:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid target logical address");
                         RMAP_write_reply_setText("reply to the write command required\nlast reply status: 12 Invalid target logical address");
                         break;
                     }
                     acquireRMAPSemaphore();
                 }
                 return nbBytes;
             }
             unsigned int gresb::ReadBLOCK(unsigned int nbBytes, unsigned int address)
             {
                 int errorCode;
                 RMAP *RMAPCommand;
                 QTime RMAPTimeout;
                 unsigned int dataLength;
                 if (GRESBStatusQueryRequest(LinkStatus, spwLinkSpinBox->value()) == 1)
                 {
                     this->Close();
                     return 1;
                 }
                 if (nbBytes > 4)
                 {
                     RMAPCommand = new RMAP(read_Inc,
                                            rmapTargetLogicalAddress,
-                                           rmapSourceLogicalAddressSpinBox->value(),
+                                           rmapSourceLogicalAddress,
                                            address,
                                            nbBytes,
                                            NULL);
                 }
                 else
                 {
                     RMAPCommand = new RMAP(read_Single,
                                            rmapTargetLogicalAddress,
-                                           rmapSourceLogicalAddressSpinBox->value(),
+                                           rmapSourceLogicalAddress,
                                            address,
                                            nbBytes,
                                            NULL);
                 }
                 // SEND THE GRESB HEADER FOR THE RMAP READ COMMAND
                 RMAPSend_SOCKET->write((char*) ((void*) &RMAPCommand->GRESBHeader), 4);
                 // SEND THE SPACEWIRE PACKET FOR THE RMAP READ COMMAND
                 RMAPSend_SOCKET->write((char*) ((void*) &RMAPCommand->RMAPHeader), sizeof(RMAPCommand->RMAPHeader));
                 RMAPSend_SOCKET->waitForBytesWritten(100);
                 RMAPTimeout.start();
                 // write timeout
                 while(RMAPSend_SOCKET->bytesToWrite() > 0)
                 {
                     RMAPSend_SOCKET->waitForBytesWritten(100);
                     if(RMAPTimeout.elapsed()>1000)
                     {
                         emit appendToLog("WARNING === in function READ of rmapplugin *** sending Read RMAP Command timeout\n");
                         return 0;
                     }
                 }
                 // RECEIVE THE INCOMING RMAP PACKET
                 errorCode = receiveSPWPacket(1); // request ID 1 is for RMAP packet
                 if (errorCode<=0)
                 {
                     emit appendToLog("WARNING === in function ReadBLOCK of rmapplugin *** RMAP packet reception failed with code " + QString::number(errorCode));
                     return 0;
                 }
                 dataLength = rmapPacketSize - RMAP_READ_REPLY_HEADER_LENGTH - RMAP_DATA_CRC_LENGTH;
                 if(dataLength != nbBytes)
                  {
                     emit appendToLog("WARNING === in function READ of rmapplugin *** number of data received ("
                                 +QString::number(dataLength)
                                 +") not equal to number of data requested ("
                                 +QString::number(nbBytes)
                                 +")");
                     return 0;
                  }
                 return dataLength;
             }
             unsigned int gresb::WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication)
             {
                 char protocoleIdentifier = 0x02;
                 char reserved = 0x00;
                 char gresbProtocole = 0x00;
                 unsigned char size[3];
                 unsigned int spwPacketSize = count + 4;
                 QTime SPWTimeout;
                 if (count>248)
                 {
                     appendToLog("WARNING === in function WRITE of rmapplugin *** CCSDS packet size > 248 bytes\n");
                     return 1;
                 }
                 appendToLog(QString("*** START *** Send CCSDS packet of ")+ QString::number(count) + QString(" byte(s)"));
                 if (GRESBStatusQueryRequest(LinkStatus, spwLinkSpinBox->value()) == 1)
                 {
                     this->Close();
                     appendToLog("WARNING === in function WRITE of rmapplugin *** SPW link not running\n");
                     return 1;
                 }
                 // SEND GRESB HEADER
                 size[0] = (unsigned char) ((unsigned int) spwPacketSize>>16);
                 size[1] = (unsigned char) ((unsigned int) spwPacketSize>>8);
                 size[2] = (unsigned char) ((unsigned int) spwPacketSize);
                 RMAPSend_SOCKET->write(&gresbProtocole, 1);
                 RMAPSend_SOCKET->write((char*) size, 3);
                 // SEND SPW HEADER
                 RMAPSend_SOCKET->write(&targetLogicalAddress, 1);
                 RMAPSend_SOCKET->write(&protocoleIdentifier, 1);
                 RMAPSend_SOCKET->write(&reserved, 1);
                 RMAPSend_SOCKET->write(&userApplication, 1);
                 // SEND CCSDS PACKET
                 RMAPSend_SOCKET->write(Value, count);
                 SPWTimeout.start();
                 while(RMAPSend_SOCKET->bytesToWrite() > 0)
                 {
                     RMAPSend_SOCKET->waitForBytesWritten(100);
                     if(SPWTimeout.elapsed()>1000)
                     {
                         appendToLog("WARNING === in function WRITE of rmapplugin *** sending CCSDS packet timeout\n");
                         return 1;
                     }
                 }
                 appendToLog(QString("*** CCSDS packet sent"));
                 return count;
             }
+            int gresb::receiveSPWPacketLoop(unsigned char requestID)
+            {
+                int result = 0;
+                while (RMAPReceive_SOCKET->bytesAvailable())
+                {
+                    result = receiveSPWPacket(requestID);
+                }
+                if (!ccsdsPacketStore.isEmpty())
+                {
+                    emit packetStoreNotEmpty();
+                }
+                return result;
+            }
             int gresb::receiveSPWPacket(unsigned char requestID) // SLOT
             {
                 QTime spwPacketReceiverTimeout;
                 // GRESB HEADER
                 char RES_TR_EP; // 6 bits REserved + 1 bit TRuncated + 1 bit EP error end of packet
                 unsigned char packetLength2;
                 unsigned char packetLength1;
                 unsigned char packetLength0;
                 unsigned int packetLength;
                 if (requestID==1)
                 {
                     if (rmapPacketSEMAPHORE->available()) return rmapPacketSize;
                 }
                 RMAPReceive_SOCKET->blockSignals(1); // block the signals of the socket during packet reception
                 // READ THE GRESB HEADER OF THE INCOMING PACKET
                 spwPacketReceiverTimeout.start();
                 while(RMAPReceive_SOCKET->bytesAvailable() < 4)
                 {
                     RMAPReceive_SOCKET->waitForReadyRead(100);
                     if(spwPacketReceiverTimeout.elapsed()>1000) return -1; // ERROR === read GRSEB header TIMEOUT
                 }
                 RMAPReceive_SOCKET->read(&RES_TR_EP, 1);
                 RMAPReceive_SOCKET->read( (char*) &packetLength2, 1);
                 RMAPReceive_SOCKET->read( (char*) &packetLength1, 1);
                 RMAPReceive_SOCKET->read( (char*) &packetLength0, 1);
                 packetLength = (packetLength2<<16) + (packetLength1<<8) + (packetLength0);
                 // READ THE SPW PACKET
                 while(RMAPReceive_SOCKET->bytesAvailable() < packetLength)
                 {
                     RMAPReceive_SOCKET->waitForReadyRead(100);
                     if(spwPacketReceiverTimeout.elapsed()>1000) return -2; // ERROR === read SPW packet TIMEOUT
                 }
                 RMAPReceive_SOCKET->read( spwPacket, packetLength );
                 RMAPReceive_SOCKET->blockSignals(0);
                 //emit sendMessage("Packet of size " + QString::number(packetLength) + " received");
                 switch(spwPacket[1]) // byte 1 is the protocole identifier in the SPW packet
                 {
                 case 1: // 0x01 is the protocole identifier for RMAP packets
                     if (rmapPacketSEMAPHORE->available()!=0) return -3; // ERROR === previous RMAP packet not processed yet
                     for(unsigned int i=0; i<packetLength; i++) rmapPacket[i] = spwPacket[i];
                     rmapPacketSize = packetLength;
                     rmapPacketSEMAPHORE->release();
                     emit sendMessage("RMAP packet of size " + QString::number(packetLength) + " received");
                     return packetLength;
                 case 2: // 0x02 is the protocole identifier for CCSDS packets
-                    if (ccsdsPacketSEMAPHORE->available()!=0) return -4; // ERROR === previous CCSDS packet not processed yet
+                    /*if (ccsdsPacketSEMAPHORE->available()!=0)
+                    {
+                        emit sendMessage("in function [receiveSPWPacket] === ERROR === previous CCSDS packet not processed yet");
+                        return -4; // ERROR === previous CCSDS packet not processed yet
+                    }*/
                     for(unsigned int i=0; i<packetLength; i++) ccsdsPacket[i] = spwPacket[i];
                     ccsdsPacketSize = packetLength;
-                    ccsdsPacketSEMAPHORE->release();
+                    //ccsdsPacketSEMAPHORE->release();
-                    emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
+                    //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
                     //emit sendMessage("CCSDS packet of size " + QString::number(packetLength) + " received");
+                    storeCCSDSPacket(ccsdsPacket, packetLength);
                     return packetLength;
                 }
                 return 0;
             }
+            unsigned int gresb::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
+            {
+                unsigned int i;
+                ccsdsPacketToProcess_t ccsdsPacketToStore;
+                ccsdsPacketToStore.size = size;
+                for(i=0; i<size; i++)
+                {
+                    ccsdsPacketToStore.data[i] = ccsdsPacket[i];
+                }
+                ccsdsPacketStore << ccsdsPacketToStore;
+                //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
+                //emit ccsdsPacketIsAvailable(size);
+                return 1;
+            }
             void gresb::Open() // SLOT
             {
                 bool spwRunning = true;
-                RMAPSend_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getGRESBIP()),
+                RMAPSend_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getIP()),
 + gresbVirtualLinkSpinBox->value()*2,
                                                 QIODevice::WriteOnly);
-                RMAPReceive_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getGRESBIP()),
+                RMAPReceive_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getIP()),
 + gresbVirtualLinkSpinBox->value()*2+1,
                                                    QIODevice::ReadOnly);
-                GRESBStatusQuery_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getGRESBIP()),
+                GRESBStatusQuery_SOCKET->connectToHost( QHostAddress(gresbBridgeIPDialogBox->getIP()),
 ,
                                                         QIODevice::ReadWrite);
                 GRESBStatusQuery_SOCKET->waitForConnected(10000);
-                RMAPReceive_SOCKET->readAll();  // read all remaining data from the reception socket
                 // initialize SPW packet semaphores
                 while (rmapPacketSEMAPHORE->available()!=0) rmapPacketSEMAPHORE->acquire();
                 while (ccsdsPacketSEMAPHORE->available()!=0) ccsdsPacketSEMAPHORE->acquire();
                 if (GRESBStatusQueryRequest(LinkStatus, spwLinkSpinBox->value()) != 0)
                 {
                     spwRunning = gresbStatusQueryDialog->exec();
                 }
                 if (spwRunning == false) this->Close();
                 else
                 {
-                    emit appendToLog(QString("SpaceWire running on virtual link ")+ QString::number(spwLinkSpinBox->value()));
+                    emit appendToLog(QString("SpaceWire running on link ")+ QString::number(spwLinkSpinBox->value()));
+                    RMAPReceive_SOCKET->readAll();  // read all remaining data from the reception socket
                     emit isOpen(true);
                 }
             }
             void gresb::Close() // SLOT
             {
                 RMAPSend_SOCKET->disconnectFromHost();
                 RMAPReceive_SOCKET->disconnectFromHost();
                 GRESBStatusQuery_SOCKET->disconnectFromHost();
                 emit isOpen(false);
             }
             int gresb::GRESBStatusQuery() // SLOT
             {
                 GRESBStatusQueryRequest(LinkStatus, 0);
                 GRESBStatusQueryRequest(LinkStatus, 1);
                 GRESBStatusQueryRequest(LinkStatus, 2);
                 GRESBStatusQueryRequest(LinkStatistics, 0);
                 GRESBStatusQueryRequest(LinkStatistics, 1);
                 GRESBStatusQueryRequest(LinkStatistics, 2);
                 return 0;
             }
             int gresb::GRESBStatusQueryRequest(GresbStatusQueryOption option, char link)
             {
                 gresb_status_query_t statusQueryCommand;
                 gresb_link_status_reply_t linkStatusReply;
                 gresb_link_statistics_reply_t linkStatisticsReply;
                 QTime statusQueryTimeout;
                 QString console_message;
                 statusQueryCommand.protocolIdentifier = (char) 0x02;
                 statusQueryCommand.reserved1 = (char) 0x00;
                 statusQueryCommand.reserved0 = (char) 0x00;
                 statusQueryCommand.option = (char) option;
                 statusQueryCommand.value3 = (char) 0x00;
                 statusQueryCommand.value2 = (char) 0x00;
                 statusQueryCommand.value1 = (char) 0x00;
                 statusQueryCommand.value0 = (char) link;
                 GRESBStatusQuery_SOCKET->write((char*) ((void*) &statusQueryCommand), sizeof(statusQueryCommand));
                 GRESBStatusQuery_SOCKET->flush();
                 GRESBStatusQuery_SOCKET->waitForBytesWritten(1000);
                 statusQueryTimeout.start();
                 while(GRESBStatusQuery_SOCKET->bytesToWrite() > 0)
                 {
                     GRESBStatusQuery_SOCKET->waitForBytesWritten(100);
                     if(statusQueryTimeout.elapsed()>1000)
                     {
                         emit appendToLog("WARNING === in function GRESBStatusQueryRequest of rmapplugin *** sending StatusQueryCommand timeout");
                         return 1;
                     }
                 }
                 switch (option)
                 {
                 case LinkStatus:
                 {
                     statusQueryTimeout.start();
                     while(GRESBStatusQuery_SOCKET->bytesAvailable() < (int) sizeof(linkStatusReply))
                     {
                         GRESBStatusQuery_SOCKET->waitForReadyRead(100);
                         if(statusQueryTimeout.elapsed()>1000)
                         {
                             console_message.sprintf("GRESBStatusQueryRequest / LinkStatus => error timeout bytesAvailable()\n");
                             emit appendToLog(console_message);
                             return 1;
                         }
                     }
                     GRESBStatusQuery_SOCKET->read((char*) ((void*) &linkStatusReply), (int) sizeof(linkStatusReply));
                     console_message.sprintf("%x", linkStatusReply.byte0);
                     spwLinkStatusEnquiry->statusQueryTable->item(0, link)->setText(console_message);
                     console_message.sprintf("%d", linkStatusReply.byte1);
                     spwLinkStatusEnquiry->statusQueryTable->item(1, link)->setText(console_message);
                     if (linkStatusReply.byte0 == 0) return 1;
                     break;
                 }
                 case LinkStatistics:
                 {
                     statusQueryTimeout.start();
                     while(GRESBStatusQuery_SOCKET->bytesAvailable() < (int) sizeof(linkStatisticsReply))
                     {
                         GRESBStatusQuery_SOCKET->waitForReadyRead(100);
                         if(statusQueryTimeout.elapsed()>1000)
                         {
                             console_message.sprintf("GRESBStatusQueryRequest / LinkStatistics => error timeout bytesAvailable()\n");
                             emit appendToLog(console_message);
                             return 1;
                         }
                     }
                     GRESBStatusQuery_SOCKET->read((char*) ((void*) &linkStatisticsReply), sizeof(linkStatisticsReply));
                     /*console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.sizeOfDataTransmitted));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(9, link)->setText(console_message);
                     console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.numberOfPacketsTransmitted));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(8, link)->setText(console_message);
                     console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.numberOfTruncatedPacketsReceived));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(6, link)->setText(console_message);
                     console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.numberOfPacketsWithEEPReceived));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(5, link)->setText(console_message);
                     console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.sizeOfDataReceived));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(4, link)->setText(console_message);
                     console_message.sprintf("%d", charTab_TO_int(linkStatisticsReply.numberOfPacketsReceived));
                     UI->spwLinkStatusEnquiry->statusQueryTable->item(3, link)->setText(console_message);*/
                     break;
                 }
                 case NodeAddressStatistics:
                 {
                     break;
                 }
                 case GetRoute:
                 {
                     break;
                 }
                 }
                 return 0;
             }
             void gresb::reTestSPWLink() // SLOT
             {
                 if (GRESBStatusQueryRequest(LinkStatus, spwLinkSpinBox->value()) == 0)
                 {
                     gresbStatusQueryDialog->accept();
                 }
             }
             void gresb::RMAPSendConnectionState(QAbstractSocket::SocketState socketState) // SLOT
             {
                 rmapSendStateLabel->setText("");
                 QString socketMessage = "RMAP Send Socket State: ";
                 switch(socketState)
                 {
                 case QAbstractSocket::UnconnectedState :
                     socketMessage.append("0 => Unconnected");
                     break;
                 case 1:
                     socketMessage.append("1 => HostLookup");
                     break;
                 case 2:
                     socketMessage.append("2 => Connecting");
                     break;
                 case 3:
                     socketMessage.append("3 => Connected");
                     break;
                 case 4:
                     socketMessage.append("4 => Bound");
                     break;
                 case 5:
                     socketMessage.append("5 => Closing");
                     break;
                 case 6:
                     socketMessage.append("6 => Listening");
                     break;
                 }
                 rmapSendStateLabel->setText(socketMessage);
                 emit appendToLog(socketMessage);
             }
             void gresb::RMAPReceiveConnectionState(QAbstractSocket::SocketState socketState) // SLOT
             {
                 rmapReceiveStateLabel->setText("");
                 QString socketMessage = "RMAP Receive Socket State: ";
                 switch(socketState)
                 {
                 case QAbstractSocket::UnconnectedState :
                     socketMessage.append("0 => Unconnected");
                     break;
                 case 1:
                     socketMessage.append("1 => HostLookup");
                     break;
                 case 2:
                     socketMessage.append("2 => Connecting");
                     break;
                 case 3:
                     socketMessage.append("3 => Connected");
                     break;
                 case 4:
                     socketMessage.append("4 => Bound");
                     break;
                 case 5:
                     socketMessage.append("5 => Closing");
                     break;
                 case 6:
                     socketMessage.append("6 => Listening");
                     break;
                 }
                 rmapReceiveStateLabel->setText(socketMessage);
                 emit appendToLog(socketMessage);
             }
             void gresb::GRESBConnectionState(QAbstractSocket::SocketState socketState) // SLOT
             {
                 gresbStatusQueryLabel->setText("");
                 QString socketMessage = "GRESB status query socket (port 3010): ";
                 switch(socketState)
                 {
                 case QAbstractSocket::UnconnectedState :
                     socketMessage.append("0 => Unconnected");
                     break;
                 case 1:
                     socketMessage.append("1 => HostLookup");
                     break;
                 case 2:
                     socketMessage.append("2 => Connecting");
                     break;
                 case 3:
                     socketMessage.append("3 => Connected");
                     break;
                 case 4:
                     socketMessage.append("4 => Bound");
                     break;
                 case 5:
                     socketMessage.append("5 => Closing");
                     break;
                 case 6:
                     socketMessage.append("6 => Listening");
                     break;
                 }
                 gresbStatusQueryLabel->setText(socketMessage);
             }

rmapplugin/gresb.h +10 -2

             #ifndef GRESB_H
             #define GRESB_H
             #include <QWidget>
             #include <QLabel>
             #include <QPushButton>
             #include <QSpinBox>
             #include <QGridLayout>
             #include <QTcpSocket>
             #include <QDialog>
             #include <QSemaphore>
             #include "gresbstatusenquiry.h"
             #include "rmapoperations.h"
             #include "qipdialogbox.h"
+            #include "ccsds.h"
             class gresb : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit gresb(QWidget *parent = 0);
                 ~gresb();
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
+                unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
+                QList<ccsdsPacketToProcess_t> ccsdsPacketStore;
             signals:
                 void sendMessage(QString message);
                 void isOpen(bool);
                 void RMAP_write_reply_setText(QString);
                 void appendToLog(QString);
                 void ccsdsPacketAvailable(unsigned char*, unsigned int);
+                void packetStoreNotEmpty();
             public slots:
                 void Open();
                 void Close();
+                int receiveSPWPacketLoop(unsigned char requestID=0);
                 int receiveSPWPacket(unsigned char requestID=0);
                 void commandCodeHasChanged(RMAP_command_codes code) {this->commandCode = code;}
                 void targetHasChanged(int target) {rmapTargetLogicalAddress = (unsigned char) target;}
+                void sourceHasChanged(int source) {rmapSourceLogicalAddress = (unsigned char) source;}
                 void ccsdsPacketIsProcessed() {ccsdsPacketSEMAPHORE->tryAcquire();}
                 void reTestSPWLink();
                 //
                 void RMAPSendConnectionState(QAbstractSocket::SocketState socketState);
                 void RMAPReceiveConnectionState(QAbstractSocket::SocketState socketState);
                 void GRESBConnectionState(QAbstractSocket::SocketState socketState);
+                //
+                void setIP(unsigned char address1, unsigned char address2, unsigned char address3, unsigned char address4)
+                    {this->gresbBridgeIPDialogBox->setIP(address1, address2, address3, address4);}
             private slots:
                 int GRESBStatusQuery();
             private:
                 unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0);
                 unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0);
                 void acquireRMAPSemaphore() {rmapPacketSEMAPHORE->tryAcquire();}
                 void acquireCCSDSSemaphore() {ccsdsPacketSEMAPHORE->tryAcquire();}
                 int GRESBStatusQueryRequest(GresbStatusQueryOption option, char link);
                 unsigned char rmapTargetLogicalAddress ;
                 unsigned char rmapSourceLogicalAddress ;
                 RMAP_command_codes commandCode;
                 QPushButton *gresbStatusQueryRetryButton;
                 QPushButton *gresbStatusQueryAbortButton;
                 QLabel *gresbBridgeIPLabel;
                 QLabel *gresbVirtualLinkLabel;
                 QLabel *spwLinkLabel;
-                QLabel *rmapSourceLogicalAddressLabel;
                 QLabel *rmapSendStateLabel;
                 QLabel *rmapReceiveStateLabel;
                 QLabel *gresbStatusQueryLabel;
                 QLabel *gresbStatusQueryDialogLabel;
                 QDialog *gresbStatusQueryDialog;
                 QIPDialogBox* gresbBridgeIPDialogBox;
                 QSpinBox *gresbVirtualLinkSpinBox;
                 QSpinBox *spwLinkSpinBox;
-                QSpinBox *rmapSourceLogicalAddressSpinBox;
                 QGridLayout *connectionLayout;
                 QGridLayout *gresbStatusQueryDialogLayout;
                 QTcpSocket *RMAPSend_SOCKET;
                 QTcpSocket *RMAPReceive_SOCKET;
                 QTcpSocket *GRESBStatusQuery_SOCKET;
                 gresbStatusEnquiry* spwLinkStatusEnquiry;
                 // Packet receiver
                 QSemaphore *rmapPacketSEMAPHORE;
                 QSemaphore *ccsdsPacketSEMAPHORE;
                 char* rmapPacket;      // The buffer to receive RMAP READ packets
                 unsigned char *ccsdsPacket;
                 char *spwPacket;
                 unsigned int rmapPacketSize;
                 unsigned int ccsdsPacketSize;
             };
             #endif // GRESB_H

rmapplugin/rmapoperations.cpp +4 -3

             #include "rmapoperations.h"
-            RMAP::RMAP(RMAP_command_codes commandCode, char targetLogicalAddress, char initiatorLogicalAddress, int startAddress, int nbBytes, char* data)
+            RMAP::RMAP(RMAP_command_codes commandCode, unsigned char targetLogicalAddress, unsigned char initiatorLogicalAddress,
+                       int startAddress, int nbBytes, char* data)
             {
                 char packetType;            // 2 most Significant Bits
                 char command;               // 4 bits
                 char replyAddressLength;    // 2 Least Significant Bits
                 int SPWPacketSize;
                 // GRESB HEADER
                 if (data == NULL){
                     SPWPacketSize = sizeof(RMAPHeader) ;
                     dataCRC = 0x00;
                 }
                 else{
                     SPWPacketSize = sizeof(RMAPHeader) + nbBytes + 1 ; // SPW Packet = Header + Data + dataCRC
                     dataCRC = RMAPCalculateDataCRC(data, nbBytes);
                 }
                 GRESBHeader.GRESBProtocoleID = 0x00; // packets with protocole ID 0 have a SpaceWire packet as payload
                 GRESBHeader.SPWPacketSize2 = (SPWPacketSize>>16);
                 GRESBHeader.SPWPacketSize1 = (SPWPacketSize>>8);
                 GRESBHeader.SPWPacketSize0 = (SPWPacketSize);
                 // SPACEWIRE HEADER
                 packetType = (char) 0b01;               // 0b01 for a command, 0b00 for a reply
                 command = (char) commandCode;
                 replyAddressLength = (char) 0b00;       // RMAP command: number of bytes in the reply address field
                                                         // RMAP reply: copy of the reply address field of the command
                 switch (commandCode){
                 case writeSingle_noVer_noRep:
                 case writeSingle_noVer_Rep:
                 case writeSingle_ver_noRep:
                 case writeSingle_ver_rep:
                     if (nbBytes > 4) command = command + 1; // switch between Single and Incremental Read/Write operations
                     break;
                 default:
                     break;
                 }
                 RMAPHeader.targetLogicalAddress = targetLogicalAddress ;
-                RMAPHeader.protocolIdentifier = 0x01;      // 0x01 is the protocole identifier for RMAP
+                RMAPHeader.protocolIdentifier = 0x01;       // 0x01 is the protocole identifier for RMAP
                 RMAPHeader.instruction = (packetType<<6) + (command<<2) + (replyAddressLength);
-                RMAPHeader.key = 0;                        // used for command authorization
+                RMAPHeader.key = initiatorLogicalAddress;   // used for command authorization
                 RMAPHeader.initiatorLogicalAddress = initiatorLogicalAddress; // 0 is the default address for the GRESB module
                 RMAPHeader.transactionIdentifier1 = 0x00;
                 RMAPHeader.transactionIdentifier0 = 0x01;
                 RMAPHeader.extendedAddress = 0x00;
                 RMAPHeader.address3 = (char) (startAddress>>24);
                 RMAPHeader.address2 = (char) (startAddress>>16);
                 RMAPHeader.address1 = (char) (startAddress>>8);
                 RMAPHeader.address0 = (char) (startAddress);
                 RMAPHeader.dataLength2 = (char) (nbBytes>>16);
                 RMAPHeader.dataLength1 = (char) (nbBytes>>8);
                 RMAPHeader.dataLength0 = (char) (nbBytes);
                 RMAPHeader.headerCRC = RMAPCalculateHeaderCRC();
             }
             unsigned char RMAP::RMAPCalculateCRC(unsigned char INCR, unsigned char INBYTE)
             {
                 return RMAP_CRCTable[INCR ^ INBYTE];
             }
             unsigned char RMAP::RMAPCalculateHeaderCRC()
             {
                 unsigned char INCR = 0;
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.targetLogicalAddress);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.protocolIdentifier);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.instruction);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.key);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.initiatorLogicalAddress);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.transactionIdentifier1);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.transactionIdentifier0);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.extendedAddress);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.address3);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.address2);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.address1);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.address0);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.dataLength2);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.dataLength1);
                 INCR = RMAPCalculateCRC(INCR, RMAPHeader.dataLength0);
                 return(INCR);
             }
             unsigned char RMAP::RMAPCalculateDataCRC(char *data, int nbBytes)
             {
                 unsigned char INCR = 0;
                 for (int k=0; k<nbBytes; k++)
                 {
                     INCR = RMAPCalculateCRC(INCR, data[k]);
                 }
                 return(INCR);
             }

rmapplugin/rmapoperations.h +7 -5

             #ifndef RMAPOPERATIONS_H
             #define RMAPOPERATIONS_H
             #include "qhexspinbox.h"
             #define READ_WRITE_MAX_COUNTS 4096                      // in words
             #define RMAP_MAX_DATA_LENGTH 4*READ_WRITE_MAX_COUNTS    // in bytes, shall be lower than the limit size of SPW packet of the GRESB bridge
             #define RMAP_READ_REPLY_HEADER_LENGTH 12                // in bytes => ECSS
             #define RMAP_READ_COMMAND_HEADER_LENGTH 16              // in bytes => ECSS
             #define RMAP_DATA_CRC_LENGTH 1                          // in bytes => ECSS
             #define RMAP_MAX_PACKET_LENGTH RMAP_READ_REPLY_HEADER_LENGTH + RMAP_MAX_DATA_LENGTH + RMAP_DATA_CRC_LENGTH
-            #define CCSDS_MAX_PACKET_LENGTH 4412                    // in bytes, specified in the LFR Software Requirements Specification
+            #define DEFAULT_SOURCE 0
+            #define DEFAULT_TARGET 254
             static const unsigned char RMAP_CRCTable[] = {
 x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,
 x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,
 x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69,
 x12, 0x83, 0xf1, 0x60, 0x15, 0x84, 0xf6, 0x67,
 x38, 0xa9, 0xdb, 0x4a, 0x3f, 0xae, 0xdc, 0x4d,
 x36, 0xa7, 0xd5, 0x44, 0x31, 0xa0, 0xd2, 0x43,
 x24, 0xb5, 0xc7, 0x56, 0x23, 0xb2, 0xc0, 0x51,
 x2a, 0xbb, 0xc9, 0x58, 0x2d, 0xbc, 0xce, 0x5f,
 x70, 0xe1, 0x93, 0x02, 0x77, 0xe6, 0x94, 0x05,
 x7e, 0xef, 0x9d, 0x0c, 0x79, 0xe8, 0x9a, 0x0b,
 x6c, 0xfd, 0x8f, 0x1e, 0x6b, 0xfa, 0x88, 0x19,
 x62, 0xf3, 0x81, 0x10, 0x65, 0xf4, 0x86, 0x17,
 x48, 0xd9, 0xab, 0x3a, 0x4f, 0xde, 0xac, 0x3d,
 x46, 0xd7, 0xa5, 0x34, 0x41, 0xd0, 0xa2, 0x33,
 x54, 0xc5, 0xb7, 0x26, 0x53, 0xc2, 0xb0, 0x21,
 x5a, 0xcb, 0xb9, 0x28, 0x5d, 0xcc, 0xbe, 0x2f,
 xe0, 0x71, 0x03, 0x92, 0xe7, 0x76, 0x04, 0x95,
 xee, 0x7f, 0x0d, 0x9c, 0xe9, 0x78, 0x0a, 0x9b,
 xfc, 0x6d, 0x1f, 0x8e, 0xfb, 0x6a, 0x18, 0x89,
 xf2, 0x63, 0x11, 0x80, 0xf5, 0x64, 0x16, 0x87,
 xd8, 0x49, 0x3b, 0xaa, 0xdf, 0x4e, 0x3c, 0xad,
 xd6, 0x47, 0x35, 0xa4, 0xd1, 0x40, 0x32, 0xa3,
 xc4, 0x55, 0x27, 0xb6, 0xc3, 0x52, 0x20, 0xb1,
 xca, 0x5b, 0x29, 0xb8, 0xcd, 0x5c, 0x2e, 0xbf,
 x90, 0x01, 0x73, 0xe2, 0x97, 0x06, 0x74, 0xe5,
 x9e, 0x0f, 0x7d, 0xec, 0x99, 0x08, 0x7a, 0xeb,
 x8c, 0x1d, 0x6f, 0xfe, 0x8b, 0x1a, 0x68, 0xf9,
 x82, 0x13, 0x61, 0xf0, 0x85, 0x14, 0x66, 0xf7,
 xa8, 0x39, 0x4b, 0xda, 0xaf, 0x3e, 0x4c, 0xdd,
 xa6, 0x37, 0x45, 0xd4, 0xa1, 0x30, 0x42, 0xd3,
 xb4, 0x25, 0x57, 0xc6, 0xb3, 0x22, 0x50, 0xc1,
 xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf
             };
             enum RMAP_command_codes{
                 invalid0,                   //0000
                 invalid1,                   //0001
                 read_Single,                //0010
                 read_Inc,                   //0011
                 invalid2,                   //0100
                 invalid3,                   //0101
                 invalid4,                   //0110
                 readModWri_Inc,             //0111
                 writeSingle_noVer_noRep,    //1000
                 writeInc_noVer_noRep,       //1001
                 writeSingle_noVer_Rep,      //1010
                 writeInc_noVer_Rep,         //1011
                 writeSingle_ver_noRep,      //1100
                 writeInc_ver_noRep,         //1101
                 writeSingle_ver_rep,        //1110
                 writeInc_ver_rep            //1111
             };
             struct rmap_command_format_str
             {
                 // char tagetSpaceWireAddress[];    // used for path addressing or regional addressing
                 char targetLogicalAddress;
                 char protocolIdentifier;
                 char instruction;
-                char key;                           // used for command authorization => check Gaisler GRSPW for compliance
+                unsigned char key;                  // used for command authorization => check Gaisler GRSPW for compliance
                 //char replyAddress[];              // not needed if logical addressing is used (replyAddressLength = 0b00)
-                char initiatorLogicalAddress;
+                unsigned char initiatorLogicalAddress;
                 char transactionIdentifier1;
                 char transactionIdentifier0;
                 char extendedAddress;
                 char address3;
                 char address2;
                 char address1;
                 char address0;
                 unsigned char dataLength2;
                 unsigned char dataLength1;
                 unsigned char dataLength0;
                 char headerCRC;
             };
             typedef struct rmap_command_format_str rmap_command_format_t;
             struct rmap_write_reply_str
             {
                 unsigned char initiatorLogicalAddress;
                 unsigned char protocolIdentifier;
                 unsigned char instruction;
                 unsigned char status;
                 unsigned char targetLogicalAddress;
                 unsigned char transactionIdentifier1;
                 unsigned char transactionIdentifier2;
                 unsigned char headerCRC;
             };
             typedef struct rmap_write_reply_str rmap_write_reply_t;
             struct rmap_read_reply_PcktHdr_str
             {
                 //char replyAddress[];              // not needed if logical addressing is used
                 char initiatorLogicalAddress;
                 char protocolIdentifier;
                 char instruction;
                 char status;
                 char targetLogicalAddress;
                 char transactionIdentifier1;
                 char transactionIdentifier0;
                 char reserved;
                 unsigned char dataLength2;
                 unsigned char dataLength1;
                 unsigned char dataLength0;
                 char headerCRC;
             };
             typedef struct rmap_read_reply_PcktHdr_str rmap_read_reply_PcktHdr_t;
             struct rmap_gresb_header_str
             {
                 char GRESBProtocoleID;
                 unsigned char SPWPacketSize2;
                 unsigned char SPWPacketSize1;
                 unsigned char SPWPacketSize0;
             };
             typedef struct rmap_gresb_header_str rmap_gresb_header_str;
             class RMAP
             {
             public:
                 RMAP(RMAP_command_codes commandCode,
-                     char targetLogicalAddress,
+                     unsigned char targetLogicalAddress,
-                     char initiatorLogicalAddress,
+                     unsigned char initiatorLogicalAddress,
                      int startAddress,
                      int nbBytes,
                      char *data);
                 unsigned char RMAPCalculateCRC(unsigned char INCR, unsigned char INBYTE); // ECSS-E-ST-50-52C
                 unsigned char RMAPCalculateHeaderCRC();
                 unsigned char RMAPCalculateDataCRC(char *data, int nbBytes);
                 rmap_gresb_header_str GRESBHeader;
                 rmap_command_format_t RMAPHeader;
                 char dataCRC;
             };
             #endif // RMAPOPERATIONS_H

rmapplugin/rmapplugin.cpp +79 -5

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2012, Laboratory of Plasma Physics - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Paul LEROY
             --                     Mail : paul.leroy@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "rmapplugin.h"
             #include <QHostAddress>
             #include <QIODevice>
             #include <QApplication>
             #include <rmappluginpythonwrapper.h>
+            #include <PythonQt.h>
+            #include <QTimer>
             rmapplugin::rmapplugin(QWidget *parent)
               :lppmonplugin(parent,false)
             {
                 this->UI = new rmapPluginUI();
                 this->setWindowTitle(tr("RMAP and SPW Communication"));
                 this->setWidget((QWidget*)this->UI);
                 timeCode = 0;
                 time_COARSE = 0;
                 time_FINE = 0;
                 currentBridge = selectedBridgeIsUnknown;
-                /*Python wrapper*/
+                //**************
+                //Python wrapper
                 this->pyObject = new rmappluginPythonWrapper();
                 connect(this->pyObject,SIGNAL(ReadSig(uint*,uint,uint)),this,SLOT(Read(uint*,uint,uint)));
                 connect(this->pyObject,SIGNAL(WriteSig(uint*,uint,uint)),this,SLOT(Write(uint*,uint,uint)));
-                /*==============*/
+                //**
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( WriteSPWSig(char*,uint,char,char) ),
+                        this, SLOT( WriteSPW(char*,uint,char,char)), Qt::DirectConnection );
+                //**
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( updateTargetAddress(unsigned char) ),
+                        this, SLOT( setValueTargetAddress(unsigned char)) );
+                //**
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( updateSourceAddress(unsigned char) ),
+                        this, SLOT( setValueSourceAddress(unsigned char)) );
+                //**
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sendMessage(QString)),
+                         this, SLOT(displayOnConsole(QString)) );
+                //**************
+                //**************
+                // get a smart pointer to the __main__ module of the Python interpreter
+                PythonQtObjectPtr context = PythonQt::self()->getMainModule();
+                // add a QObject as variable of name "BUTTON_rmapOpenCommunication" to the namespace of the __main__ module
+                context.addObject("BUTTON_rmapOpenCommunication", UI->rmapOpenCommunicationButton);
+                context.addObject("BUTTON_rmapCloseCommunication", UI->rmapCloseCommunicationButton);
+                context.addObject("BUTTON_selectStarDundee", UI->selectStarDundee_BUTTON);
+                context.addObject("BUTTON_selectGRESB", UI->selectGRESB_BUTTON);
+                context.addObject("GRESB_Bridge", UI->gresbBridge);
+                //**************
                 connect(UI->rmapOpenCommunicationButton, SIGNAL(clicked()), this, SLOT(openBridge()));
                 connect(UI->rmapCloseCommunicationButton, SIGNAL(clicked()), this, SLOT(closeBridge()));
                 // CCSDS
                 connect(this->UI->sendCCSDSCommandButton, SIGNAL(clicked()), this, SLOT(sendCCSDS()));
                 connect(this->UI->send_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(send_TC_LFR_UPDATE_TIME()));
                 connect(this->UI->reset_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(reset_TC_LFR_UPDATE_TIME()));
                 // spectralMAtricesDMASimulator
                 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginRead(uint*,uint,uint)), this, SLOT(Read(uint*,uint,uint)));
                 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginWrite(uint*,uint,uint)), this, SLOT(Write(uint*,uint,uint)));
                 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 // GRESB
                 connect(this->UI->gresbBridge, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 connect(this->UI->gresbBridge, SIGNAL(isOpen(bool)), this, SLOT(activatePlugin(bool)));
                 connect(this->UI->gresbBridge, SIGNAL(RMAP_write_reply_setText(QString)), this, SLOT(RMAP_write_reply_setText(QString)));
                 connect(this->UI->gresbBridge, SIGNAL(appendToLog(QString)), this, SLOT(appendToLog(QString)));
                 connect(this->UI->gresbBridge, SIGNAL(ccsdsPacketAvailable(unsigned char*,uint)),
                         this, SLOT(processCCSDSPacket(unsigned char*,uint)));
                 connect(this, SIGNAL(ccsdsPacketIsProcessed()), this->UI->gresbBridge, SLOT(ccsdsPacketIsProcessed()));
+                connect(this->UI->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
+                        this->UI->gresbBridge, SLOT(targetHasChanged(int)));
+                connect(this->UI->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
+                        this->UI->gresbBridge, SLOT(sourceHasChanged(int)));
+                connect(this->UI->gresbBridge, SIGNAL(packetStoreNotEmpty()),
+                        this, SLOT(processPacketStore()));
                 // Star Dundee
                 connect(this->UI->starDundee, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 connect(this->UI->starDundee, SIGNAL(isOpen(bool)), this, SLOT(activatePlugin(bool)));
                 connect(this->UI->starDundee, SIGNAL(RMAP_write_reply_setText(QString)), this, SLOT(RMAP_write_reply_setText(QString)));
                 connect(this->UI->starDundee, SIGNAL(appendToLog(QString)), this, SLOT(appendToLog(QString)));
                 connect(this->UI->starDundee, SIGNAL(ccsdsPacketAvailable(unsigned char*,uint)),
                         this, SLOT(processCCSDSPacket(unsigned char*,uint)));
                 connect(this, SIGNAL(ccsdsPacketIsProcessed()), this->UI->starDundee, SLOT(ccsdsPacketIsProcessed()));
+                connect(this->UI->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
+                        this->UI->starDundee, SLOT(targetHasChanged(int)));
+                connect(this->UI->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
+                        this->UI->starDundee, SLOT(sourceHasChanged(int)));
+                connect(this->UI->starDundee, SIGNAL(packetStoreNotEmpty()),
+                        this, SLOT(processPacketStore()));
                 connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(bridgeHasChanged(selectedBridge)));
             }
             rmapplugin::~rmapplugin()
             {
-                if (!RMAPSend_SOCKET->isOpen()) RMAPSend_SOCKET->disconnectFromHost();
+                switch(currentBridge)
-                if (!RMAPReceive_SOCKET->isOpen()) RMAPReceive_SOCKET->disconnectFromHost();
-                if (!GRESBStatusQuery_SOCKET->isOpen()) GRESBStatusQuery_SOCKET->disconnectFromHost();
+                case selectedBridgeIsGRESB :
+                    if (RMAPSend_SOCKET->isOpen()) RMAPSend_SOCKET->disconnectFromHost();
+                    if (RMAPReceive_SOCKET->isOpen()) RMAPReceive_SOCKET->disconnectFromHost();
+                    if (GRESBStatusQuery_SOCKET->isOpen()) GRESBStatusQuery_SOCKET->disconnectFromHost();
+                    break;
+                case selectedBridgeIsStarDundee :
+                    break;
+                default:
+                    break;
+                }
             }
             unsigned int rmapplugin::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->Write(Value, count, address);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->Write(Value, count, address);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
             unsigned int rmapplugin::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->Read(Value, count, address);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->Read(Value, count, address);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
             ////////
             // SLOTS
             unsigned int rmapplugin::WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication) // SLOT
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->WriteSPW(Value, count, targetLogicalAddress, userApplication);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->WriteSPW(Value, count, targetLogicalAddress, userApplication);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
             void rmapplugin::sendCCSDS() // SLOT
             {
                 unsigned int nbBYTES_application_data = 8;
                 unsigned int count;
                 char *tab;
                 unsigned char packetErrorControl1 = 0xaa;
                 unsigned char packetErrorControl0 = 0xbb;
                 ccsds_command = new ccsds(1, 0, 0, nbBYTES_application_data+12, 0, 0, 0, 0, 0); // +12 => packet header 6 bytes + data field header 4 bytes + packet error control 2 bytes
                 /*      unsigned char data_field_header,
                         unsigned char processID,
                         unsigned int sequence_count,
                         unsigned int packet_length,
                         unsigned char acceptance,
                         unsigned int completion,
                         unsigned char service_type,
                         unsigned char service_subtype,
                         unsigned char sourceID*/
                 count = nbBYTES_application_data+12; // 12 is the size in bytes of the header
                 tab = (char*) malloc(count);
                 tab[0] = ccsds_command->ccsds_header->packetId1;
                 tab[1] = ccsds_command->ccsds_header->packetId0;
                 tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
                 tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
                 tab[4] = ccsds_command->ccsds_header->packetLength1;
                 tab[5] = ccsds_command->ccsds_header->packetLength0;
                 tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
                 tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
                 tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
                 tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
                 tab[10]=0x00;
                 tab[11]=0x00;
                 tab[12]=0x00;
                 tab[13]=0x00;
                 tab[14]=0x00;
                 tab[15]=0x00;
                 tab[nbBYTES_application_data+10] = packetErrorControl1;
                 tab[nbBYTES_application_data+11] = packetErrorControl0;
                 WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
                 free(tab);
             }
             void rmapplugin::openBridge()
             {
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     this->UI->gresbBridge->Open();
                     break;
                 case selectedBridgeIsStarDundee :
                     this->UI->starDundee->Open();
                     break;
                 default:
                     break;
                 }
             }
             void rmapplugin::closeBridge()
             {
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     this->UI->gresbBridge->Close();
                     break;
                 case selectedBridgeIsStarDundee :
                     this->UI->starDundee->Close();
                     break;
                 default:
                     break;
                 }
             }
             void rmapplugin::send_TC_LFR_UPDATE_TIME()
             {
                 unsigned int nbBYTES_application_data = 6; // Time at CUC format is on 48 bits / 6 bytes
                 unsigned int count;
                 char *tab;
                 unsigned char packetErrorControl1 = 0xaa;
                 unsigned char packetErrorControl0 = 0xbb;
                 ccsds_command = new ccsds(1, 11, 0, nbBYTES_application_data, 1, 1, 9, 129, 0);
                 /*      unsigned char data_field_header,
                         unsigned char processID,
                         unsigned int sequence_count,
                         unsigned int packet_length,
                         unsigned char acceptance,
                         unsigned int completion,
                         unsigned char service_type,
                         unsigned char service_subtype,
                         unsigned char sourceID*/
                 count = nbBYTES_application_data+12; // +12 => packet header 6 bytes + data field header 4 bytes + packet error control 2 bytes
                 tab = (char*) malloc(count);
                 tab[0] = ccsds_command->ccsds_header->packetId1;
                 tab[1] = ccsds_command->ccsds_header->packetId0;
                 tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
                 tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
                 tab[4] = ccsds_command->ccsds_header->packetLength1;
                 tab[5] = ccsds_command->ccsds_header->packetLength0;
                 tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
                 tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
                 tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
                 tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
                 tab[10] = (unsigned char) (time_COARSE>>24);
                 tab[11] = (unsigned char) (time_COARSE>>18);
                 tab[12] = (unsigned char) (time_COARSE>>8);
                 tab[13] = (unsigned char) (time_COARSE);
                 tab[14] = (unsigned char) (time_FINE>>8);
                 tab[15] = (unsigned char) (time_FINE);
                 tab[nbBYTES_application_data+10] = packetErrorControl1;
                 tab[nbBYTES_application_data+11] = packetErrorControl0;
                 WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
                 time_COARSE = time_COARSE+1;
                 free(tab);
             }
             void rmapplugin::reset_TC_LFR_UPDATE_TIME()
             {
                 time_COARSE = 0;
                 time_FINE = 0;
             }
             void rmapplugin::RMAP_write_reply_setText(QString text)
             {
                 this->UI->RMAP_write_reply->setText(text);
             }
             void rmapplugin::appendToLog(QString text)
             {
                 APPENDTOLOG(text);
             }
+            void rmapplugin::setValueTargetAddress(unsigned char newAddress)
+            {
+                this->UI->rmapTargetLogicalAddressSpinBox->setValue(newAddress);
+            }
+            void rmapplugin::setValueSourceAddress(unsigned char newAddress)
+            {
+                this->UI->rmapSourceLogicalAddressSpinBox->setValue(newAddress);
+            }
             /////////////////////
             // INTERNAL FUNCTIONS
             void rmapplugin::processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) // SLOT
             {
                 QString message;
                 unsigned int fine_time_value = 0;
                 fine_time_value = ((unsigned int) ccsdsPacket[7]<<24)
                         + ((unsigned int) ccsdsPacket[6]<<16)
                         + ((unsigned int) ccsdsPacket[5]<<8)
                         + ((unsigned int) ccsdsPacket[4]);
                 message.append(QTime::currentTime().toString() +":" + QString::number(QTime::currentTime().msec()) + ": ");
                 message.append("size "
                                + QString::number(size)
                                +" *** header "
                                + QString::number(ccsdsPacket[0], 16)
                                + " "
                                + QString::number(ccsdsPacket[1], 16)
                                + " "
                                + QString::number(ccsdsPacket[2], 16)
                                + " "
                                + QString::number(ccsdsPacket[3], 16)
                                + " *** coarse time "
                                + QString::number(fine_time_value));
                                //+ QString::number(ccsdsPacket[4], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[5], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[6], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[7], 16));
                 displayOnConsole(message);
+                ((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size);
                 emit ccsdsPacketIsProcessed();
             }
+            void rmapplugin::processPacketStore()
+            {
+                switch(currentBridge)
+                {
+                case selectedBridgeIsGRESB :
+                    ((rmappluginPythonWrapper*)this->pyObject)->ccsdsPacketStore = &(this->UI->gresbBridge->ccsdsPacketStore);
+                    break;
+                case selectedBridgeIsStarDundee :
+                    ((rmappluginPythonWrapper*)this->pyObject)->ccsdsPacketStore = &(this->UI->starDundee->ccsdsPacketStore);
+                    break;
+                default:
+                    break;
+                }
+                ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore();
+            }

rmapplugin/rmapplugin.h +3 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef DRIVER1_H
             #define DRIVER1_H
             #include <rmappluginui.h>
             #include <rmapoperations.h>
             #include <QMenuBar>
             #include <QMenu>
             #include <QAction>
             #include <QMainWindow>
             #include <QTcpSocket>
             #include <QTime>
             #include <ccsds.h>
             #include <QSemaphore>
             #include <lppmonplugin.h>
             #define APPENDTOLOG(message) this->UI->appendToLogFile(QTime::currentTime().toString() +":" + QString::number(QTime::currentTime().msec()) + ": " + message)
             #define READ_WRITE_MAX_COUNTS 4096                      // in words
             #define RMAP_MAX_DATA_LENGTH 4*READ_WRITE_MAX_COUNTS    // in bytes, shall be lower than the limit size of SPW packet of the GRESB bridge
             #define RMAP_READ_REPLY_HEADER_LENGTH 12                // in bytes => ECSS
             #define RMAP_READ_COMMAND_HEADER_LENGTH 16              // in bytes => ECSS
             #define RMAP_DATA_CRC_LENGTH 1                          // in bytes => ECSS
             #define CCSDS_MAX_PACKET_LENGTH 4412                    // in bytes, specified in the LFR Software Requirements Specification
             class rmapplugin : public lppmonplugin
             {
                 Q_OBJECT
             public:
                 explicit rmapplugin(QWidget *parent = 0);
                 ~rmapplugin();
             public slots:
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
+                void setValueTargetAddress(unsigned char newAddress);
+                void setValueSourceAddress(unsigned char newAddress);
                 void openBridge();
                 void closeBridge();
                 void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
+                void processPacketStore();
                 //
                 void sendCCSDS();
                 void send_TC_LFR_UPDATE_TIME();
                 void reset_TC_LFR_UPDATE_TIME();
                 void displayOnConsole(QString message) {this->UI->console->append(message);}
                 //
                 void RMAP_write_reply_setText(QString text);
                 void appendToLog(QString text);
                 //
                 void activatePlugin(bool flag) {emit activateSig(flag);}
                 void bridgeHasChanged(selectedBridge bridge) {currentBridge = bridge;}
             signals:
                 void ccsdsPacketIsProcessed();
             private:
                 selectedBridge currentBridge;
                 rmapPluginUI* UI;
                 QTcpSocket* GRESBStatusQuery_SOCKET;
                 QTcpSocket* RMAPSend_SOCKET;
                 QTcpSocket* RMAPReceive_SOCKET;
                 ccsds* ccsds_command;
                 unsigned int rmapPacketSize;
                 unsigned int time_COARSE;
                 unsigned int time_FINE;
                 char timeCode;
             };
             #endif // DRIVER1_H

rmapplugin/rmapplugin.pro +2 -2

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             #include(/etc/lppmon/lppmonplugin.prf)
             CONFIG += lppmonplugin
             TARGET = rmapplugin
             DEFINES += PLUGIN=rmapplugin
             DEFINES += PLUGINHEADER="\"\\\"rmapplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"RMAPPlugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Paul Leroy paul.leroy@lpp.polytechnique.fr"\\\"\"
             DEFINES += driver_Version="\"\\\"1.1.2"\\\"\"
             DEFINES += driver_Description="\"\\\"AHB bus controler, works with Gaisler's AHB plugn' play bus."\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
             QT += network
             LIBS += ../spw_usb_driver_v2.61/lib/x86_64/libSpaceWireUSBAPI.so \
                 ../spw_usb_driver_v2.61/lib/x86_64/libConfigLibraryUSB.so
             INCLUDEPATH += \
                     $${PWD} \
                     ../common_PLE \
                     ../spw_usb_driver_v2.61/inc
             HEADERS += \
                 rmappluginui.h \
                 rmapplugin.h \
                 rmapoperations.h \
                 ccsds.h \
                 ../common_PLE/qipdialogbox.h \
                 ../common_PLE/gresbstatusenquiry.h \
                 spectralmatricesdmasimulator.h \
                 rmappluginpythonwrapper.h \
                 stardundee.h \
                 ../spw_usb_driver_v2.61/inc/spw_usb_api.h \
                 ../spw_usb_driver_v2.61/inc/spw_config_library.h \
                 gresb.h \
-                bridge.h
+                tcpackettosend.h
             SOURCES += \
                 rmapplugin.cpp \
                 rmappluginui.cpp \
                 rmapoperations.cpp \
                 ccsds.cpp \
                 ../common_PLE/qipdialogbox.cpp \
                 ../common_PLE/gresbstatusenquiry.cpp \
                 spectralmatricesdmasimulator.cpp \
                 rmappluginpythonwrapper.cpp \
                 stardundee.cpp \
                 gresb.cpp \
-                bridge.cpp
+                tcpackettosend.cpp

rmapplugin/rmappluginpythonwrapper.cpp +156 -1

@@ -1,19 +1,174
1	#include "rmappluginpythonwrapper.h"	1	#include "rmappluginpythonwrapper.h"
2	#include <math.h>	2	#include <math.h>
		3	#include <QApplication>
3		4
4	rmappluginPythonWrapper::rmappluginPythonWrapper(QObject *parent) :	5	rmappluginPythonWrapper::rmappluginPythonWrapper(QObject *parent) :
5	genericPySysdriver(parent)	6	genericPySysdriver(parent)
6	{	7	{
		8	timer = new QTimer;
		9	timer->setSingleShot(true);
		10	connect(timer, SIGNAL(timeout()), this, SLOT(sendTC()));
		11	connect(this, SIGNAL(activateTCLoopSig()), this, SLOT(sendTCLoop()));
7	}	12	}
8		13
9
10	QList<QVariant> rmappluginPythonWrapper::getData()	14	QList<QVariant> rmappluginPythonWrapper::getData()
11	{	15	{
12	QList<QVariant> data;	16	QList<QVariant> data;
13	for (int i = 0; i<1024; i++)	17	for (int i = 0; i<1024; i++)
14	{	18	{
15	QVariant t(1000cos(0.1i));	19	QVariant t(1000cos(0.1i));
16	data.append(t);	20	data.append(t);
17	}	21	}
18	return data;	22	return data;
19	}	23	}
		24
		25	QList<QVariant> rmappluginPythonWrapper::ReadSPW(unsigned int size)
		26	{
		27	QList<QVariant> result;
		28	ccsdsPacketToProcess_t ccsdsPacket;
		29
		30	if (!ccsdsPacketStore->isEmpty())
		31	{
		32	ccsdsPacket = ccsdsPacketStore->takeFirst();
		33	for(unsigned int i = 0;i<size;i++)
		34	{
		35	result.append((QVariant)ccsdsPacket.data[i]);
		36	}
		37	}
		38	return result;
		39	}
		40
		41	void rmappluginPythonWrapper::WriteSPW(QList<int> dataList)
		42	{
		43	char targetLogicalAddress;
		44	char userApplication;
		45	unsigned int count;
		46	char *Value;
		47
		48	unsigned char data[dataList.count()];
		49
		50	for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
		51	{
		52	data[i] = (unsigned char)dataList.at(i);
		53	}
		54	// read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
		55	targetLogicalAddress = data[0];
		56	userApplication = data[3];
		57
		58	count = dataList.count() - 4; // the CCSDS header (4 bytes) is added by LPPMON
		59	Value = (char*) &data[4];
		60
		61	emit WriteSPWSig(Value, count, targetLogicalAddress, userApplication);
		62	}
		63
		64	void rmappluginPythonWrapper::WriteSPWDelay(QList<int> dataList, unsigned int delay)
		65	{
		66	char targetLogicalAddress;
		67	char userApplication;
		68	unsigned int count;
		69	char *Value;
		70	TCPacketToSend *packet;
		71
		72	unsigned char data[dataList.count()];
		73
		74	for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
		75	{
		76	data[i] = (unsigned char)dataList.at(i);
		77	}
		78	// read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
		79	targetLogicalAddress = data[0];
		80	userApplication = data[3];
		81
		82	count = dataList.count() - 4; // the CCSDS header (4 bytes) is added by LPPMON
		83	Value = (char*) &data[4];
		84
		85	packet = new TCPacketToSend(Value, count, targetLogicalAddress, userApplication, delay);
		86	TCPacketStore.append(packet);
		87
		88	emit(activateTCLoopSig());
		89
		90	}
		91
		92	void rmappluginPythonWrapper::processPacketStoreLater(unsigned int delay)
		93	{
		94	emit sendMessage(
		95	"*** process packet store in " + QString::number(delay) + " ms"
		96	);
		97	QTimer::singleShot(delay, this, SLOT(sendProcessPacketStoreNowSig()));
		98	}
		99
		100	void rmappluginPythonWrapper::sendTCLoop()
		101	{
		102	unsigned int delay;
		103
		104	if (!timer->isActive())
		105	{
		106	if (!TCPacketStore.isEmpty())
		107	{
		108	delay = TCPacketStore.at(0)->delay;
		109	timer->setInterval(delay);
		110	timer->start();
		111	}
		112	}
		113	}
		114
		115	void rmappluginPythonWrapper::sendTC()
		116	{
		117	TCPacketToSend *packet;
		118	unsigned int delay;
		119
		120	packet = TCPacketStore.takeFirst();
		121	// the signal is connected with the option Qt::DirectConnection, thus it is processed immediately
		122	emit(WriteSPWSig(packet->Value, packet->count,packet->targetLogicalAddress, packet->userApplication));
		123	delete(packet);
		124	if (!TCPacketStore.isEmpty())
		125	{
		126	delay = TCPacketStore.at(0)->delay;
		127	timer->setInterval(delay);
		128	timer->start();
		129	}
		130	}
		131
		132	unsigned int rmappluginPythonWrapper::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
		133	{
		134	unsigned int i;
		135	ccsdsPacketToProcess_t ccsdsPacketToStore;
		136
		137	ccsdsPacketToStore.size = size;
		138	for(i=0; i<size; i++)
		139	{
		140	//ccsdsPacket0[i] = ccsdsPacket[i];
		141	ccsdsPacketToStore.data[i] = ccsdsPacket[i];
		142	}
		143	ccsdsPacketStore->append(ccsdsPacketToStore);
		144	emit ccsdsPacketIsAvailable(size);
		145	return 1;
		146	}
		147
		148	void rmappluginPythonWrapper::processPacketStore()
		149	{
		150	while (!ccsdsPacketStore->isEmpty())
		151	{
		152	emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0).size);
		153	ProcessPendingEvents();
		154	}
		155	}
		156
		157	void rmappluginPythonWrapper::setTargetAddressValue(unsigned int address)
		158	{
		159	unsigned char newAddress;
		160	newAddress = (unsigned char) address;
		161	emit updateTargetAddress(newAddress);
		162	}
		163
		164	void rmappluginPythonWrapper::setSourceAddressValue(unsigned int address)
		165	{
		166	unsigned char newAddress;
		167	newAddress = (unsigned char) address;
		168	emit updateSourceAddress(newAddress);
		169	}
		170
		171	void rmappluginPythonWrapper::ProcessPendingEvents()
		172	{
		173	QCoreApplication::processEvents();
		174	}

rmapplugin/rmappluginpythonwrapper.h +33 0

@@ -1,22 +1,55
1	#ifndef RMAPPLUGINPYTHONWRAPPER_H	1	#ifndef RMAPPLUGINPYTHONWRAPPER_H
2	#define RMAPPLUGINPYTHONWRAPPER_H	2	#define RMAPPLUGINPYTHONWRAPPER_H
3		3
4	#include <QObject>	4	#include <QObject>
5	#include <genericPySysdriver.h>	5	#include <genericPySysdriver.h>
6	#include <QList>	6	#include <QList>
7	#include <QVariant>	7	#include <QVariant>
		8	#include "rmapoperations.h"
		9	#include "ccsds.h"
		10	#include <tcpackettosend.h>
		11	#include <QTimer>
8		12
9	class rmappluginPythonWrapper : public genericPySysdriver	13	class rmappluginPythonWrapper : public genericPySysdriver
10	{	14	{
11	Q_OBJECT	15	Q_OBJECT
12	public:	16	public:
13	explicit rmappluginPythonWrapper(QObject *parent = 0);	17	explicit rmappluginPythonWrapper(QObject *parent = 0);
		18
		19	QList<ccsdsPacketToProcess_t> *ccsdsPacketStore;
		20	void processPacketStore();
		21	unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
		22
		23	QList<TCPacketToSend*> TCPacketStore;
		24	QTimer *timer;
14		25
15	signals:	26	signals:
		27	void ccsdsPacketIsAvailable(unsigned int size);
		28	void wakeUpCallingThread();
		29	unsigned int WriteSPWSig(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
		30	void updateTargetAddress(unsigned char newAddress);
		31	void updateSourceAddress(unsigned char newAddress);
		32	void activateTCLoopSig();
		33	void processPacketStoreNowSig();
		34	void sendMessage(QString message);
16		35
17	public slots:	36	public slots:
18	QList<QVariant> getData();	37	QList<QVariant> getData();
		38
		39	QList<QVariant> ReadSPW(unsigned int size);
		40	void WriteSPW(QList<int> dataList);
		41	void WriteSPWDelay(QList<int> dataList, unsigned int delay=0);
		42	void processPacketStoreLater(unsigned int delay);
		43	void sendProcessPacketStoreNowSig(){emit processPacketStoreNowSig();}
		44	void sendTCLoop();
		45	void sendTC();
		46	void reEmitWriteSPWSig(char *Value, unsigned int count, char targetLogicalAddress, char userApplication)
		47	{emit WriteSPWSig(Value, count, targetLogicalAddress, userApplication);}
		48
		49	void setTargetAddressValue(unsigned int address);
		50	void setSourceAddressValue(unsigned int address);
		51	void ProcessPendingEvents();
19		52
20	};	53	};
21		54
22	#endif // RMAPPLUGINPYTHONWRAPPER_H	55	#endif // RMAPPLUGINPYTHONWRAPPER_H

rmapplugin/rmappluginui.cpp +17 -12

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "rmapplugin.h"
             rmapPluginUI::rmapPluginUI(QWidget *parent) :
                 QWidget(parent)
             {
                 spectralMatricesDMASimulator = new SpectralMatricesDMASimulator;
                 spwTabWidget = new QTabWidget;
                 QWidget* spwTabWidgetPage0 = new QWidget;
                 QWidget* spwTabWidgetPage1 = new QWidget;
                 QWidget* spwTabWidgetPage2 = new QWidget;
                 QWidget* spwTabWidgetPage3 = new QWidget;
                 QWidget* spwTabWidgetPage4 = new QWidget;
                 bridgeWidget = new QWidget;
                 mainLayout = new QVBoxLayout;
                 connectionLayout = new QGridLayout;
                 ccsdsLayout = new QVBoxLayout;
                 consoleLayout = new QVBoxLayout;
                 selectionLayout = new QVBoxLayout;
                 bridgeSelection_LAYOUT = new QGridLayout;
                 generalParameters_LAYOUT = new QGridLayout;
                 gresb_GROUPBOX = new QGroupBox(tr("GRESB bridge parameters"));
                 stardundee_GROUPBOX = new QGroupBox(tr("Star Dundee brick parameters"));
                 selection_GROUPBOX = new QGroupBox(tr("Bridge selection"));
                 generalParameters_GROUPBOX = new QGroupBox(tr("General parameters"));
                 //*** QLABEL ***//
                 gresbBridgeIPLabel = new QLabel(tr("Bridge IP: "));
                 gresbVirtualLinkLabel = new QLabel(tr("Virtual Link: "));
                 spwLinkLabel = new QLabel(tr("SPW Link: "));
                 rmapSourceLogicalAddressLabel = new QLabel(tr("RMAP Source Logical Address: "));
                 rmapTargetLogicalAddressLabel = new QLabel(tr("RMAP Target Logical Address: "));
                 logFileName = new QLabel;
                 gresbStatusQueryLabel = new QLabel(tr("Status query socket (port 3010): waiting for connection"));
                 gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running"));
                 sendCCSDSCommandLabel = new QLabel(tr("Address of the target"));
                 //*** QPUSHBUTTON ***//
                 rmapOpenCommunicationButton = new QPushButton(tr("Open selected bridge"));
                 rmapCloseCommunicationButton = new QPushButton(tr("Close selected bridge"));
                 rmapOpenCommunicationButton->setEnabled(false);
                 rmapCloseCommunicationButton->setEnabled(false);
                 logFileChooseButton = new QPushButton(tr("Choose file"));
                 gresbStatusQueryRetryButton = new QPushButton(tr("Retry"));
                 gresbStatusQueryAbortButton = new QPushButton(tr("Abort"));
                 sendCCSDSCommandButton = new QPushButton(tr("Send CCSDS Command"));
                 send_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("Send TC_LFR_UPDATE_TIME Packet"));
                 reset_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("reset the TC_LFR_UPDATE_TIME Packet coarse and fine times"));
                 clearConsoleButton = new QPushButton(tr("Clear"));
                 selectGRESB_BUTTON = new QRadioButton(tr("GRESB"));
                 selectStarDundee_BUTTON = new QRadioButton(tr("Star Dundee"));
                 //*** SPINBOX ***//
                 gresbVirtualLinkSpinBox = new QSpinBox;
                 rmapSourceLogicalAddressSpinBox = new QSpinBox;
                 rmapTargetLogicalAddressSpinBox = new QSpinBox;
                 spwLinkSpinBox = new QSpinBox;;
                 CCSDSTargetLogicalAddressSpinBox = new QSpinBox;
                 gresbVirtualLinkSpinBox->setRange(0, 4);
                 gresbVirtualLinkSpinBox->setValue(1);
                 rmapSourceLogicalAddressSpinBox->setRange(0, 255);
-                rmapSourceLogicalAddressSpinBox->setValue(33);
+                rmapSourceLogicalAddressSpinBox->setValue(0);
                 rmapTargetLogicalAddressSpinBox->setRange(0, 255);
                 spwLinkSpinBox->setRange(0, 2);
                 spwLinkSpinBox->setValue(0);
                 CCSDSTargetLogicalAddressSpinBox->setRange(0,255);
-                CCSDSTargetLogicalAddressSpinBox->setValue(254);
+                CCSDSTargetLogicalAddressSpinBox->setValue(0);
                 //*** MISC **//
                 starDundee = new StarDundee;
                 gresbBridge = new gresb;
                 console = new QTextEdit;
-                gresbBridgeIPDialogBox = new QIPDialogBox;
+                //gresbBridgeIPDialogBox = new QIPDialogBox;
                 gresbStatusQueryDialog = new QDialog;
                 logEnableCheckBox = new QCheckBox(tr("Enable Logs"));
                 RMAP_write_verify = new QCheckBox(tr("data checked before write\nlimited to 4 bytes\nNOT IMPLEMENTED"));
                 RMAP_write_reply = new QCheckBox(tr("reply to the write command required\nlast reply status: unavailable"));
                 spwLinkStatusEnquiry = new gresbStatusEnquiry;
                 logFile = new QFile();
                 logFileEn = false;
                 connectionLayout->setRowStretch(7, 1);
                 connectionLayout->setColumnStretch(2, 1);
                 bridgeSelection_LAYOUT->addWidget(selectGRESB_BUTTON, 0, 0, 1, 1);
                 bridgeSelection_LAYOUT->addWidget(selectStarDundee_BUTTON, 0, 1, 1, 1);
                 bridgeSelection_LAYOUT->setRowStretch(1, 1);
                 bridgeSelection_LAYOUT->setColumnStretch(2, 1);
                 generalParameters_LAYOUT->addWidget(logEnableCheckBox, 0, 0, 1, 1);
                 generalParameters_LAYOUT->addWidget(logFileChooseButton, 0, 1, 1, 1);
-                generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressLabel, 1, 0, 0);
+                generalParameters_LAYOUT->addWidget(rmapSourceLogicalAddressLabel, 1, 0, 0);
-                generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressSpinBox, 1, 1, 0);
+                generalParameters_LAYOUT->addWidget(rmapSourceLogicalAddressSpinBox, 1, 1, 0);
-                generalParameters_LAYOUT->addWidget(rmapOpenCommunicationButton, 2, 0, 1, 1);
+                generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressLabel, 2, 0, 0);
-                generalParameters_LAYOUT->addWidget(rmapCloseCommunicationButton, 2, 1, 1, 1);
+                generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressSpinBox, 2, 1, 0);
-                generalParameters_LAYOUT->addWidget(RMAP_write_verify, 3, 0, 1, 2);
+                generalParameters_LAYOUT->addWidget(rmapOpenCommunicationButton, 3, 0, 1, 1);
-                generalParameters_LAYOUT->addWidget(RMAP_write_reply, 4, 0, 1, 2);
+                generalParameters_LAYOUT->addWidget(rmapCloseCommunicationButton, 3, 1, 1, 1);
-                generalParameters_LAYOUT->setRowStretch(5, 1);
+                generalParameters_LAYOUT->addWidget(RMAP_write_verify, 4, 0, 1, 2);
+                generalParameters_LAYOUT->addWidget(RMAP_write_reply, 5, 0, 1, 2);
+                generalParameters_LAYOUT->setRowStretch(6, 1);
                 generalParameters_LAYOUT->setColumnStretch(2, 1);
                 gresb_GROUPBOX->setLayout(gresbBridge->layout());
                 gresb_GROUPBOX->setVisible(false);
                 stardundee_GROUPBOX->setLayout(starDundee->layout());
                 stardundee_GROUPBOX->setVisible(false);
                 selection_GROUPBOX->setLayout(bridgeSelection_LAYOUT);
                 generalParameters_GROUPBOX->setLayout(generalParameters_LAYOUT);
                 selectionLayout->addWidget(selection_GROUPBOX);
                 selectionLayout->addWidget(generalParameters_GROUPBOX);
                 selectionLayout->addWidget(gresb_GROUPBOX);
                 selectionLayout->addWidget(stardundee_GROUPBOX);
                 ccsdsLayout->addWidget(sendCCSDSCommandButton);
                 ccsdsLayout->addWidget(send_TC_LFR_UPDATE_TIME_Button);
                 ccsdsLayout->addWidget(reset_TC_LFR_UPDATE_TIME_Button);
                 ccsdsLayout->addWidget(sendCCSDSCommandLabel);
                 ccsdsLayout->addWidget(CCSDSTargetLogicalAddressSpinBox);
                 consoleLayout->addWidget(console);
                 consoleLayout->addWidget(clearConsoleButton);
                 connect(this->logFileChooseButton, SIGNAL(clicked()), this, SLOT(chooseLogFile()));
                 connect(this, SIGNAL(setLogFileName(QString)), this->logFileName, SLOT(setText(QString)));
                 connect(this->logEnableCheckBox, SIGNAL(stateChanged(int)), this, SLOT(logFileEnDisable(int)));
                 spwTabWidget->addTab(spwTabWidgetPage0, tr("connection"));
                 spwTabWidget->addTab(spwTabWidgetPage1, tr("ccsds"));
                 spwTabWidget->addTab(spwTabWidgetPage2, tr("status"));
                 spwTabWidget->addTab(spwTabWidgetPage3, tr("console"));
                 spwTabWidget->addTab(spwTabWidgetPage4, tr("DMA"));
                 spwTabWidgetPage0->setLayout(selectionLayout);
                 spwTabWidgetPage1->setLayout(ccsdsLayout);
                 spwTabWidgetPage2->setLayout(this->spwLinkStatusEnquiry->mainLayout);
                 spwTabWidgetPage3->setLayout(consoleLayout);
                 spwTabWidgetPage4->setLayout(spectralMatricesDMASimulator->mainLayout);
                 mainLayout->addWidget(spwTabWidget);
                 setLayout(mainLayout);
                 connect(this->clearConsoleButton, SIGNAL(clicked()), this->console, SLOT(clear()));
                 // briges
                 connect(this->selectGRESB_BUTTON, SIGNAL(clicked()), this, SLOT(selectionBetweenGresbAndStarDundee()));
                 connect(this->selectStarDundee_BUTTON, SIGNAL(clicked()), this, SLOT(selectionBetweenGresbAndStarDundee()));
                 connect(this->starDundee, SIGNAL(isOpen(bool)), this, SLOT(isOpen(bool)));
                 connect(this->gresbBridge, SIGNAL(isOpen(bool)), this, SLOT(isOpen(bool)));
+                connect(this->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->gresbBridge, SLOT(sourceHasChanged(int)));
+                connect(this->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->gresbBridge, SLOT(targetHasChanged(int)));
+                connect(this->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->starDundee, SLOT(sourceHasChanged(int)));
                 connect(this->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->starDundee, SLOT(targetHasChanged(int)));
-                connect(this->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->gresbBridge, SLOT(targetHasChanged(int)));
                 // command code
                 connect(this->RMAP_write_reply, SIGNAL(clicked()), this, SLOT(getCommandCode()));
                 connect(this->RMAP_write_verify, SIGNAL(clicked()), this, SLOT(getCommandCode()));
                 connect(this, SIGNAL(commandCodeHasChanged(RMAP_command_codes)),
                         this->starDundee, SLOT(commandCodeHasChanged(RMAP_command_codes)));
                 connect(this, SIGNAL(commandCodeHasChanged(RMAP_command_codes)),
                         this->gresbBridge, SLOT(commandCodeHasChanged(RMAP_command_codes)));
                 getCommandCode(); // init the command code value
-                rmapTargetLogicalAddressSpinBox->setValue(254);
+                rmapSourceLogicalAddressSpinBox->setValue(DEFAULT_SOURCE);
+                rmapTargetLogicalAddressSpinBox->setValue(DEFAULT_TARGET);
             }
             rmapPluginUI::~rmapPluginUI()
             {
                 //delete ui;
             }
             void rmapPluginUI::chooseLogFile()
             {
                 if(this->logFile->isOpen())
                     this->logFile->close();
                 this->logFile->setFileName(QFileDialog::getSaveFileName(this,tr("Open Log file"),
                                                                         QDir::homePath()
                                                                         + "/"
                                                                         + QDate::currentDate().toString()
                                                                         + "_"
                                                                         + QTime::currentTime().toString()
                                                                         + "_rmapPluginUI.log",
                                                                         tr("Log Files (*.txt *.log)")));
                 if(this->logFile->open(QIODevice::WriteOnly))
                 {
                     this->logFileStrm = new QTextStream(this->logFile);
                     emit this->setLogFileName(this->logFile->fileName());
                 }
             }
             void rmapPluginUI::logFileEnDisable(int state)
             {
                 if(state==Qt::Checked)
                 {
                     this->logFileEn = true;
                 }
                 else if(state==Qt::Unchecked)
                 {
                     this->logFileEn = false;
                 }
             }
             bool rmapPluginUI::islogfileenable()
             {
                 return this->logFileEn;
             }
             void rmapPluginUI::appendToLogFile(const QString & text)
             {
                 if(this->logFileEn && this->logFile->isOpen())
                 {
                     *(this->logFileStrm) << text << endl;
                 }
             }
             void rmapPluginUI::closeEvent(QCloseEvent *event)
             {
                 if(this->logFile->isOpen())
                 {
                     this->logFileStrm->flush();
                     this->logFile->waitForBytesWritten(3000);
                     this->logFile->close();
                 }
                 event->accept();
             }
             RMAP_command_codes rmapPluginUI::getCommandCode()
             {
                 RMAP_command_codes commandCode = invalid0;
                 if (RMAP_write_verify->isChecked() and RMAP_write_reply->isChecked()) commandCode = writeSingle_ver_rep;
                 if (RMAP_write_verify->isChecked() and !RMAP_write_reply->isChecked()) commandCode = writeSingle_ver_noRep;
                 if (!RMAP_write_verify->isChecked() and RMAP_write_reply->isChecked()) commandCode = writeSingle_noVer_Rep;
                 if (!RMAP_write_verify->isChecked() and !RMAP_write_reply->isChecked()) commandCode = writeSingle_noVer_noRep;
                 emit commandCodeHasChanged(commandCode);
                 return commandCode;
             }
             // SLOT
             void rmapPluginUI::selectionBetweenGresbAndStarDundee() //SLOT
             {
                 if (selectGRESB_BUTTON->isChecked())
                 {
                     gresb_GROUPBOX->setVisible(true);
                     stardundee_GROUPBOX->setVisible(false);
                     rmapOpenCommunicationButton->setEnabled(true);
                     emit bridgeHasChanged(selectedBridgeIsGRESB);
                 }
                 if (selectStarDundee_BUTTON->isChecked())
                 {
                     stardundee_GROUPBOX->setVisible(true);
                     gresb_GROUPBOX->setVisible(false);
                     rmapOpenCommunicationButton->setEnabled(true);
                     emit bridgeHasChanged(selectedBridgeIsStarDundee);
                 }
             }
             void rmapPluginUI::isOpen(bool flag)
             {
                 if (flag == true)
                 {
                     selection_GROUPBOX->setEnabled(false);
                     this->rmapOpenCommunicationButton->setEnabled(false);
                     this->rmapCloseCommunicationButton->setEnabled(true);
                 }
                 if (flag == false)
                 {
                     selection_GROUPBOX->setEnabled(true);
                     this->rmapOpenCommunicationButton->setEnabled(true);
                     this->rmapCloseCommunicationButton->setEnabled(false);
                 }
             }

rmapplugin/rmappluginui.h +3 -2

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 20011, Laboratory of Plasma Physics - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Paul Leroy
             --                     Mail : paul.leroy@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef RMAPPLUGINUI_H
             #define RMAPPLUGINUI_H
             #include <QWidget>
             #include <QPushButton>
             #include <QLabel>
             #include <QSlider>
             #include <QSpinBox>
             #include <QGridLayout>
             #include <QCheckBox>
             #include <QFile>
             #include <QTextStream>
             #include <QFileDialog>
             #include <QDir>
             #include <QDialog>
             #include <QCloseEvent>
             #include <QTabWidget>
             #include "qipdialogbox.h"
             #include <rmapoperations.h>
             #include <gresbstatusenquiry.h>
             #include <QTextEdit>
             #include "spectralmatricesdmasimulator.h"
             #include <stardundee.h>
             #include <gresb.h>
             #include <QRadioButton>
             #include <QGroupBox>
             enum selectedBridge{
                 selectedBridgeIsUnknown,
                 selectedBridgeIsGRESB,
                 selectedBridgeIsStarDundee
             };
             class rmapPluginUI : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit rmapPluginUI(QWidget *parent = 0);
                 ~rmapPluginUI();
                 QPushButton* rmapOpenCommunicationButton;
                 QPushButton* rmapCloseCommunicationButton;
                 QPushButton* logFileChooseButton;
                 QPushButton* gresbStatusQueryRetryButton;
                 QPushButton* gresbStatusQueryAbortButton;
                 QPushButton* sendCCSDSCommandButton;
                 QPushButton* send_TC_LFR_UPDATE_TIME_Button;
                 QPushButton* reset_TC_LFR_UPDATE_TIME_Button;
                 QPushButton* clearConsoleButton;
                 QRadioButton* selectGRESB_BUTTON;
                 QRadioButton* selectStarDundee_BUTTON;
                 QGroupBox *selection_GROUPBOX;
                 QSpinBox* gresbVirtualLinkSpinBox;
                 QSpinBox* spwLinkSpinBox;
                 QSpinBox* rmapSourceLogicalAddressSpinBox;
                 QSpinBox* rmapTargetLogicalAddressSpinBox;
                 QSpinBox* CCSDSTargetLogicalAddressSpinBox;
-                QIPDialogBox* gresbBridgeIPDialogBox;
+                //QIPDialogBox* gresbBridgeIPDialogBox;
                 QCheckBox *logEnableCheckBox;
                 QCheckBox *RMAP_write_verify;
                 QCheckBox *RMAP_write_reply;
                 QLabel* rmapSendStateLabel;
                 QLabel* rmapReceiveStateLabel;
                 QLabel* gresbStatusQueryLabel;
                 QLabel* gresbStatusQueryDialogLabel;
                 QLabel* sendCCSDSCommandLabel;
                 QDialog* gresbStatusQueryDialog;
                 gresbStatusEnquiry* spwLinkStatusEnquiry;
                 SpectralMatricesDMASimulator *spectralMatricesDMASimulator;
                 QTextEdit* console;
+                // SPACEWIRE BRIDGES
                 StarDundee *starDundee;
                 gresb *gresbBridge;
                 bool islogfileenable();
                 void appendToLogFile(const QString & text);
                 void closeEvent(QCloseEvent *event);
             public slots:
                 void chooseLogFile();
                 void logFileEnDisable(int state);
                 RMAP_command_codes getCommandCode();
             private slots:
                 void selectionBetweenGresbAndStarDundee();
                 void isOpen(bool flag);
             signals:
                 void connectPortsig(QString PortName,int baudrate);
                 void setLogFileName(QString FileName);
                 void commandCodeHasChanged(RMAP_command_codes commandCode);
                 void bridgeHasChanged(selectedBridge bridge);
                 void targetHasChanged(unsigned char target);
+                void sourceHasChanged(unsigned char source);
             private:
                 QLabel *gresbBridgeIPLabel;
                 QLabel *gresbVirtualLinkLabel;
                 QLabel *spwLinkLabel;
                 QLabel *rmapSourceLogicalAddressLabel;
                 QLabel *rmapTargetLogicalAddressLabel;
                 QLabel *logFileName;
                 QGridLayout *bridgeSelection_LAYOUT;
                 QVBoxLayout *selectionLayout;
                 QVBoxLayout *mainLayout;
                 QGridLayout *connectionLayout;
                 QVBoxLayout *ccsdsLayout;
                 QVBoxLayout *consoleLayout;
                 QGridLayout *gresbStatusQueryDialogLayout;
                 QGridLayout *generalParameters_LAYOUT;
                 QTabWidget *spwTabWidget;
                 QWidget* bridgeWidget;
                 QGroupBox *gresb_GROUPBOX;
                 QGroupBox *stardundee_GROUPBOX;
                 QGroupBox *generalParameters_GROUPBOX;
                 QFile *logFile;
                 QTextStream *logFileStrm;
                 bool logFileEn;
             };
             #endif // RMAPPLUGINUI_H

rmapplugin/stardundee.cpp +193 -72

             #include "stardundee.h"
             #include <QTime>
             #include <math.h>
+            #include "ccsds.h"
             StarDundee::StarDundee(QWidget *parent) :
                 QWidget(parent)
             {
                 // Packet receiver
                 timer = new QTimer;
                 rmapPacketSEMAPHORE = new QSemaphore;
                 ccsdsPacketSEMAPHORE = new QSemaphore;
                 rmapPacket = (char*) malloc(RMAP_MAX_PACKET_LENGTH);
                 ccsdsPacket = (unsigned char*) malloc(CCSDS_MAX_PACKET_LENGTH);
                 spwPacket = (char*) malloc( qMax(RMAP_MAX_PACKET_LENGTH, CCSDS_MAX_PACKET_LENGTH) );
                 starDundeeStatusQueryDialog = new QDialog;
                 commandCode = invalid0; // initialization of the cmmand code for the RMAP transfers
+                rmapTargetLogicalAddress = DEFAULT_TARGET;
+                rmapSourceLogicalAddress = DEFAULT_SOURCE;
-                rmapSourceLogicalAddress = 0x20;
                 connection_LAYOUT = new QGridLayout;
                 usbDeviceNumber_LABEL = new QLabel(tr("USB device number: "));
                 linkNumber_LABEL = new QLabel(tr("SpaceWire link number: "));
-                sourceLogicalAddress_LABEL = new QLabel(tr("Source logical address: "));
                 starDundeeStatusQueryDialogLabel = new QLabel(tr("SpaceWire link not running"));
                 //*** QPUSHBUTTON ***//
                 starDundeeStatusQueryRetryButton = new QPushButton(tr("Retry"));
                 starDundeeStatusQueryAbortButton = new QPushButton(tr("Abort"));
                 usbDeviceNumber_SPINBOX = new QSpinBox;
                 usbDeviceNumber_SPINBOX->setRange(0,32);
                 usbDeviceNumber_SPINBOX->setValue(0);
                 linkNumber_SPINBOX = new QSpinBox;
                 linkNumber_SPINBOX->setRange(1,2);
                 linkNumber_SPINBOX->setValue(1);
-                sourceLogicalAddress_SPINBOX = new QSpinBox;
-                sourceLogicalAddress_SPINBOX->setRange(0,254);
-                sourceLogicalAddress_SPINBOX->setValue(32);
                 // STAR DUNDEE STATUS QUERY DIALOG
                 starDundeeStatusQueryDialogLayout = new QGridLayout;
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryDialogLabel, 0, 0, 1, 2);
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryRetryButton, 1, 0, 0);
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryAbortButton, 1, 1, 0);
                 starDundeeStatusQueryDialog->setLayout(starDundeeStatusQueryDialogLayout);
                 connection_LAYOUT->addWidget(usbDeviceNumber_LABEL, 0, 0, 1, 1);
                 connection_LAYOUT->addWidget(usbDeviceNumber_SPINBOX, 0, 1, 1, 1);
                 connection_LAYOUT->addWidget(linkNumber_LABEL, 1, 0, 1, 1);
                 connection_LAYOUT->addWidget(linkNumber_SPINBOX, 1, 1, 1, 1);
-                connection_LAYOUT->addWidget(sourceLogicalAddress_LABEL, 2, 0, 1, 1);
-                connection_LAYOUT->addWidget(sourceLogicalAddress_SPINBOX, 2, 1, 1, 1);
-                connection_LAYOUT->setRowStretch(3, 1);
+                connection_LAYOUT->setRowStretch(2, 1);
                 connection_LAYOUT->setColumnStretch(2, 1);
                 this->setLayout(connection_LAYOUT);
-                connect(this->sourceLogicalAddress_SPINBOX, SIGNAL(valueChanged(int)), this, SLOT(sourceHasChanged(int)));
                 connect(starDundeeStatusQueryRetryButton, SIGNAL(clicked()), this, SLOT(reTestSPWLink()));
                 connect(starDundeeStatusQueryAbortButton, SIGNAL(clicked()), starDundeeStatusQueryDialog, SLOT(reject()));
                 connect(this->timer, SIGNAL(timeout()), this, SLOT(receivePollingLoop()));
-                timer->start(100); // starts the periodical timer, perdio = 100ms
+                timer->start(100); // starts the periodical timer, period = 100ms
             }
             StarDundee::~StarDundee()
             {
                 free(rmapPacket);
                 free(ccsdsPacket);
                 free(spwPacket);
                 USBSpaceWire_Close(hDevice); // Close the device
             }
             void StarDundee::Open()
             {
                 int status;
                 U32 statusControl;
                 if (!USBSpaceWire_Open(&hDevice, usbDeviceNumber_SPINBOX->value())) // Open the USB device
                 {
-                emit sendMessage("stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))");
+                    emit sendMessage("stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))");
-                return;
+                    return;
                 }
                 emit sendMessage("stardundee *** Open *** USBSpaceWire_Open successful, device number: "
                                  + QString::number(usbDeviceNumber_SPINBOX->value()));
                 USBSpaceWire_EnableNetworkMode(hDevice, 0); // deactivate the network mode
-                CFGSpaceWire_EnableRMAP(1);                 // Enable the use of RMAP
+                CFGSpaceWire_EnableRMAP(1);                 // Enable the use of RMAP for the StarDundee brick configuration
                 CFGSpaceWire_SetRMAPDestinationKey(0x20);   // Set the destination key expected by STAR-Dundee devices
                 // Set the path and return path to the device
                 CFGSpaceWire_StackClear();
                 CFGSpaceWire_AddrStackPush(0);
                 CFGSpaceWire_AddrStackPush(254);
                 CFGSpaceWire_RetAddrStackPush(254);
                 // set the base transmit rate to 100 MHz
                 status = CFGSpaceWire_SetBrickBaseTransmitRate( hDevice, CFG_BRK_CLK_100_MHZ, CFG_BRK_DVDR_1, 0xff);
                 if (status != CFG_TRANSFER_SUCCESS)
                 {
                     emit sendMessage("ERROR CFGSpaceWire_SetBrickBaseTransmitRate");
                 }
                 else emit sendMessage("OK CFGSpaceWire_SetBrickBaseTransmitRate, base rate = 100 MHz");
                 // read the link status
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, linkNumber_SPINBOX->value(), &statusControl) != CFG_TRANSFER_SUCCESS)
                 {
                     emit sendMessage("Could not read link status control for link " + QString::number(linkNumber_SPINBOX->value()));
                 }
                 else
                 {
                     emit sendMessage("OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(linkNumber_SPINBOX->value()));
                     // Set the link status control register properties
                     CFGSpaceWire_LSEnableAutoStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableDisabled(&statusControl, 0);
                     CFGSpaceWire_LSEnableTristate(&statusControl, 0);
                     CFGSpaceWire_LSSetOperatingSpeed(&statusControl, 9);    // sets the link speed to ( 100 MHz / (9+1) ) = 10 MHz
                     // Set the link status control register
                     if (CFGSpaceWire_SetLinkStatusControl(hDevice, linkNumber_SPINBOX->value(), statusControl) != CFG_TRANSFER_SUCCESS)
                     {
                         emit sendMessage("Could not set the link status control for link " + QString::number(linkNumber_SPINBOX->value()));
                     }
                     else emit sendMessage("Set the link status control for link " + QString::number(linkNumber_SPINBOX->value()));
                 }
-                setRoutingTableEntry(rmapTargetLogicalAddress, (1<<linkNumber_SPINBOX->value()));
+                if (CFGSpaceWire_SetAsInterface(hDevice, 1, 0) != CFG_TRANSFER_SUCCESS)
-                setRoutingTableEntry(sourceLogicalAddress_SPINBOX->value(), (1<<3));
-                //setRoutingTableEntry(33,                                    (1<<3));
+                    emit sendMessage("Could not set the device to be an interface");
+                }
+                else
+                {
+                    emit sendMessage("Device set to be an interface");
+                }
-                emit sendMessage("The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes");
+                //setRoutingTableEntry(rmapTargetLogicalAddress, (1<<linkNumber_SPINBOX->value()));
+                //setRoutingTableEntry(rmapSourceLogicalAddress, (1<<3));
+                //GetRoutingTableEntry(rmapTargetLogicalAddress);
+                //GetRoutingTableEntry(rmapSourceLogicalAddress);
                 USBSpaceWire_RegisterReceiveOnAllPorts(hDevice);    // Register to receive on all ports
                 USBSpaceWire_ClearEndpoints(hDevice);               // clear the USB endpoints
+                emit sendMessage("The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes");
+                emit sendMessage("The driver's current read buffer size is " + QString::number(USBSpaceWire_GetDriverReadBufferSize(hDevice)) + " bytes");
+                emit sendMessage("USBSpaceWire_IsReadThrottling is " + QString::number(USBSpaceWire_IsReadThrottling(hDevice)));
                 // initialize SPW packet semaphores
                 while (rmapPacketSEMAPHORE->available()!=0) rmapPacketSEMAPHORE->acquire();
                 while (ccsdsPacketSEMAPHORE->available()!=0) ccsdsPacketSEMAPHORE->acquire();
                 if (getLinkStatus(linkNumber_SPINBOX->value()))
                 {
                     emit isOpen(true);
                 }
                 else
                 {
+                    starDundeeStatusQueryDialog->exec();
                 }
             }
             void StarDundee::Close()
             {
                 USBSpaceWire_Close(hDevice); // Close the device
                 emit sendMessage("stardundee *** Close *** USBSpaceWire_Close, device: " + QString::number(usbDeviceNumber_SPINBOX->value()));
                 USBSpaceWire_UnregisterReceiveOnAllPorts(hDevice);  // Stop receiving on all ports
                 emit isOpen(false);
             }
-            unsigned int StarDundee::GetRoutingTableEntry()
+            unsigned char StarDundee::setRoutingTableEntry(int tableEntry, U32 dwOutputPorts)
+            {
+                U32 routingTableEntry;
+                // SET THE ROUTING TABLE ENTRY FOR LOGICAL ADDRESSING, TARGET entryNumber
+                if (CFGSpaceWire_ClearRoutingTableEntry(hDevice, tableEntry) != CFG_TRANSFER_SUCCESS)
+                {
+                    emit sendMessage("Could not clear routing table entry " + QString::number(tableEntry));
+                }
+                // Build the routing table entry
+                CFGSpaceWire_RTBuildRoutingTableEntry(&routingTableEntry,
+                                                      dwOutputPorts,        // route out of port dwOutputPorts
+,                    // header deletion disabled
+);                   // priority normal
+                // Set the routing table entry for logical address tableEntry
+                if (CFGSpaceWire_SetRoutingTableEntry(hDevice, tableEntry, routingTableEntry) != CFG_TRANSFER_SUCCESS)
+                {
+                    emit sendMessage("Could not set routing table entry [" + QString::number(tableEntry) + "]");
+                }
+                else emit sendMessage("Routing table entry [" + QString::number(tableEntry) + "] set" );
+                return 1;
+            }
+            unsigned int StarDundee::GetRoutingTableEntry(int tableEntry)
             {
                 U32 routingTableEntry, outputPorts;
                 char enabled, delHead, priority;
                 int portNum;
-                int tableEntry;
-                tableEntry = rmapTargetLogicalAddress;
+                emit sendMessage("GetRoutingTableEntry [" + QString::number(tableEntry) + "]");
-                // Set the path and return path to the device
-                CFGSpaceWire_StackClear();
-                CFGSpaceWire_AddrStackPush(0);
-                CFGSpaceWire_AddrStackPush(254);
-                CFGSpaceWire_RetAddrStackPush(254);
                 // Read the routing table entry
                 if (CFGSpaceWire_GetRoutingTableEntry(hDevice, tableEntry, &routingTableEntry) != CFG_TRANSFER_SUCCESS)
                 {
                     emit sendMessage("Could not read routing table entry [" + QString::number(tableEntry) + "]");
                 }
                 else
                 {
                     // Display the routing table entry properties
                     CFGSpaceWire_RTIsEnabled(routingTableEntry, &enabled);
                     CFGSpaceWire_RTIsDelHead(routingTableEntry, &delHead);
                     CFGSpaceWire_RTIsPriority(routingTableEntry, &priority);
                     CFGSpaceWire_RTGetOutputPorts(routingTableEntry, &outputPorts);
                     emit sendMessage("CFGSpaceWire_RTIsEnabled      : " + QString::number(enabled));
                     emit sendMessage("CFGSpaceWire_RTIsDelHead      : " + QString::number(delHead));
                     emit sendMessage("CFGSpaceWire_RTIsPriority     : " + QString::number(priority));
                     emit sendMessage("CFGSpaceWire_RTGetOutputPorts : ");
                     for (portNum = 0; portNum < 32; portNum++)
                     {
                         if (outputPorts & (1 << portNum))
                         {
                             emit sendMessage(QString::number(portNum));
                         }
                     }
                 }
                 return 1;
             }
             unsigned int StarDundee::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int remainingCount = count;
                 unsigned int iOffset = 0;
                 QString console_message;
                 char* data;
                 if(rmapPacketSEMAPHORE->available()!=0)
                 {
                     emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP request already running, WRITE access stopped");
                     return 1;
                 }
                 emit this->RMAP_write_reply_setText("reply to the write command required\nlast reply status: unavailable");
                 data = (char*) malloc(READ_WRITE_MAX_COUNTS*4);
                 emit appendToLog(QString("*** START *** WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                     for (int i = 0; i<READ_WRITE_MAX_COUNTS; i++)
                     {
                         data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
                         data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
                         data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
                         data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
                     }
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Write ")+ QString::number(READ_WRITE_MAX_COUNTS*4) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if(WriteBLOCK(data, READ_WRITE_MAX_COUNTS*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
                         return 1;
                     }
                     remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
                     address = address + READ_WRITE_MAX_COUNTS * 4;
                     iOffset = iOffset + READ_WRITE_MAX_COUNTS;
                 }
                 if (remainingCount > 0)
                 {
                     for (unsigned int i = 0; i<remainingCount; i++)
                     {
                         data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
                         data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
                         data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
                         data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
                     }
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Write ")+ QString::number(remainingCount*4) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (WriteBLOCK(data, remainingCount*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
                         return 1;
                     }
                 }
                 emit appendToLog(QString("*** STOP *** WRITE"));
                 free(data);
                 return count;
             }
             unsigned int StarDundee::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int remainingCount = count;
                 unsigned int iOffset = 0;
                 QString console_message;
                 if(rmapPacketSEMAPHORE->available()!=0)
                 {
                     emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP request already running, READ access stopped");
                     return 1;
                 }
                 emit appendToLog(QString("*** START *** READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Read ")+ QString::number(4*READ_WRITE_MAX_COUNTS) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (this->ReadBLOCK(READ_WRITE_MAX_COUNTS*4, address)==0)
                     {
                         emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
                         return 1;
                     }
                     for(int i=0;i<READ_WRITE_MAX_COUNTS;i++)
                     {
                         Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
                         for(int j=1;j<4;j++)
                         {
                             Value[i+iOffset]= ((unsigned char) (rmapPacket[i*4+j+RMAP_READ_REPLY_HEADER_LENGTH]))
                                     + Value[i+iOffset]*256;
                         }
                     }
                     remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
                     address = address + READ_WRITE_MAX_COUNTS * 4;
                     iOffset = iOffset + READ_WRITE_MAX_COUNTS;
                     this->acquireRMAPSemaphore();
                 }
                 if (remainingCount > 0)
                 {
                     console_message.sprintf("remainingCount: %d => ", remainingCount);
                     emit appendToLog(console_message + QString("Read ")+ QString::number(4*remainingCount) + QString(" byte(s) @0x")+ QString::number(address,16));
                     if (this->ReadBLOCK(4*remainingCount, address)==0)
                     {
                         emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
                         return 1;
                     }
                     for(unsigned int i=0;i<remainingCount;i++)
                     {
                         Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
                         for(int j=1;j<4;j++)
                         {
                             Value[i+iOffset]= ((unsigned char)(rmapPacket[i*4+j+RMAP_READ_REPLY_HEADER_LENGTH])) + Value[i+iOffset]*256;
                         }
                     }
                     this->acquireRMAPSemaphore();
                 }
                 emit appendToLog(QString("*** STOP *** READ "));
                 return count;
             }
             unsigned int StarDundee::WriteBLOCK(char *data, unsigned int nbBytes, unsigned int address)
             {
                 RMAP *RMAPCommand;
                 char * packet;
+                char* aux;
                 unsigned char offset, headerSize, CRCSize;
-                char* aux;
                 unsigned int totalSize;
                 int errorCode;
                 QString console_message;
                 if (getLinkStatus(this->linkNumber_SPINBOX->value()) == 0)
                 {
                     this->Close();
                     return 1;
                 }
                 RMAPCommand = new RMAP(this->commandCode,
                                        rmapTargetLogicalAddress,
                                        rmapSourceLogicalAddress,
                                        address,
                                        nbBytes,
                                        data);
                 headerSize = sizeof(RMAPCommand->RMAPHeader);
                 CRCSize = 1;
                 //*************************
                 // BUILD THE PACKET TO SEND
-                totalSize = headerSize + nbBytes + CRCSize;
+                totalSize = headerSize + nbBytes + CRCSize + PATH_ADDRESSING_OFFSET;
                 packet = (char*) malloc( totalSize );
                 aux = (char*) ((void*) &RMAPCommand->RMAPHeader);
-                for(unsigned int i = 0; i<headerSize; i++) packet[i] = aux[i];
+                packet[0] = this->linkNumber_SPINBOX->value();
+                for(unsigned int i = 0; i<headerSize; i++) packet[i+PATH_ADDRESSING_OFFSET] = aux[i];
                 offset = headerSize;
                 for(unsigned int i = 0; i<nbBytes; i++)
                 {
-                    packet[i+offset] = data[i];
+                    packet[i+offset+PATH_ADDRESSING_OFFSET] = data[i];
                 }
-                packet[nbBytes+offset] = RMAPCommand->dataCRC;
+                packet[nbBytes+offset+PATH_ADDRESSING_OFFSET] = RMAPCommand->dataCRC;
                 //****************
                 // SEND THE PACKET
                 result = USBSpaceWire_SendPacket(hDevice,
                                                  packet,
                                                  totalSize,
                                                  BWAIT_1, &pIdentifier);
                 if (result != TRANSFER_SUCCESS)
                 {
                     emit sendMessage("ERROR *** WriteStarDundee when sending packet of size "
                                      + QString::number(totalSize) +", with code: " + QString::number(result));
                     USBSpaceWire_FreeSend(hDevice, pIdentifier);
                     free(data);
                     return 1;
                 }
                 else emit sendMessage("OK *** WriteStarDundee when sending packet of size " + QString::number(totalSize));
                 //**************
                 // Free the send
                 USBSpaceWire_FreeSend(hDevice, pIdentifier);
                 free(packet);
                 if ( (commandCode == writeSingle_noVer_Rep) | (commandCode == writeInc_noVer_Rep) |
                      (commandCode == writeSingle_ver_rep) | (commandCode == writeInc_ver_rep) )
                 {
                     // WAIT FOR THE RMAP REPLY PACKET
                     errorCode = this->receiveSPWPacket(1);
                     if (errorCode<=0)
                     {
                         emit appendToLog("WARNING === in function WriteBLOCK of rmapplugin *** RMAP packet reception failed with code " + QString::number(errorCode));
                         return 0;
                     }
                     if(rmapPacketSize != 8)
                      {
                         console_message.sprintf("WARNING === in function WRITE (with reply) of rmapplugin *** write reply format not compliant\n");
                         emit appendToLog(console_message);
                         return 0;
                      }
                     switch (this->rmapPacket[3]) // byte 4 is the status byte in the reply
                     {
                     case 0:
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 0 Successfull");
                         break;
                     case 1:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** General error code");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 1 General error code");
                         break;
                     case 2:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Unused RMAP packet type or command code");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 2 Unused RMAP packet type or command code");
                         break;
                     case 3:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid key");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 3 Invalid key");
                         break;
                     case 4:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid data CRC");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 4 Invalid data CRC");
                         break;
                     case 5:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Early EOP");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 5 Early EOP");
                         break;
                     case 6:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Too much data");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 6 Too much data");
                         break;
                     case 7:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** EEP");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 7 EEP");
                         break;
                     case 8:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Reserved");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 8 Reserved");
                         break;
                     case 9:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Verify buffer overrun");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 9 Verify buffer overrun");
                         break;
                     case 10:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** RMAP command not implemented or not authorised");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 10 RMAP command not implemented or not authorised");
                         break;
                     case 11:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** RMW data length error");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 11 RMAP RMW data length error");
                         break;
                     case 12:
                         emit appendToLog("WARNING === in function WRITE (with reply) of rmapplugin *** Invalid target logical address");
                         emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: 12 Invalid target logical address");
                         break;
                     }
                     this->acquireRMAPSemaphore();
                 }
                 else
                     emit RMAP_write_reply_setText("reply to the write command required\nlast reply status: unavailable");
                 return nbBytes;
             }
             unsigned int StarDundee::ReadBLOCK(unsigned int nbBytes, unsigned int address)
             {
                 int errorCode;
                 RMAP *RMAPCommand;
-                unsigned int dataLength;
+                char *packet;
+                char *aux;
+                unsigned int dataLength = 0;
+                unsigned int totalSize = 0;
                 //**********************
                 // Check the link status
                 if ( getLinkStatus( this->linkNumber_SPINBOX->value() ) == 0 )
                 {
                     this->Close();
                     emit appendToLog("WARNING === in function WriteSPW of StarDundee *** SPW link not running\n");
                     return 0;
                 }
                 //**********************
                 // SEND THE READ COMMAND
                 if (nbBytes > 4)
                 {
                     RMAPCommand = new RMAP(read_Inc,
                                            rmapTargetLogicalAddress,
                                            rmapSourceLogicalAddress,
                                            address,
                                            nbBytes,
                                            NULL);
                 }
                 else
                 {
                     RMAPCommand = new RMAP(read_Single,
                                            rmapTargetLogicalAddress,
                                            rmapSourceLogicalAddress,
                                            address,
                                            nbBytes,
                                            NULL);
                 }
+                //*************************
+                // BUILD THE PACKET TO SEND
+                totalSize = sizeof(RMAPCommand->RMAPHeader) + PATH_ADDRESSING_OFFSET;
+                packet = (char*) malloc( totalSize );
+                aux = (char*) ((void*) &RMAPCommand->RMAPHeader);
+                packet[0] = this->linkNumber_SPINBOX->value();
+                for (unsigned int i = 0; i<sizeof(RMAPCommand->RMAPHeader); i++)
+                    packet[i+PATH_ADDRESSING_OFFSET] = aux[i];
+                //****************
+                // SEND THE PACKET
                 result = USBSpaceWire_SendPacket(hDevice,
-                                                 (unsigned char*) ((void*) &RMAPCommand->RMAPHeader),
+                                                 packet,
-                                                 sizeof(RMAPCommand->RMAPHeader),
+                                                 totalSize,
                                                  BWAIT_1, &pIdentifier);
                 if (result != TRANSFER_SUCCESS) emit sendMessage("ERR *** ReadStarDundee *** ReadBLOCK *** sending the READ command ");
-                else emit sendMessage("OK *** ReadStarDundee *** ReadBLOCK *** sending the READ command");
+                else
+                {
+                    emit sendMessage("OK *** ReadStarDundee *** ReadBLOCK *** sending the READ command");
+                    emit appendToLog("packet sent, B0 = " + QString::number(packet[0], 16)
+                                     + " *** B1 = " + QString::number(packet[1], 16)
+                                     + " *** B2 = " + QString::number(packet[2], 16)
+                                     + " *** B3 = " + QString::number(packet[3], 16)
+                                     + " *** B4 = " + QString::number(packet[4], 16)
+                                     + " *** B5 = " + QString::number(packet[5], 16)
+                                     );
+                }
+                //**************
+                // Free the send
+                USBSpaceWire_FreeSend(hDevice, pIdentifier);
+                free(packet);
                 //*********************************
                 // RECEIVE THE INCOMING RMAP PACKET
                 errorCode = this->receiveSPWPacket(1); // request ID 1 is for RMAP packet
                 if (errorCode<=0)
                 {
                     emit appendToLog("WARNING === in function ReadBLOCK of StarDundee *** RMAP packet reception failed with code " + QString::number(errorCode));
                     return 0;
                 }
                 dataLength = rmapPacketSize - RMAP_READ_REPLY_HEADER_LENGTH - RMAP_DATA_CRC_LENGTH;
                 if(dataLength != nbBytes)
                  {
                     emit appendToLog("WARNING === in function READ of StarDundee *** number of data received ("
                                 +QString::number(dataLength)
                                 +") not equal to number of data requested ("
                                 +QString::number(nbBytes)
                                 +")");
                     return 0;
                  }
                 return dataLength;
             }
             unsigned int StarDundee::WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication)
             {
                 char protocoleIdentifier = 0x02;
                 char reserved = 0x00;
                 char *SPWData;
                 unsigned int totalSize;
                 if (count>248)
                 {
                     emit appendToLog("WARNING === in function WRITE of rmapplugin *** CCSDS packet size > 248 bytes\n");
                     return 1;
                 }
                 emit appendToLog("*** START *** Send CCSDS packet of "+ QString::number(count) + " byte(s)");
                 if ( getLinkStatus( this->linkNumber_SPINBOX->value() ) == 0 )
                 {
                     this->Close();
                     emit appendToLog("WARNING === in function WriteSPW of StarDundee *** SPW link not running\n");
                     return 1;
                 }
-                totalSize = count + 4;
+                totalSize = count + 4 + PATH_ADDRESSING_OFFSET; // The StarDundee brick is in PATH addressing
                 SPWData = (char*) malloc(totalSize);
                 // SPW HEADER
-                SPWData[0] = targetLogicalAddress;
+                SPWData[0] = this->linkNumber_SPINBOX->value(); // 1 by default, value can be 1 or 2
-                SPWData[1] = protocoleIdentifier;
+                SPWData[0+PATH_ADDRESSING_OFFSET] = targetLogicalAddress;
-                SPWData[2] = reserved;
+                SPWData[1+PATH_ADDRESSING_OFFSET] = protocoleIdentifier;
-                SPWData[3] = userApplication;
+                SPWData[2+PATH_ADDRESSING_OFFSET] = reserved;
+                SPWData[3+PATH_ADDRESSING_OFFSET] = userApplication;
                 // CCSDS PACKET
                 for (unsigned int i = 0; i<count; i++)
                 {
-                    SPWData[i+4] = Value[i];
+                    SPWData[i+4+PATH_ADDRESSING_OFFSET] = Value[i];
                 }
-                //************
+                //****************
                 // SEND THE PACKET
                 result = USBSpaceWire_SendPacket(hDevice,
                                                  SPWData,
                                                  totalSize,
                                                  BWAIT_1, &pIdentifier);
                 if (result != TRANSFER_SUCCESS)
                 {
                     emit sendMessage("ERROR *** WriteSPW when sending packet of size "
                                      + QString::number(totalSize) +", with code: " + QString::number(result));
                     USBSpaceWire_FreeSend(hDevice, pIdentifier);
                     free(SPWData);
                     return 0;
                 }
-                else emit sendMessage("OK *** WriteSPW when sending packet of size " + QString::number(totalSize));
+                else emit sendMessage("OK *** WriteSPW when sending packet of size " + QString::number(totalSize-1));
+                emit appendToLog("packet sent, B0 = " + QString::number(SPWData[0])
+                                 + " *** B1 = " + QString::number(SPWData[1])
+                                 + " *** B2 = " + QString::number(SPWData[2])
+                                 + " *** B3 = " + QString::number(SPWData[3])
+                                 + " *** B4 = " + QString::number(SPWData[4])
+                                 + " *** B5 = " + QString::number(SPWData[5])
+                                 + " *** B6 = " + QString::number(SPWData[6])
+                                 + " *** B7 = " + QString::number(SPWData[7])
+                                 + " *** B8 = " + QString::number(SPWData[8])
+                                 + " *** B9 = " + QString::number(SPWData[9])
+                                 + " *** B10 = " + QString::number(SPWData[10])
+                                 + " *** B11 = " + QString::number(SPWData[11])
+                                 + " *** B12 = " + QString::number(SPWData[12])
+                                 );
                 //**************
                 // Free the send
                 USBSpaceWire_FreeSend(hDevice, pIdentifier);
                 free(SPWData);
                 emit appendToLog(QString("*** CCSDS packet sent"));
                 return 1;
             }
             unsigned int StarDundee::getLinkStatus(unsigned char link)
             {
                 U32 statusControl, errorStatus, portType;
                 U32 linkStatus, operatingSpeed, outputPortConnection;
                 char isLinkRunning, isAutoStart, isStart, isDisabled, isTristate;
                 // Read the link status control register
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, 1, &statusControl) != CFG_TRANSFER_SUCCESS)
                 {
                     emit appendToLog("Could not read link status control for link" + QString::number(link));
                 }
                 else
                 {
                     // Display the link status control register properties
                     CFGSpaceWire_LSPortType(statusControl, &portType);
                     if (portType == CFG_CONFIGURATION_PORT)
                     {
                         CFGSpaceWire_LSConfigErrorStatus(statusControl, &errorStatus);
                         //emit appendToLog("Configuration port error status = " + QString::number(errorStatus));
                     }
                     else if (portType == CFG_SPACEWIRE_EXTERNAL_PORT)
                     {
                         CFGSpaceWire_LSExternalErrorStatus(statusControl, &errorStatus);
                         //emit appendToLog("External port error status = " + QString::number(errorStatus));
                     }
                     else
                     {
                         CFGSpaceWire_LSErrorStatus(statusControl, &errorStatus);
                         //emit appendToLog("SpaceWire link error status = " + QString::number(errorStatus));
                     }
                     CFGSpaceWire_LSLinkState(statusControl, &linkStatus);
                     CFGSpaceWire_LSIsLinkRunning(statusControl, &isLinkRunning);
                     CFGSpaceWire_LSIsAutoStart(statusControl, &isAutoStart);
                     CFGSpaceWire_LSIsStart(statusControl, &isStart);
                     CFGSpaceWire_LSIsDisabled(statusControl, &isDisabled);
                     CFGSpaceWire_LSIsTristate(statusControl, &isTristate);
                     CFGSpaceWire_LSOperatingSpeed(statusControl, &operatingSpeed);
                     CFGSpaceWire_LSOutputPortConnection(statusControl, &outputPortConnection);
                     //emit appendToLog("The link state is = " + QString::number(linkStatus));
                     //emit appendToLog("The link is running = " + QString::number(isLinkRunning));
                     //emit appendToLog("The autostart bit is enabled = " + QString::number(isAutoStart));
                     //emit appendToLog("The start bit is enabled = " + QString::number(isStart));
                     //emit appendToLog("The link is disabled = " + QString::number(isDisabled));
                     //emit appendToLog("The tri-state bit is enabled = " + QString::number(isAutoStart));
                     //emit appendToLog("The operating speed is = " + QString::number(operatingSpeed));
                     //emit appendToLog("This port is currently connected to output port = " + QString::number(outputPortConnection));
                 }
                 if (linkStatus == 5) return 1;
                 else return 0;
             }
+            void StarDundee::receivePollingLoop()
+            {
+                timer->blockSignals(true);
+                if (USBSpaceWire_WaitOnReadPacketAvailable(hDevice, 0)) receiveSPWPacketLoop(0);
+                timer->blockSignals(false);
+            }
+            int StarDundee::receiveSPWPacketLoop(unsigned char requestID)
+            {
+                int result = 0;
+                emit appendToLog("Number of packets dropped by the driver: " +
+                                 QString::number(USBSpaceWire_GetDriverDroppedPackets(hDevice)));
+                while (USBSpaceWire_WaitOnReadPacketAvailable(hDevice, 0))
+                {
+                    //sendMessage("trying to get a packet");
+                    result = receiveSPWPacket(requestID);
+                }
+                if (!ccsdsPacketStore.isEmpty())
+                {
+                    emit packetStoreNotEmpty();
+                }
+                return result;
+            }
             int StarDundee::receiveSPWPacket(unsigned char requestID) // SLOT
             {
                 unsigned int packetLength;
                 unsigned int nbBytes;
                 unsigned nPacketNum;
                 USB_SPACEWIRE_PACKET_PROPERTIES properties; // The properties of the read
                 if (requestID==1)
                 {
                     if (rmapPacketSEMAPHORE->available())
                     {
                         return rmapPacketSize;
                     }
                 }
                 //********************
                 // TRY TO RECEIVE DATA
                 nbBytes = qMax(RMAP_MAX_PACKET_LENGTH, CCSDS_MAX_PACKET_LENGTH); // maximum size of the packet to receive
                 nPacketNum = 1;
-                result = USBSpaceWire_ReadPackets(hDevice, spwPacket, nbBytes, nPacketNum, BWAIT_1, &properties, &pIdentifier);
+                result = USBSpaceWire_ReadPackets(hDevice, spwPacket, nbBytes, nPacketNum, BWAIT_1, &properties, &pIdentifierRead);
                 if (result != TRANSFER_SUCCESS)
                 {
                     emit sendMessage("Error: Could not receive the packet");
                     return 0;
                 }
                 else
                 {
                     packetLength = properties.len;
-                    USBSpaceWire_FreeRead(hDevice, pIdentifier);         // Free the receive
+                    if (properties.eop == SPACEWIRE_USB_NO_EOP)
+                    {
+                        emit appendToLog("No end of packet marker received");
+                    }
+                    else if (properties.eop == SPACEWIRE_USB_EOP)
+                    {
+                        emit appendToLog("Normal end of packet marker received");
+                    }
+                    else if (properties.eop == SPACEWIRE_USB_EEP)
+                    {
+                        emit appendToLog("Error end of packet marker received");
+                    }
+                    USBSpaceWire_FreeRead(hDevice, pIdentifierRead);         // Free the read buffer
                 }
                 switch(spwPacket[1]) // byte 1 is the protocole identifier in the SPW packet
                 {
                 case 1: // 0x01 is the protocole identifier for RMAP packets
                     if (rmapPacketSEMAPHORE->available()!=0) return -3; // ERROR === previous RMAP packet not processed yet
                     for(unsigned int i=0; i<packetLength; i++) rmapPacket[i] = spwPacket[i];
                     rmapPacketSize = packetLength;
                     rmapPacketSEMAPHORE->release();
                     emit appendToLog("RMAP packet of size " + QString::number(packetLength) + " received");
+                    emit appendToLog("packet received, B0 = " + QString::number(spwPacket[0], 16)
+                                     + " *** B1 = " + QString::number(spwPacket[1], 16)
+                                     + " *** B2 = " + QString::number(spwPacket[2], 16)
+                                     + " *** B3 = " + QString::number(spwPacket[3], 16)
+                                     + " *** B4 = " + QString::number(spwPacket[4], 16)
+                                     + " *** B5 = " + QString::number(spwPacket[5], 16)
+                                     );
                     return packetLength;
                 case 2: // 0x02 is the protocole identifier for CCSDS packets
-                    if (ccsdsPacketSEMAPHORE->available()!=0) return -4; // ERROR === previous CCSDS packet not processed yet
+                    if (ccsdsPacketSEMAPHORE->available()!=0)
+                    {
+                        emit sendMessage("in function [receiveSPWPacket] === ERROR === previous CCSDS packet not processed yet");
+                        return -4; // ERROR === previous CCSDS packet not processed yet
+                    }
                     for(unsigned int i=0; i<packetLength; i++) ccsdsPacket[i] = spwPacket[i];
                     ccsdsPacketSize = packetLength;
-                    ccsdsPacketSEMAPHORE->release();
+                    //ccsdsPacketSEMAPHORE->release();
+                    //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
                     emit appendToLog("CCSDS packet of size " + QString::number(packetLength) + " received");
-                    emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
+                    emit appendToLog("packet received, byte0 " + QString::number(spwPacket[0], 16)
+                                     + " *** byte1 " + QString::number(spwPacket[1], 16)
+                                     + " *** byte2 " + QString::number(spwPacket[2], 16)
+                                     + " *** byte3 " + QString::number(spwPacket[3], 16));
+                    storeCCSDSPacket(ccsdsPacket, packetLength);
                     return packetLength;
+                default:
+                    emit appendToLog("packet received, byte0 " + QString::number(spwPacket[0], 16)
+                                     + " *** byte1 " + QString::number(spwPacket[1], 16)
+                                     + " *** byte2 " + QString::number(spwPacket[2], 16)
+                                     + " *** byte3 " + QString::number(spwPacket[3], 16));
                 }
                 return 0;
             }
-            void StarDundee::receivePollingLoop()
+            unsigned int StarDundee::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
             {
-                timer->blockSignals(true);
+                unsigned int i;
-                if (USBSpaceWire_WaitOnReadPacketAvailable(hDevice, 0)) receiveSPWPacket(0);
+                ccsdsPacketToProcess_t ccsdsPacketToStore;
-                timer->blockSignals(false);
+                ccsdsPacketToStore.size = size;
+                for(i=0; i<size; i++)
+                {
+                    ccsdsPacketToStore.data[i] = ccsdsPacket[i];
+                }
+                ccsdsPacketStore << ccsdsPacketToStore;
+                //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
+                //emit ccsdsPacketIsAvailable(size);
+                return 1;
             }
-            unsigned char StarDundee::setRoutingTableEntry(int tableEntry, U32 dwOutputPorts)
+            void StarDundee::reTestSPWLink() // SLOT
             {
-                U32 routingTableEntry;
+                if (getLinkStatus(linkNumber_SPINBOX->value()))
-                // SET THE ROUTING TABLE ENTRY FOR LOGICAL ADDRESSING, TARGET entryNumber
-                if (CFGSpaceWire_ClearRoutingTableEntry(hDevice, tableEntry) != CFG_TRANSFER_SUCCESS)
                 {
-                    emit sendMessage("Could not clear routing table entry " + QString::number(tableEntry));
+                    emit isOpen(true);
+                    starDundeeStatusQueryDialog->accept();
                 }
-                // Build the routing table entry
-                CFGSpaceWire_RTBuildRoutingTableEntry(&routingTableEntry,
-                                                      dwOutputPorts,        // route out of port dwOutputPorts
-,                    // header deletion disabled
-);                   // priority normal
-                // Set the routing table entry for logical address tableEntry
-                if (CFGSpaceWire_SetRoutingTableEntry(hDevice, tableEntry, routingTableEntry) != CFG_TRANSFER_SUCCESS)
-                    emit sendMessage("Could not set routing table entry [" + QString::number(tableEntry) + "]");
-                else emit sendMessage("Routing table entry [" + QString::number(tableEntry) + "] set" );
             }

rmapplugin/stardundee.h +14 -8

             #ifndef STARDUNDEE_H
             #define STARDUNDEE_H
             #include <QWidget>
             #include <QPushButton>
             #include <QGridLayout>
             #include <QSpinBox>
             #include <QLabel>
             #include <QSemaphore>
             #include <QTimer>
             #include <QDialog>
             #include "rmapoperations.h"
             #include "spw_usb_api.h"
             #include "spw_config_library.h"
+            #include "ccsds.h"
             #define BWAIT_0 0
             #define BWAIT_1 1
+            #define PATH_ADDRESSING_OFFSET 1
             class StarDundee : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit StarDundee(QWidget *parent = 0);
                 ~StarDundee();
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
+                unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
+                QList<ccsdsPacketToProcess_t> ccsdsPacketStore;
             signals:
                 void sendMessage(QString message);
                 void isOpen(bool);
                 void RMAP_write_reply_setText(QString);
                 void appendToLog(QString);
                 void ccsdsPacketAvailable(unsigned char*, unsigned int);
+                void packetStoreNotEmpty();
             public slots:
                 void Open();
                 void Close();
-                int receiveSPWPacket(unsigned char requestID);
+                void reTestSPWLink();
+                int receiveSPWPacketLoop(unsigned char requestID=0);
+                int receiveSPWPacket(unsigned char requestID=0);
                 void commandCodeHasChanged(RMAP_command_codes code) {this->commandCode = code;}
                 void targetHasChanged(int target) {rmapTargetLogicalAddress = (unsigned char) target;}
+                void sourceHasChanged(int source) {rmapSourceLogicalAddress = (unsigned char) source;}
                 void ccsdsPacketIsProcessed() {ccsdsPacketSEMAPHORE->tryAcquire();}
-                void reTestSPWLink() {getLinkStatus(linkNumber_SPINBOX->value());}
                 //
-                void sourceHasChanged(int target) {rmapSourceLogicalAddress = (unsigned char) target;}
                 void receivePollingLoop();
             private:
                 unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0);
                 unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0);
                 void acquireRMAPSemaphore() {rmapPacketSEMAPHORE->tryAcquire();}
                 void acquireCCSDSSemaphore() {ccsdsPacketSEMAPHORE->tryAcquire();}
                 unsigned char setRoutingTableEntry(int tableEntry, U32 dwOutputPorts);
                 unsigned int getLinkStatus(unsigned char link);
-                unsigned int GetRoutingTableEntry();
+                unsigned int GetRoutingTableEntry(int tableEntry);
                 unsigned char rmapTargetLogicalAddress ;
                 unsigned char rmapSourceLogicalAddress ;
                 RMAP_command_codes commandCode;
                 QLabel *usbDeviceNumber_LABEL;
                 QLabel *linkNumber_LABEL;
-                QLabel *sourceLogicalAddress_LABEL;
                 QLabel *starDundeeStatusQueryDialogLabel;
                 QSpinBox *usbDeviceNumber_SPINBOX;
                 QSpinBox *linkNumber_SPINBOX;
-                QSpinBox *sourceLogicalAddress_SPINBOX;
                 QGridLayout *connection_LAYOUT;
                 QGridLayout *starDundeeStatusQueryDialogLayout;
                 QDialog *starDundeeStatusQueryDialog;
                 QPushButton *starDundeeStatusQueryRetryButton;
                 QPushButton *starDundeeStatusQueryAbortButton;
                 QTimer *timer;
-                unsigned char pBuffer[10];      // Pointer to the start of the user buffer from which to transmit data
+                unsigned char pBuffer[10];          // Pointer to the start of the user buffer from which to transmit data
-                USB_SPACEWIRE_ID pIdentifier;   // A pointer to a variable which will be set to contain a unique identifier for the send
+                USB_SPACEWIRE_ID pIdentifierRead;   // A pointer to a variable which will be set to contain a unique identifier for the read
+                USB_SPACEWIRE_ID pIdentifier;
                 star_device_handle hDevice;     // Handle to the SpaceWire device
                 USB_SPACEWIRE_STATUS result;    // The result of the send operation
                 // Packet receiver
                 QSemaphore *rmapPacketSEMAPHORE;
                 QSemaphore *ccsdsPacketSEMAPHORE;
                 char* rmapPacket;      // The buffer to receive RMAP READ packets
                 unsigned char *ccsdsPacket;
                 char *spwPacket;
                 unsigned int rmapPacketSize;
                 unsigned int ccsdsPacketSize;
             };
             #endif // STARDUNDEE_H

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