HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r66:66af53d4579a

Minor changes before going pack to VHDLib206 branch

paul -

r66:66af53d4579a default

parent child

Context file:

r66:66af53d4579a

Collapse all files

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

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** gsa
             CONFIG += console verbose
             CONFIG -= qt
             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-21
+            SWVERSION=-0-22
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=21
+            DEFINES += SW_VERSION_N4=22
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE
             }
             contains( CONFIG, cpu_usage_report ) {
                 DEFINES += PRINT_TASK_STATISTICS
             }
             contains( CONFIG, stack_report ) {
                 DEFINES += PRINT_STACK_REPORT
             }
             contains( CONFIG, boot_messages ) {
                 DEFINES += BOOT_MESSAGES
             }
             #doxygen.target = doxygen
             #doxygen.commands = doxygen ../doc/Doxyfile
             #QMAKE_EXTRA_TARGETS += doxygen
             TARGET = fsw
             contains( CONFIG, gsa ) {
                 DEFINES += GSA
                 TARGET = fsw-gsa
             }
             INCLUDEPATH += \
                 ../src \
                 ../header
             SOURCES += \
                 ../src/wf_handler.c \
                 ../src/tc_handler.c \
                 ../src/fsw_processing.c \
                 ../src/fsw_misc.c \
                 ../src/fsw_init.c \
                 ../src/fsw_globals.c \
                 ../src/fsw_spacewire.c \
                 ../src/tc_load_dump_parameters.c \
                 ../src/tm_lfr_tc_exe.c \
                 ../src/tc_acceptance.c
             HEADERS += \
                 ../header/wf_handler.h \
                 ../header/tc_handler.h \
                 ../header/grlib_regs.h \
                 ../header/fsw_processing.h \
                 ../header/fsw_params.h \
                 ../header/fsw_misc.h \
                 ../header/fsw_init.h \
                 ../header/ccsds_types.h \
                 ../header/fsw_params_processing.h \
                 ../header/fsw_spacewire.h \
                 ../header/tm_byte_positions.h \
                 ../header/tc_load_dump_parameters.h \
                 ../header/tm_lfr_tc_exe.h \
                 ../header/tc_acceptance.h

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-12T12:44:53. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-13T07:19:43. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
               <value type="int">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.EditorSettings</variable>
               <valuemap type="QVariantMap">
                <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
                <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
                <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
                 <value type="QString" key="language">Cpp</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="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.KeyboardTooltips">false</value>
                <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
                <value type="int" key="EditorConfiguration.PaddingMode">1</value>
                <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
                <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
                <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
                <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
                <value type="int" key="EditorConfiguration.TabSize">8</value>
                <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
                <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
                <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
                <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
                <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
                <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.PluginSettings</variable>
               <valuemap type="QVariantMap"/>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Target.0</variable>
               <valuemap type="QVariantMap">
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5289e843-9ef2-45ce-88c6-ad27d8e08def}</value>
                <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
                   <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
                  </valuemap>
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">-r -w -j 4</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">-r -w clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.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/DEV_PLE/FSW-qt</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
                </valuemap>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
                   <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
                  </valuemap>
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">-r -w </value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
                    <value type="QString">-w</value>
                    <value type="QString">-r</value>
                   </valuelist>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">-r -w clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.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/DEV_PLE/FSW-qt</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.PluginSettings"/>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <value type="int" key="PE.EnvironmentAspect.Base">2</value>
                 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">fsw-qt</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/FSW-qt/fsw-qt.pro</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">fsw-qt.pro</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
                 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
                 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
                 <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
                 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
                </valuemap>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <value type="int" key="PE.EnvironmentAspect.Base">2</value>
                 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">doxygen</value>
                 <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">true</value>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">/opt/DEV_PLE/doc</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run doxygen</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
                 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
                 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
                 <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
                 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.TargetCount</variable>
               <value type="int">1</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
               <value type="QByteArray">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
               <value type="int">14</value>
              </data>
             </qtcreator>

