HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r247:c33dcdaef462

Behaviour changed upon reception of a TC_LFR_ENTER_MODE with a transition...

paul -

r247:c33dcdaef462 R3a

parent child

Context file:

r247:c33dcdaef462

Collapse all files

src/tc_handler.c +3 -1

                  if (transitionCoarseTime == 0)
                  {
-                     waveform_picker_regs->start_date = time_management_regs->coarse_time;
+                     // instant transition means transition on the next valid date
+                     // this is mandatory to have a good snapshot period a a good correction of the snapshot period
+                     waveform_picker_regs->start_date = time_management_regs->coarse_time + 1;
                  }
                  else
                  {

src/wf_handler.c +9 -21

                  rtems_event_set event_out;
                  rtems_id queue_id;
                  rtems_status_code status;
-                 bool resynchronisationEngaged;
                  ring_node *ring_node_swf1_extracted_ptr;
                  ring_node *ring_node_swf2_extracted_ptr;
                  ring_node_swf1_extracted_ptr = (ring_node *) &ring_node_swf1_extracted;
                  ring_node_swf2_extracted_ptr = (ring_node *) &ring_node_swf2_extracted;
-                 resynchronisationEngaged = false;
                  status =  get_message_queue_id_send( &queue_id );
                  if (status != RTEMS_SUCCESSFUL)
                  {
                      // wait for an RTEMS_EVENT
                      rtems_event_receive(RTEMS_EVENT_MODE_NORMAL,
                                          RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
-                     if(resynchronisationEngaged == false)
-                     {   // engage resynchronisation
-                         snapshot_resynchronization( (unsigned char *)  &ring_node_to_send_swf_f0->coarseTime );
-                         resynchronisationEngaged = true;
+                     }
-                     else
-                     {   // reset delta_snapshot to the nominal value
-                         PRINTF("no resynchronisation, reset delta_snapshot to the nominal value\n");
-                         set_wfp_delta_snapshot();
-                         resynchronisationEngaged = false;
+                     }
-                     //
+                     snapshot_resynchronization( (unsigned char *)  &ring_node_to_send_swf_f0->coarseTime );
                      if (event_out == RTEMS_EVENT_MODE_NORMAL)
                      {
                          DEBUG_PRINTF("WFRM received RTEMS_EVENT_MODE_SBM2\n");
                      PRINTF1("in CWF1 *** ERR get_message_queue_id_send %d\n", status)
                  }
-                 BOOT_PRINTF("in CWF1 ***\n")
+                 BOOT_PRINTF("in CWF1 ***\n");
-                         while(1){
+                 while(1){
                      // wait for an RTEMS_EVENT
                      rtems_event_receive( RTEMS_EVENT_MODE_NORM_S1_S2,
                                           RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                  // which tick is the closest
                  if (deltaPreviousTick > deltaNextTick)
                  {
-                     // deltaNext is in [ms]
-                     deltaTickInF2 = floor( (deltaNext_ms * 256. / 1000.) );
+                     // the snapshot center is just before the second => increase delta_snapshot
+                     deltaTickInF2 = ceil( (deltaNext_ms * 256. / 1000.) );
                      waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot + 1 * deltaTickInF2;
                      PRINTF2("correction of = + %u, delta_snapshot = %d\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
                  }
                  else
                  {
-                     // deltaPrevious is in [ms]
-                     deltaTickInF2 = floor( (deltaPrevious_ms * 256. / 1000.) );
+                     // the snapshot center is just after the second => decrease delat_snapshot
+                     deltaTickInF2 = ceil( (deltaPrevious_ms * 256. / 1000.) );
                      waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot - 1 * deltaTickInF2;
                      PRINTF2("correction of = - %u, delta_snapshot = %d\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
                  }

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