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