HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r206:f4c6f6db73fc

Bug , hk_sy_lfr_calib_enabled is set in TM_LFR_HK packets

paul -

r206:f4c6f6db73fc R3

parent child

Context file:

r206:f4c6f6db73fc

Collapse all files

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

             DEFINES += SW_VERSION_N1=3 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=2 # internal
+            DEFINES += SW_VERSION_N4=3 # internal
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

header/grlib_regs.h +2 -2

                 volatile unsigned int calData;
             } time_management_regs_t;
-            // PDB >= 0.1.28
+            // PDB >= 0.1.28, 0x80000f54
             typedef struct{
                 int data_shaping;       // 0x00 00 *** R1 R0 SP1 SP0 BW
                 int run_burst_enable;   // 0x04 01 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
                 volatile unsigned int f2_1_coarse_time; // 0x74
                 volatile unsigned int f2_1_fine_time;   // 0x78
                 //
-                volatile unsigned int f3_0_coarse_time; // 0x7c
+                volatile unsigned int f3_0_coarse_time; // 0x7c => 0x7c + 0xf54 = 0xd0
                 volatile unsigned int f3_0_fine_time;   // 0x80
                 volatile unsigned int f3_1_coarse_time; // 0x84
                 volatile unsigned int f3_1_fine_time;   // 0x88

header/tc_handler.h +2 -2

             void setCalibrationReload( bool state);
             void setCalibrationEnable( bool state );
             void setCalibrationInterleaved( bool state );
-            void startCalibration( void );
+            void setCalibration( bool state );
-            void stopCalibration( void );
+            void set_hk_lfr_calib_enable( bool state );
             void configureCalibration( bool interleaved );
             //
             void update_last_TC_exe( ccsdsTelecommandPacket_t *TC , unsigned char *time );

src/tc_handler.c +22 -6

                 result = LFR_DEFAULT;
-                startCalibration();
+                setCalibration( true );
                 result = LFR_SUCCESSFUL;
                 result = LFR_DEFAULT;
-                stopCalibration();
+                setCalibration( false );
                 result = LFR_SUCCESSFUL;
                 }
             }
-            void startCalibration( void )
+            void setCalibration( bool state )
+            {
+                if (state == true)
                 {
                     setCalibrationEnable( true );
                     setCalibrationReload( false );
+                    set_hk_lfr_calib_enable( true );
                 }
+                else
-            void stopCalibration( void )
                 {
                     setCalibrationEnable( false );
                     setCalibrationReload( true );
+                    set_hk_lfr_calib_enable( false );
+                }
+            }
+            void set_hk_lfr_calib_enable( bool state )
+            {
+                if (state == true)
+                {
+                    housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1] | 0x08;   // [0000 1000]
+                }
+                else
+                {
+                    housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1] & 0xf7;   // [1111 0111]
+                }
             }
             void configureCalibration( bool interleaved )
             {
-                stopCalibration();
+                setCalibration( false );
                 if ( interleaved == true )
                 {
                     setCalibrationInterleaved( true );

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