##// END OF EJS Templates
3.1.0.1...
paul -
r292:d9dfd2a081bc R3_plus draft
parent child
Show More
@@ -20,7 +20,7 SWVERSION=-1-0
20 DEFINES += SW_VERSION_N1=3 # major
20 DEFINES += SW_VERSION_N1=3 # major
21 DEFINES += SW_VERSION_N2=1 # minor
21 DEFINES += SW_VERSION_N2=1 # minor
22 DEFINES += SW_VERSION_N3=0 # patch
22 DEFINES += SW_VERSION_N3=0 # patch
23 DEFINES += SW_VERSION_N4=0 # internal
23 DEFINES += SW_VERSION_N4=1 # internal
24
24
25 # <GCOV>
25 # <GCOV>
26 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
26 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
@@ -358,6 +358,7 rtems_task prc0_task( rtems_task_argumen
358
358
359 // 3) send the spectral matrix packets
359 // 3) send the spectral matrix packets
360 status = rtems_message_queue_send( queue_id, &current_ring_node_to_send_asm_f0, sizeof( ring_node* ) );
360 status = rtems_message_queue_send( queue_id, &current_ring_node_to_send_asm_f0, sizeof( ring_node* ) );
361
361 // change asm ring node
362 // change asm ring node
362 current_ring_node_to_send_asm_f0 = current_ring_node_to_send_asm_f0->next;
363 current_ring_node_to_send_asm_f0 = current_ring_node_to_send_asm_f0->next;
363 }
364 }
@@ -347,8 +347,10 rtems_task prc1_task( rtems_task_argumen
347 current_ring_node_to_send_asm_f1->coarseTime = incomingMsg->coarseTimeNORM;
347 current_ring_node_to_send_asm_f1->coarseTime = incomingMsg->coarseTimeNORM;
348 current_ring_node_to_send_asm_f1->fineTime = incomingMsg->fineTimeNORM;
348 current_ring_node_to_send_asm_f1->fineTime = incomingMsg->fineTimeNORM;
349 current_ring_node_to_send_asm_f1->sid = SID_NORM_ASM_F1;
349 current_ring_node_to_send_asm_f1->sid = SID_NORM_ASM_F1;
350
350 // 3) send the spectral matrix packets
351 // 3) send the spectral matrix packets
351 status = rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f1, sizeof( ring_node* ) );
352 status = rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f1, sizeof( ring_node* ) );
353
352 // change asm ring node
354 // change asm ring node
353 current_ring_node_to_send_asm_f1 = current_ring_node_to_send_asm_f1->next;
355 current_ring_node_to_send_asm_f1 = current_ring_node_to_send_asm_f1->next;
354 }
356 }
@@ -233,8 +233,10 rtems_task prc2_task( rtems_task_argumen
233 current_ring_node_to_send_asm_f2->coarseTime = incomingMsg->coarseTimeNORM;
233 current_ring_node_to_send_asm_f2->coarseTime = incomingMsg->coarseTimeNORM;
234 current_ring_node_to_send_asm_f2->fineTime = incomingMsg->fineTimeNORM;
234 current_ring_node_to_send_asm_f2->fineTime = incomingMsg->fineTimeNORM;
235 current_ring_node_to_send_asm_f2->sid = SID_NORM_ASM_F2;
235 current_ring_node_to_send_asm_f2->sid = SID_NORM_ASM_F2;
236
236 // 3) send the spectral matrix packets
237 // 3) send the spectral matrix packets
237 status = rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f2, sizeof( ring_node* ) );
238 status = rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f2, sizeof( ring_node* ) );
239
238 // change asm ring node
240 // change asm ring node
239 current_ring_node_to_send_asm_f2 = current_ring_node_to_send_asm_f2->next;
241 current_ring_node_to_send_asm_f2 = current_ring_node_to_send_asm_f2->next;
240 }
242 }
@@ -404,7 +404,7 rtems_task cwf3_task(rtems_task_argument
404 ring_node_cwf3_light.sid = SID_NORM_CWF_F3;
404 ring_node_cwf3_light.sid = SID_NORM_CWF_F3;
405 ring_node_cwf3_light.status = 0x00;
405 ring_node_cwf3_light.status = 0x00;
406
406
407 BOOT_PRINTF("in CWF3 ***\n")
407 BOOT_PRINTF("in CWF3 ***\n");
408
408
409 while(1){
409 while(1){
410 // wait for an RTEMS_EVENT
410 // wait for an RTEMS_EVENT
@@ -416,13 +416,13 rtems_task cwf3_task(rtems_task_argument
416 ring_node_to_send_cwf = getRingNodeToSendCWF( 3 );
416 ring_node_to_send_cwf = getRingNodeToSendCWF( 3 );
417 if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x01)
417 if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x01)
418 {
418 {
419 PRINTF("send CWF_LONG_F3\n")
419 PRINTF("send CWF_LONG_F3\n");
420 ring_node_to_send_cwf_f3->sid = SID_NORM_CWF_LONG_F3;
420 ring_node_to_send_cwf_f3->sid = SID_NORM_CWF_LONG_F3;
421 status = rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
421 status = rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
422 }
422 }
423 else
423 else
424 {
424 {
425 PRINTF("send CWF_F3 (light)\n")
425 PRINTF("send CWF_F3 (light)\n");
426 send_waveform_CWF3_light( ring_node_to_send_cwf, &ring_node_cwf3_light, queue_id );
426 send_waveform_CWF3_light( ring_node_to_send_cwf, &ring_node_cwf3_light, queue_id );
427 }
427 }
428
428
@@ -460,7 +460,7 rtems_task cwf2_task(rtems_task_argument
460 PRINTF1("in CWF2 *** ERR get_message_queue_id_send %d\n", status)
460 PRINTF1("in CWF2 *** ERR get_message_queue_id_send %d\n", status)
461 }
461 }
462
462
463 BOOT_PRINTF("in CWF2 ***\n")
463 BOOT_PRINTF("in CWF2 ***\n");
464
464
465 while(1){
465 while(1){
466 // wait for an RTEMS_EVENT// send the snapshot when built
466 // wait for an RTEMS_EVENT// send the snapshot when built
@@ -469,15 +469,19 rtems_task cwf2_task(rtems_task_argument
469 RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
469 RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
470 ring_node_to_send = getRingNodeToSendCWF( 2 );
470 ring_node_to_send = getRingNodeToSendCWF( 2 );
471 if (event_out == RTEMS_EVENT_MODE_BURST)
471 if (event_out == RTEMS_EVENT_MODE_BURST)
472 {
472 { // data are sent whatever the transition time
473 status = rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
473 status = rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
474 }
474 }
475 else if (event_out == RTEMS_EVENT_MODE_NORM_S1_S2)
475 else if (event_out == RTEMS_EVENT_MODE_NORM_S1_S2)
476 {
476 {
477 if ( lfrCurrentMode == LFR_MODE_SBM2 )
477 if ( lfrCurrentMode == LFR_MODE_SBM2 )
478 {
478 {
479 // data are sent depending on the transition time
480 if ( time_management_regs->coarse_time >= lastValidEnterModeTime)
481 {
479 status = rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
482 status = rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
480 }
483 }
484 }
481 // launch snapshot extraction if needed
485 // launch snapshot extraction if needed
482 if (extractSWF2 == true)
486 if (extractSWF2 == true)
483 {
487 {
@@ -532,10 +536,10 rtems_task cwf1_task(rtems_task_argument
532 ring_node_to_send_cwf_f1->sid = SID_SBM1_CWF_F1;
536 ring_node_to_send_cwf_f1->sid = SID_SBM1_CWF_F1;
533 if (lfrCurrentMode == LFR_MODE_SBM1)
537 if (lfrCurrentMode == LFR_MODE_SBM1)
534 {
538 {
539 // data are sent depending on the transition time
540 if ( time_management_regs->coarse_time >= lastValidEnterModeTime )
541 {
535 status = rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
542 status = rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
536 if (status != 0)
537 {
538 PRINTF("cwf sending failed\n")
539 }
543 }
540 }
544 }
541 // launch snapshot extraction if needed
545 // launch snapshot extraction if needed
General Comments 0
You need to be logged in to leave comments. Login now