src/tc_load_dump_parameters.c +1 -1

             /** Functions to load and dump parameters in the LFR registers.
              *
              * @file
              * @author P. LEROY
              *
              * A group of functions to handle TC related to parameter loading and dumping.\n
              * TC_LFR_LOAD_COMMON_PAR\n
              * TC_LFR_LOAD_NORMAL_PAR\n
              * TC_LFR_LOAD_BURST_PAR\n
              * TC_LFR_LOAD_SBM1_PAR\n
              * TC_LFR_LOAD_SBM2_PAR\n
              *
              */
             #include "tc_load_dump_parameters.h"
             int action_load_common_par(ccsdsTelecommandPacket_t *TC)
             {
                 /** This function updates the LFR registers with the incoming common parameters.
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  *
                  *
                  */
                 parameter_dump_packet.unused0 = TC->dataAndCRC[0];
                 parameter_dump_packet.bw_sp0_sp1_r0_r1 = TC->dataAndCRC[1];
-                set_wfp_data_shaping(parameter_dump_packet.bw_sp0_sp1_r0_r1);
+                set_wfp_data_shaping( parameter_dump_packet.bw_sp0_sp1_r0_r1 );
                 return LFR_SUCCESSFUL;
             }
             int action_load_normal_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
             {
                 /** This function updates the LFR registers with the incoming normal parameters.
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int result;
                 int flag;
                 flag = LFR_SUCCESSFUL;
                 if ( (lfrCurrentMode == LFR_MODE_NORMAL) ||
                      (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     flag = LFR_DEFAULT;
                 }
                 //***************
                 // sy_lfr_n_swf_l
                 if (flag == LFR_SUCCESSFUL)
                 {
                     result = set_sy_lfr_n_swf_l( TC, queue_id );
                     if (result != LFR_SUCCESSFUL)
                     {
                         flag = LFR_DEFAULT;
                     }
                 }
                 //***************
                 // sy_lfr_n_swf_p
                 if (flag == LFR_SUCCESSFUL)
                 {
                     result = set_sy_lfr_n_swf_p( TC, queue_id );
                     if (result != LFR_SUCCESSFUL)
                     {
                         flag = LFR_DEFAULT;
                     }
                 }
                 //***************
                 // SY_LFR_N_ASM_P
                 if (flag == LFR_SUCCESSFUL)
                 {
                     result = set_sy_lfr_n_asm_p( TC, queue_id );
                     if (result != LFR_SUCCESSFUL)
                     {
                         flag = LFR_DEFAULT;
                     }
                 }
                 //***************
                 // SY_LFR_N_BP_P0
                 if (flag == LFR_SUCCESSFUL)
                 {
                     result = set_sy_lfr_n_bp_p0( TC, queue_id );
                     if (result != LFR_SUCCESSFUL)
                     {
                         flag = LFR_DEFAULT;
                     }
                 }
                 //***************
                 // sy_lfr_n_bp_p1
                 if (flag == LFR_SUCCESSFUL)
                 {
                     result = set_sy_lfr_n_bp_p1( TC, queue_id );
                     if (result != LFR_SUCCESSFUL)
                     {
                         flag = LFR_DEFAULT;
                     }
                 }
                 return flag;
             }
             int action_load_burst_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
             {
                 /** This function updates the LFR registers with the incoming burst parameters.
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int result;
                 unsigned char lfrMode;
                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
                 if ( lfrMode == LFR_MODE_BURST ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 else {
                     parameter_dump_packet.sy_lfr_b_bp_p0 = TC->dataAndCRC[0];
                     parameter_dump_packet.sy_lfr_b_bp_p1 = TC->dataAndCRC[1];
                     result = LFR_SUCCESSFUL;
                 }
                 return result;
             }
             int action_load_sbm1_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
             {
                 /** This function updates the LFR registers with the incoming sbm1 parameters.
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int result;
                 unsigned char lfrMode;
                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
                 if ( (lfrMode == LFR_MODE_SBM1) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 else {
                     parameter_dump_packet.sy_lfr_s1_bp_p0 = TC->dataAndCRC[0];
                     parameter_dump_packet.sy_lfr_s1_bp_p1 = TC->dataAndCRC[1];
                     result = LFR_SUCCESSFUL;
                 }
                 return result;
             }
             int action_load_sbm2_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
             {
                 /** This function updates the LFR registers with the incoming sbm2 parameters.
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int result;
                 unsigned char lfrMode;
                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
                 if ( (lfrMode == LFR_MODE_SBM2) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 else {
                     parameter_dump_packet.sy_lfr_s2_bp_p0 = TC->dataAndCRC[0];
                     parameter_dump_packet.sy_lfr_s2_bp_p1 = TC->dataAndCRC[1];
                     result = LFR_SUCCESSFUL;
                 }
                 return result;
             }
             int action_dump_par( rtems_id queue_id )
             {
                 /** This function dumps the LFR parameters by sending the appropriate TM packet to the dedicated RTEMS message queue.
                  *
                  * @param queue_id is the id of the queue which handles TM related to this execution step.
                  *
                  * @return RTEMS directive status codes:
                  * - RTEMS_SUCCESSFUL - message sent successfully
                  * - RTEMS_INVALID_ID - invalid queue id
                  * - RTEMS_INVALID_SIZE - invalid message size
                  * - RTEMS_INVALID_ADDRESS - buffer is NULL
                  * - RTEMS_UNSATISFIED - out of message buffers
                  * - RTEMS_TOO_MANY - queue s limit has been reached
                  *
                  */
                 int status;
                 // UPDATE TIME
                 increment_seq_counter( parameter_dump_packet.packetSequenceControl );
                 parameter_dump_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 parameter_dump_packet.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                 parameter_dump_packet.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                 parameter_dump_packet.time[3] = (unsigned char) (time_management_regs->coarse_time);
                 parameter_dump_packet.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                 parameter_dump_packet.time[5] = (unsigned char) (time_management_regs->fine_time);
                 // SEND DATA
                 status =  rtems_message_queue_send( queue_id, &parameter_dump_packet,
                                                     PACKET_LENGTH_PARAMETER_DUMP + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
                 if (status != RTEMS_SUCCESSFUL) {
                     PRINTF1("in action_dump *** ERR sending packet, code %d", status)
                 }
                 return status;
             }
             //***********************
             // NORMAL MODE PARAMETERS
             int set_sy_lfr_n_swf_l( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sets the number of points of a snapshot (sy_lfr_n_swf_l).
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 unsigned int tmp;
                 int result;
                 unsigned char msb;
                 unsigned char lsb;
                 msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L ];
                 lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_L+1 ];
                 tmp = ( unsigned int ) floor(
                             ( ( msb*256 ) + lsb ) / 16
                         ) * 16;
                 if ( (tmp < 16) || (tmp > 2048) )   // the snapshot period is a multiple of 16
                 {                                   // 2048 is the maximum limit due to the size of the buffers
                     send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb );
                     result = WRONG_APP_DATA;
                 }
                 else if (tmp != 2048)
                 {
                     send_tm_lfr_tc_exe_not_implemented( TC, queue_id );
                     result = FUNCT_NOT_IMPL;
                 }
                 else
                 {
                     parameter_dump_packet.sy_lfr_n_swf_l[0] = (unsigned char) (tmp >> 8);
                     parameter_dump_packet.sy_lfr_n_swf_l[1] = (unsigned char) (tmp     );
                     result = LFR_SUCCESSFUL;
                 }
                 return result;
             }
             int set_sy_lfr_n_swf_p( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sets the time between two snapshots, in s (sy_lfr_n_swf_p).
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 unsigned int tmp;
                 int result;
                 unsigned char msb;
                 unsigned char lsb;
                 msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P ];
                 lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_SWF_P+1 ];
                 tmp = ( unsigned int ) floor(
                             ( ( msb*256 ) + lsb ) / 8
                         ) * 8;
                 if ( (tmp < 16) || (tmp > 65528) )
                 {
                     send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb );
                     result = WRONG_APP_DATA;
                 }
                 else
                 {
                     parameter_dump_packet.sy_lfr_n_swf_p[0] = (unsigned char) (tmp >> 8);
                     parameter_dump_packet.sy_lfr_n_swf_p[1] = (unsigned char) (tmp     );
                     result = LFR_SUCCESSFUL;
                 }
                 return result;
             }
             int set_sy_lfr_n_asm_p( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sets the time between two full spectral matrices transmission, in s (SY_LFR_N_ASM_P).
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int result;
                 unsigned char msb;
                 unsigned char lsb;
                 msb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_ASM_P ];
                 lsb = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_ASM_P+1 ];
                 parameter_dump_packet.sy_lfr_n_asm_p[0] = msb;
                 parameter_dump_packet.sy_lfr_n_asm_p[1] = lsb;
                 result = LFR_SUCCESSFUL;
                 return result;
             }
             int set_sy_lfr_n_bp_p0( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sets the time between two basic parameter sets, in s (SY_LFR_N_BP_P0).
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int status;
                 status = LFR_SUCCESSFUL;
                 parameter_dump_packet.sy_lfr_n_bp_p0 = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_BP_P0 ];
                 return status;
             }
             int set_sy_lfr_n_bp_p1(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)
             {
                 /** This function sets the time between two basic parameter sets (autocorrelation + crosscorrelation), in s (sy_lfr_n_bp_p1).
                  *
                  * @param TC points to the TeleCommand packet that is being processed
                  * @param queue_id is the id of the queue which handles TM related to this execution step
                  *
                  */
                 int status;
                 status = LFR_SUCCESSFUL;
                 parameter_dump_packet.sy_lfr_n_bp_p1 = TC->dataAndCRC[ BYTE_POS_SY_LFR_N_BP_P1 ];
                 return status;
             }
             //**********************
             // BURST MODE PARAMETERS
             //*********************
             // SBM1 MODE PARAMETERS
             //*********************
             // SBM2 MODE PARAMETERS
             //**********
             // init dump
             void init_parameter_dump( void )
             {
                 /** This function initialize the parameter_dump_packet global variable with default values.
                  *
                  */
                 parameter_dump_packet.targetLogicalAddress = CCSDS_DESTINATION_ID;
                 parameter_dump_packet.protocolIdentifier = CCSDS_PROTOCOLE_ID;
                 parameter_dump_packet.reserved = CCSDS_RESERVED;
                 parameter_dump_packet.userApplication = CCSDS_USER_APP;
                 parameter_dump_packet.packetID[0] = (unsigned char) (TM_PACKET_ID_PARAMETER_DUMP >> 8);
                 parameter_dump_packet.packetID[1] = (unsigned char) TM_PACKET_ID_PARAMETER_DUMP;
                 parameter_dump_packet.packetSequenceControl[0] = TM_PACKET_SEQ_CTRL_STANDALONE;
                 parameter_dump_packet.packetSequenceControl[1] = TM_PACKET_SEQ_CNT_DEFAULT;
                 parameter_dump_packet.packetLength[0] = (unsigned char) (PACKET_LENGTH_PARAMETER_DUMP >> 8);
                 parameter_dump_packet.packetLength[1] = (unsigned char) PACKET_LENGTH_PARAMETER_DUMP;
                 // DATA FIELD HEADER
                 parameter_dump_packet.spare1_pusVersion_spare2 = SPARE1_PUSVERSION_SPARE2;
                 parameter_dump_packet.serviceType = TM_TYPE_PARAMETER_DUMP;
                 parameter_dump_packet.serviceSubType = TM_SUBTYPE_PARAMETER_DUMP;
                 parameter_dump_packet.destinationID = TM_DESTINATION_ID_GROUND;
                 parameter_dump_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 parameter_dump_packet.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                 parameter_dump_packet.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
                 parameter_dump_packet.time[3] = (unsigned char) (time_management_regs->coarse_time);
                 parameter_dump_packet.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                 parameter_dump_packet.time[5] = (unsigned char) (time_management_regs->fine_time);
                 parameter_dump_packet.sid = SID_PARAMETER_DUMP;
                 //******************
                 // COMMON PARAMETERS
                 parameter_dump_packet.unused0 = DEFAULT_SY_LFR_COMMON0;
                 parameter_dump_packet.bw_sp0_sp1_r0_r1 = DEFAULT_SY_LFR_COMMON1;
                 //******************
                 // NORMAL PARAMETERS
                 parameter_dump_packet.sy_lfr_n_swf_l[0] = (unsigned char) (SY_LFR_N_SWF_L >> 8);
                 parameter_dump_packet.sy_lfr_n_swf_l[1] = (unsigned char) (SY_LFR_N_SWF_L     );
                 parameter_dump_packet.sy_lfr_n_swf_p[0] = (unsigned char) (SY_LFR_N_SWF_P >> 8);
                 parameter_dump_packet.sy_lfr_n_swf_p[1] = (unsigned char) (SY_LFR_N_SWF_P     );
                 parameter_dump_packet.sy_lfr_n_asm_p[0] = (unsigned char) (SY_LFR_N_ASM_P >> 8);
                 parameter_dump_packet.sy_lfr_n_asm_p[1] = (unsigned char) (SY_LFR_N_ASM_P     );
                 parameter_dump_packet.sy_lfr_n_bp_p0 = (unsigned char) SY_LFR_N_BP_P0;
                 parameter_dump_packet.sy_lfr_n_bp_p1 = (unsigned char) SY_LFR_N_BP_P1;
                 //*****************
                 // BURST PARAMETERS
                 parameter_dump_packet.sy_lfr_b_bp_p0 = (unsigned char) DEFAULT_SY_LFR_B_BP_P0;
                 parameter_dump_packet.sy_lfr_b_bp_p1 = (unsigned char) DEFAULT_SY_LFR_B_BP_P1;
                 //****************
                 // SBM1 PARAMETERS
                 parameter_dump_packet.sy_lfr_s1_bp_p0 = (unsigned char) DEFAULT_SY_LFR_S1_BP_P0; // min value is 0.25 s for the period
                 parameter_dump_packet.sy_lfr_s1_bp_p1 = (unsigned char) DEFAULT_SY_LFR_S1_BP_P1;
                 //****************
                 // SBM2 PARAMETERS
                 parameter_dump_packet.sy_lfr_s2_bp_p0 = (unsigned char) DEFAULT_SY_LFR_S2_BP_P0;
                 parameter_dump_packet.sy_lfr_s2_bp_p1 = (unsigned char) DEFAULT_SY_LFR_S2_BP_P1;
             }

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