##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » LFR_FSW
RSS

Fork of HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE

Clone from https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE

Bug 354, hk_sy_lfr_calib_enabled is set in TM_LFR_HK packets
paul -
r206:f4c6f6db73fc R3
parent child
Show More
Show file before | Show file after | Hide comments
@@ -12,7 +12,7 SWVERSION=-1-0
12 12 DEFINES += SW_VERSION_N1=3 # major
13 13 DEFINES += SW_VERSION_N2=0 # minor
14 14 DEFINES += SW_VERSION_N3=0 # patch
15 DEFINES += SW_VERSION_N4=2 # internal
15 DEFINES += SW_VERSION_N4=3 # internal
16 16
17 17 # <GCOV>
18 18 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
Show file before | Show file after | Hide comments
@@ -57,7 +57,7 typedef struct {
57 57 volatile unsigned int calData;
58 58 } time_management_regs_t;
59 59
60 // PDB >= 0.1.28
60 // PDB >= 0.1.28, 0x80000f54
61 61 typedef struct{
62 62 int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
63 63 int run_burst_enable; // 0x04 01 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
@@ -94,7 +94,7 typedef struct{
94 94 volatile unsigned int f2_1_coarse_time; // 0x74
95 95 volatile unsigned int f2_1_fine_time; // 0x78
96 96 //
97 volatile unsigned int f3_0_coarse_time; // 0x7c
97 volatile unsigned int f3_0_coarse_time; // 0x7c => 0x7c + 0xf54 = 0xd0
98 98 volatile unsigned int f3_0_fine_time; // 0x80
99 99 volatile unsigned int f3_1_coarse_time; // 0x84
100 100 volatile unsigned int f3_1_fine_time; // 0x88
Show file before | Show file after | Hide comments
@@ -55,8 +55,8 void setCalibrationData( void );
55 55 void setCalibrationReload( bool state);
56 56 void setCalibrationEnable( bool state );
57 57 void setCalibrationInterleaved( bool state );
58 void startCalibration( void );
59 void stopCalibration( void );
58 void setCalibration( bool state );
59 void set_hk_lfr_calib_enable( bool state );
60 60 void configureCalibration( bool interleaved );
61 61 //
62 62 void update_last_TC_exe( ccsdsTelecommandPacket_t *TC , unsigned char *time );
Show file before | Show file after | Hide comments
@@ -272,7 +272,7 int action_enable_calibration(ccsdsTelec
272 272
273 273 result = LFR_DEFAULT;
274 274
275 startCalibration();
275 setCalibration( true );
276 276
277 277 result = LFR_SUCCESSFUL;
278 278
@@ -292,7 +292,7 int action_disable_calibration(ccsdsTele
292 292
293 293 result = LFR_DEFAULT;
294 294
295 stopCalibration();
295 setCalibration( false );
296 296
297 297 result = LFR_SUCCESSFUL;
298 298
@@ -981,21 +981,37 void setCalibrationInterleaved( bool sta
981 981 }
982 982 }
983 983
984 void startCalibration( void )
984 void setCalibration( bool state )
985 985 {
986 setCalibrationEnable( true );
987 setCalibrationReload( false );
986 if (state == true)
987 {
988 setCalibrationEnable( true );
989 setCalibrationReload( false );
990 set_hk_lfr_calib_enable( true );
991 }
992 else
993 {
994 setCalibrationEnable( false );
995 setCalibrationReload( true );
996 set_hk_lfr_calib_enable( false );
997 }
988 998 }
989 999
990 void stopCalibration( void )
1000 void set_hk_lfr_calib_enable( bool state )
991 1001 {
992 setCalibrationEnable( false );
993 setCalibrationReload( true );
1002 if (state == true)
1003 {
1004 housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1] | 0x08; // [0000 1000]
1005 }
1006 else
1007 {
1008 housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1] & 0xf7; // [1111 0111]
1009 }
994 1010 }
995 1011
996 1012 void configureCalibration( bool interleaved )
997 1013 {
998 stopCalibration();
1014 setCalibration( false );
999 1015 if ( interleaved == true )
1000 1016 {
1001 1017 setCalibrationInterleaved( true );
General Comments 0
You need to be logged in to leave comments. Login now