@@ -0,0 +1,2 | |||
|
1 | header/common_lfr_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/lfr_common_headers | |
|
2 |
@@ -0,0 +1,1 | |||
|
1 | 0000000000000000000000000000000000000000 header/common_lfr_headers |
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
1 | NO CONTENT: new file 100644, binary diff hidden |
@@ -11,4 +11,4 doc | |||
|
11 | 11 | *.srec |
|
12 | 12 | FSW-qt/bin/fsw |
|
13 | 13 | src/LFR_basic-parameters |
|
14 | ||
|
14 | *.pro.user.* |
@@ -1,6 +1,6 | |||
|
1 | 1 | ############################################################################# |
|
2 | 2 | # Makefile for building: bin/fsw |
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.6) on: |
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.6) on: Wed Nov 26 13:14:53 2014 | |
|
4 | 4 | # Project: fsw-qt.pro |
|
5 | 5 | # Template: app |
|
6 | 6 | # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro |
@@ -1,6 +1,6 | |||
|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
|
2 | 2 | <!DOCTYPE QtCreatorProject> |
|
3 |
<!-- Written by QtCreator 3.2.1, 2014-1 |
|
|
3 | <!-- Written by QtCreator 3.2.1, 2014-12-10T17:20:49. --> | |
|
4 | 4 | <qtcreator> |
|
5 | 5 | <data> |
|
6 | 6 | <variable>EnvironmentId</variable> |
@@ -266,7 +266,7 rtems_task dumb_task( rtems_task_argumen | |||
|
266 | 266 | "in DUMB *** in SMIQ *** Error sending event to AVF0", // RTEMS_EVENT_3 |
|
267 | 267 | "in DUMB *** spectral_matrices_isr *** Error sending event to SMIQ", // RTEMS_EVENT_4 |
|
268 | 268 | "in DUMB *** waveforms_simulator_isr", // RTEMS_EVENT_5 |
|
269 |
" |
|
|
269 | "VHDL SM *** two buffers f0 ready", // RTEMS_EVENT_6 | |
|
270 | 270 | "ready for dump", // RTEMS_EVENT_7 |
|
271 | 271 | "VHDL ERR *** spectral matrix", // RTEMS_EVENT_8 |
|
272 | 272 | "tick", // RTEMS_EVENT_9 |
@@ -50,6 +50,8 void spectral_matrices_isr_f0( void ) | |||
|
50 | 50 | case 0: |
|
51 | 51 | break; |
|
52 | 52 | case 3: |
|
53 | // send a message if two buffers are ready | |
|
54 | rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_6 ); | |
|
53 | 55 | if ( time_0 < time_1 ) |
|
54 | 56 | { |
|
55 | 57 | close_matrix_actions( &nb_sm_f0, NB_SM_BEFORE_AVF0, Task_id[TASKID_AVF0], |
@@ -175,12 +177,14 void spectral_matrices_isr_f2( void ) | |||
|
175 | 177 | |
|
176 | 178 | void spectral_matrix_isr_error_handler( void ) |
|
177 | 179 | { |
|
178 | rtems_status_code status_code; | |
|
180 | // rtems_status_code status_code; | |
|
179 | 181 | |
|
180 | if (spectral_matrix_regs->status & 0x7c0) // [0111 1100 0000] | |
|
181 | { | |
|
182 | status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_8 ); | |
|
183 | } | |
|
182 | // if (spectral_matrix_regs->status & 0x7c0) // [0111 1100 0000] | |
|
183 | // { | |
|
184 | // status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_8 ); | |
|
185 | // } | |
|
186 | ||
|
187 | // spectral_matrix_regs->status = spectral_matrix_regs->status & 0x7c0; | |
|
184 | 188 | } |
|
185 | 189 | |
|
186 | 190 | rtems_isr spectral_matrices_isr( rtems_vector_number vector ) |
@@ -197,7 +201,7 rtems_isr spectral_matrices_isr( rtems_v | |||
|
197 | 201 | |
|
198 | 202 | spectral_matrices_isr_f2(); |
|
199 | 203 | |
|
200 |
|
|
|
204 | spectral_matrix_isr_error_handler(); | |
|
201 | 205 | } |
|
202 | 206 | |
|
203 | 207 | rtems_isr spectral_matrices_isr_simu( rtems_vector_number vector ) |
@@ -442,13 +442,13 rtems_task wfrm_task(rtems_task_argument | |||
|
442 | 442 | RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out); |
|
443 | 443 | if(resynchronisationEngaged == false) |
|
444 | 444 | { // engage resynchronisation |
|
445 | snapshot_resynchronization( (unsigned char *) ring_node_to_send_swf_f0->coarseTime ); | |
|
445 | // snapshot_resynchronization( (unsigned char *) ring_node_to_send_swf_f0->coarseTime ); | |
|
446 | 446 | resynchronisationEngaged = true; |
|
447 | 447 | } |
|
448 | 448 | else |
|
449 | 449 | { // reset delta_snapshot to the nominal value |
|
450 | 450 | PRINTF("no resynchronisation, reset delta_snapshot to the nominal value\n") |
|
451 | set_wfp_delta_snapshot(); | |
|
451 | // set_wfp_delta_snapshot(); | |
|
452 | 452 | resynchronisationEngaged = false; |
|
453 | 453 | } |
|
454 | 454 | // |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed | |
This diff has been collapsed as it changes many lines, (670 lines changed) Show them Hide them |
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
1 | NO CONTENT: file was removed, binary diff hidden |
General Comments 0
You need to be logged in to leave comments.
Login now