HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r141:f42e189444ed

Bug

paul -

r141:f42e189444ed VHDLib206

parent child

Context file:

r141:f42e189444ed

Collapse all files

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

             DEFINES += SW_VERSION_N1=1 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=8 # internal
+            DEFINES += SW_VERSION_N4=9 # internal
             contains( CONFIG, debug_tch ) {
                 DEFINES += DEBUG_TCH

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-06-10T21:00:41. -->
+            <!-- Written by QtCreator 3.0.1, 2014-06-12T07:00:58. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
              <data>
               <variable>ProjectExplorer.Project.Target.0</variable>
               <valuemap type="QVariantMap">
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 4.8.3 in PATH (System)</value>
+               <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.3 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">{be73cf6a-f9d8-4d5a-8adf-adc2d83e2e44}</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5289e843-9ef2-45ce-88c6-ad27d8e08def}</value>
                <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-              <value type="QByteArray">{cdbf9cdc-1e84-406e-889b-c4feef49e75c}</value>
+              <value type="QByteArray">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

header/ccsds_types.h +2 -2

             #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM_F0         (2228 - CCSDS_TC_TM_PACKET_OFFSET)  // 44 * 25 * 2 + 28
             #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM_F1         (2628 - CCSDS_TC_TM_PACKET_OFFSET)  // 52 * 25 * 2 + 28
             #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM_F2         (2428 - CCSDS_TC_TM_PACKET_OFFSET)  // 48 * 25 * 2 + 28
-            #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0    (126  - CCSDS_TC_TM_PACKET_OFFSET)  // 11 * 9      + 27
+            #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0    (126  - CCSDS_TC_TM_PACKET_OFFSET)  // 11 * 9      + 27 (1 spare bit in the header)
             #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0    (356  - CCSDS_TC_TM_PACKET_OFFSET)  // 11 * 30     + 26
-            #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1    (144  - CCSDS_TC_TM_PACKET_OFFSET)  // 13 * 9      + 27
+            #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1    (144  - CCSDS_TC_TM_PACKET_OFFSET)  // 13 * 9      + 27 (1 spare bit in the header)
             #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1    (416  - CCSDS_TC_TM_PACKET_OFFSET)  // 13 * 30     + 26
             #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2    (134  - CCSDS_TC_TM_PACKET_OFFSET)  // 12 * 9      + 26
             #define PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2    (386  - CCSDS_TC_TM_PACKET_OFFSET)  // 12 * 30     + 26

src/processing/avf1_prc1.c +2 -2

                 {
                     BP_init_header( &packet_sbm_bp1.header,
                                     APID_TM_SCIENCE_NORMAL_BURST, SID_BURST_BP1_F1,
-                                    PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0, NB_BINS_COMPRESSED_SM_SBM_F1);
+                                    PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1, NB_BINS_COMPRESSED_SM_SBM_F1);
                     BP_init_header( &packet_sbm_bp2.header,
                                     APID_TM_SCIENCE_NORMAL_BURST, SID_BURST_BP2_F1,
-                                    PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0, NB_BINS_COMPRESSED_SM_SBM_F1);
+                                    PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1, NB_BINS_COMPRESSED_SM_SBM_F1);
                 }
                 else if ( lfrRequestedMode == LFR_MODE_SBM2 )
                 {

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