HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r292:d9dfd2a081bc

3.1.0.1...

paul -

r292:d9dfd2a081bc R3_plus

parent child

Context file:

r292:d9dfd2a081bc

Collapse all files

FSW-qt/fsw-qt.pro +1 -1

              DEFINES += SW_VERSION_N1=3 # major
              DEFINES += SW_VERSION_N2=1 # minor
              DEFINES += SW_VERSION_N3=0 # patch
-             DEFINES += SW_VERSION_N4=0 # internal
+             DEFINES += SW_VERSION_N4=1 # internal
              # <GCOV>
              #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

src/processing/avf0_prc0.c +1 0

                          // 3) send the spectral matrix packets
                          status =  rtems_message_queue_send( queue_id, &current_ring_node_to_send_asm_f0, sizeof( ring_node* ) );
                          // change asm ring node
                          current_ring_node_to_send_asm_f0 = current_ring_node_to_send_asm_f0->next;
                      }

src/processing/avf1_prc1.c +2 0

                          current_ring_node_to_send_asm_f1->coarseTime    = incomingMsg->coarseTimeNORM;
                          current_ring_node_to_send_asm_f1->fineTime      = incomingMsg->fineTimeNORM;
                          current_ring_node_to_send_asm_f1->sid           = SID_NORM_ASM_F1;
                          // 3) send the spectral matrix packets
                          status =  rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f1, sizeof( ring_node* ) );
                          // change asm ring node
                          current_ring_node_to_send_asm_f1 = current_ring_node_to_send_asm_f1->next;
                      }

src/processing/avf2_prc2.c +2 0

                          current_ring_node_to_send_asm_f2->coarseTime    = incomingMsg->coarseTimeNORM;
                          current_ring_node_to_send_asm_f2->fineTime      = incomingMsg->fineTimeNORM;
                          current_ring_node_to_send_asm_f2->sid           = SID_NORM_ASM_F2;
                          // 3) send the spectral matrix packets
                          status =  rtems_message_queue_send( queue_id_send, &current_ring_node_to_send_asm_f2, sizeof( ring_node* ) );
                          // change asm ring node
                          current_ring_node_to_send_asm_f2 = current_ring_node_to_send_asm_f2->next;
                      }

src/wf_handler.c +17 -13

                  ring_node_cwf3_light.sid = SID_NORM_CWF_F3;
                  ring_node_cwf3_light.status = 0x00;
-                 BOOT_PRINTF("in CWF3 ***\n")
+                 BOOT_PRINTF("in CWF3 ***\n");
-                         while(1){
+                 while(1){
                      // wait for an RTEMS_EVENT
                      rtems_event_receive( RTEMS_EVENT_0,
                                           RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                          ring_node_to_send_cwf = getRingNodeToSendCWF( 3 );
                          if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x01)
                          {
-                             PRINTF("send CWF_LONG_F3\n")
-                                     ring_node_to_send_cwf_f3->sid = SID_NORM_CWF_LONG_F3;
+                             PRINTF("send CWF_LONG_F3\n");
+                             ring_node_to_send_cwf_f3->sid = SID_NORM_CWF_LONG_F3;
                              status =  rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
                          }
                          else
                          {
-                             PRINTF("send CWF_F3 (light)\n")
-                                     send_waveform_CWF3_light( ring_node_to_send_cwf, &ring_node_cwf3_light, queue_id );
+                             PRINTF("send CWF_F3 (light)\n");
+                             send_waveform_CWF3_light( ring_node_to_send_cwf, &ring_node_cwf3_light, queue_id );
                          }
                      }
                      PRINTF1("in CWF2 *** ERR get_message_queue_id_send %d\n", status)
                  }
-                 BOOT_PRINTF("in CWF2 ***\n")
+                 BOOT_PRINTF("in CWF2 ***\n");
-                         while(1){
+                 while(1){
                      // wait for an RTEMS_EVENT// send the snapshot when built
                      status = rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_SBM2 );
                      rtems_event_receive( RTEMS_EVENT_MODE_NORM_S1_S2 | RTEMS_EVENT_MODE_BURST,
                                           RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                      ring_node_to_send = getRingNodeToSendCWF( 2 );
                      if (event_out == RTEMS_EVENT_MODE_BURST)
+                     {
+                     {   // data are sent whatever the transition time
                          status =  rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
                      }
                      else if (event_out == RTEMS_EVENT_MODE_NORM_S1_S2)
                      {
                          if ( lfrCurrentMode == LFR_MODE_SBM2 )
                          {
-                             status =  rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
+                             // data are sent depending on the transition time
+                             if ( time_management_regs->coarse_time >= lastValidEnterModeTime)
+                             {
+                                 status =  rtems_message_queue_send( queue_id, &ring_node_to_send, sizeof( ring_node* ) );
+                             }
                          }
                          // launch snapshot extraction if needed
                          if (extractSWF2 == true)
                      ring_node_to_send_cwf_f1->sid = SID_SBM1_CWF_F1;
                      if (lfrCurrentMode == LFR_MODE_SBM1)
                      {
-                         status =  rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
-                         if (status != 0)
+                         // data are sent depending on the transition time
+                         if ( time_management_regs->coarse_time >= lastValidEnterModeTime )
                          {
-                             PRINTF("cwf sending failed\n")
+                             status =  rtems_message_queue_send( queue_id, &ring_node_to_send_cwf, sizeof( ring_node* ) );
                          }
                      }
                      // launch snapshot extraction if needed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages