##// 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

Minor bugs corrected before logiscope analysis
paul -
r322:c0603702c8c8 R3_plus draft
parent child
Show More
Show file before | Show file after | Hide comments
@@ -70,10 +70,10 extern gptimer_regs_t *gptimer_regs;
70 70 extern void ASR16_get_FPRF_IURF_ErrorCounters( unsigned int*, unsigned int* );
71 71 extern void CCR_getInstructionAndDataErrorCounters( unsigned int*, unsigned int* );
72 72
73 rtems_name name_hk_rate_monotonic = 0; // name of the HK rate monotonic
74 rtems_id HK_id = RTEMS_ID_NONE;// id of the HK rate monotonic period
75 rtems_name name_avgv_rate_monotonic = 0; // name of the AVGV rate monotonic
76 rtems_id AVGV_id = RTEMS_ID_NONE;// id of the AVGV rate monotonic period
73 extern rtems_name name_hk_rate_monotonic; // name of the HK rate monotonic
74 extern rtems_id HK_id;// id of the HK rate monotonic period
75 extern rtems_name name_avgv_rate_monotonic; // name of the AVGV rate monotonic
76 extern rtems_id AVGV_id;// id of the AVGV rate monotonic period
77 77
78 78 void timer_configure( unsigned char timer, unsigned int clock_divider,
79 79 unsigned char interrupt_level, rtems_isr (*timer_isr)() );
Show file before | Show file after | Hide comments
@@ -29,8 +29,12
29 29 rtems_name misc_name[NB_OF_MISC_NAMES] = {0};
30 30 rtems_name Task_name[NB_OF_TASKS] = {0}; /* array of task names */
31 31 rtems_id Task_id[NB_OF_TASKS] = {0}; /* array of task ids */
32 rtems_name timecode_timer_name = {0};
33 rtems_id timecode_timer_id = {0};
32 rtems_name timecode_timer_name = 0;
33 rtems_id timecode_timer_id = RTEMS_ID_NONE;
34 rtems_name name_hk_rate_monotonic = 0; // name of the HK rate monotonic
35 rtems_id HK_id = RTEMS_ID_NONE;// id of the HK rate monotonic period
36 rtems_name name_avgv_rate_monotonic = 0; // name of the AVGV rate monotonic
37 rtems_id AVGV_id = RTEMS_ID_NONE;// id of the AVGV rate monotonic period
34 38 int fdSPW = 0;
35 39 int fdUART = 0;
36 40 unsigned char lfrCurrentMode = 0;
Show file before | Show file after | Hide comments
@@ -19,7 +19,7 rtems_id semq_id = RTEMS_ID_NONE;
19 19 //*****************
20 20 // waveform headers
21 21 Header_TM_LFR_SCIENCE_CWF_t headerCWF = {0};
22 Header_TM_LFR_SCIENCE_SWF_t headerSW = {0};
22 Header_TM_LFR_SCIENCE_SWF_t headerSWF = {0};
23 23 Header_TM_LFR_SCIENCE_ASM_t headerASM = {0};
24 24
25 25 unsigned char previousTimecodeCtr = 0;
Show file before | Show file after | Hide comments
@@ -1382,6 +1382,8 void setCalibrationData( void )
1382 1382
1383 1383 time_management_regs->calDataPtr = INIT_CHAR;
1384 1384
1385 Ts = 1 / CAL_FS;
1386
1385 1387 // build the signal for the SCM calibration
1386 1388 for (k = 0; k < CAL_NB_PTS; k++)
1387 1389 {
@@ -1414,7 +1416,7 void setCalibrationDataInterleaved( void
1414 1416 unsigned short data[CAL_NB_PTS_INTER];
1415 1417 unsigned char *dataPtr;
1416 1418
1417 Ts = 1. / CAL_FS_INTER;
1419 Ts = 1 / CAL_FS_INTER;
1418 1420
1419 1421 time_management_regs->calDataPtr = INIT_CHAR;
1420 1422
General Comments 0
You need to be logged in to leave comments. Login now