HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r257:132f1c3627d7

snapshot resynchro changed...

paul -

r257:132f1c3627d7 R3a

parent child

Context file:

r257:132f1c3627d7

Collapse all files

.hgsubstate +1 -1

		@@ -1,2 +1,2
1	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2		80d727bb9d808ae67c801c4c6101811d68b94af6 header/lfr_common_headers
	2	4ffa7549495b4d1e5ddbda520569468a5e3b8779 header/lfr_common_headers

header/wf_handler.h +2 0

                                            unsigned int sid, unsigned char pa_lfr_pkt_nr, unsigned char *acquisitionTime );
              void build_snapshot_from_ring(ring_node *ring_node_to_send, unsigned char frequencyChannel ,
                                            unsigned long long acquisitionTimeF0_asLong, ring_node *ring_node_swf_extracted, int *swf_extracted);
+             double computeCorrection( unsigned char *timePtr );
+             void applyCorrection( double correction );
              void snapshot_resynchronization( unsigned char *timePtr );
              //
              rtems_id get_pkts_queue_id( void );

src/fsw_init.c +3 0

                  set_hk_lfr_sc_potential_flag( true );
+                 // start the timer used for the detection of missing parameters (started also by the timecode_irq_handler ISR)
+                 status = rtems_timer_fire_after( timecode_timer_id, TIMECODE_TIMER_TIMEOUT, timecode_timer_routine, NULL );
                  status = rtems_task_delete(RTEMS_SELF);
              }

src/tc_handler.c +11 0

              void update_last_valid_transition_date( unsigned int transitionCoarseTime )
              {
+                 if (transitionCoarseTime == 0)
+                 {
+                     lastValidEnterModeTime = time_management_regs->coarse_time + 1;
+                     PRINTF1("lastValidEnterModeTime = 0x%x (transitionCoarseTime = 0 => coarse_time+1)\n", transitionCoarseTime);
+                 }
+                 else
+                 {
                  lastValidEnterModeTime = transitionCoarseTime;
                  PRINTF1("lastValidEnterModeTime = 0x%x\n", transitionCoarseTime);
              }
+             }
              int check_transition_date( unsigned int transitionCoarseTime )
              {
              void launch_waveform_picker( unsigned char mode, unsigned int transitionCoarseTime )
              {
                  WFP_reset_current_ring_nodes();
                  reset_waveform_picker_regs();
                      waveform_picker_regs->start_date = transitionCoarseTime;
                  }
+                 update_last_valid_transition_date(waveform_picker_regs->start_date);
              }
              void launch_spectral_matrix( void )

src/wf_handler.c +72 -24

              typedef enum resynchro_state_t
              {
-                 IDLE,
-                 MEASURE_K,
-                 MEASURE_K_PLUS_1,
+                 MEASURE_0,
+                 MEASURE_1,
+                 CORRECTION_0,
+                 CORRECTION_1
              } resynchro_state;
              //*********************
                  }
              }
-             void snapshot_resynchronization( unsigned char *timePtr )
+             double computeCorrection( unsigned char *timePtr )
              {
                  unsigned long long int acquisitionTime;
                  unsigned long long int centerTime;
                  unsigned long long int nextTick;
                  unsigned long long int deltaPreviousTick;
                  unsigned long long int deltaNextTick;
-                 int deltaTickInF2;
                  double deltaPrevious_ms;
                  double deltaNext_ms;
                  double correctionInF2;
-                 double center_k = 0.;
-                 double cnter_k_plus_1 = 0.;
-                 static resynchro_state state = IDLE;
-                 static unsigned char resynchroEngaged = 0;
-                 if (resynchroEngaged == 0)
+                 {
-                     resynchroEngaged = 1;
-                     // get acquisition time in fine time ticks
-                     acquisitionTime = get_acquisition_time( timePtr );
-                     deltaPrevious_ms    = ((double) deltaPreviousTick) / 65536. * 1000.;
-                     deltaNext_ms        = ((double) deltaNextTick) / 65536. * 1000.;
-                     PRINTF2("delta previous = %f ms, delta next = %f ms\n", deltaPrevious_ms, deltaNext_ms);
-                     PRINTF2("delta previous = %llu fine time ticks, delta next = %llu fine time ticks\n", deltaPreviousTick, deltaNextTick);
+                 PRINTF2("    delta previous = %.3f ms, delta next = %.2f ms\n", deltaPrevious_ms, deltaNext_ms);
+             //    PRINTF2("    delta previous = %llu fine time ticks, delta next = %llu fine time ticks\n",
+             //            deltaPreviousTick, deltaNextTick);
-                     // which tick is the closest?
-                     if (deltaPreviousTick > deltaNextTick)
-                         correctionInF2 = - (deltaPrevious_ms * 256. / 1000. );
-                     }
-                     if (correctionInF2 >=0 )
+                 PRINTF1("    correctionInF2 = %.2f\n", correctionInF2);
+                 return correctionInF2;
+             }
+             void applyCorrection( double correction )
                      {
-                         deltaTickInF2 = ceil( correctionInF2 );
+                 int correctionInt;
+                 if (correction>=0)
+                 {
+                     correctionInt = floor(correction);
-                     }
-                     else
-                     {
-                         deltaTickInF2 = floor( correctionInF2 );
+                     correctionInt =  ceil(correction);
+                 }
+                 waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot + correctionInt;
+                 //set_wfp_delta_f0_f0_2();
                      }
-                     waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot + deltaTickInF2;
-                     set_wfp_delta_f0_f0_2(); // this is necessary to reset the value of delta_f0 as delta_snapshot has been changed
-                     PRINTF2("Correction of = %d, delta_snapshot = %d\n\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
+                 }
-                 else
+             void snapshot_resynchronization( unsigned char *timePtr )
+             {
+                 static double correction    = 0.;
+                 static double delay_0       = 0.;
+                 static resynchro_state state = MEASURE_0;
+                 int correctionInt;
+                 correctionInt = 0;
+                 switch (state)
                  {
-                     PRINTF1("No resynchro, delta_snapshot = %d\n\n", waveform_picker_regs->delta_snapshot);
-                     resynchroEngaged = 0;
+                 case MEASURE_0:
+                     // ********
+                     PRINTF("MEASURE_0 ===\n");
+                     state = CORRECTION_0;
+                     delay_0 = computeCorrection( timePtr );
+                     correction = delay_0;
+                     PRINTF1("MEASURE_0 === correction = %.2f\n", correction );
+                     applyCorrection( correction );
+                     PRINTF1("MEASURE_0 === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
+                     //****
+                     break;
+                 case CORRECTION_0:
+                     //************
+                     PRINTF("CORRECTION_0 ===\n");
+                     state = CORRECTION_1;
+                     computeCorrection( timePtr );
+                     correction = -correction;
+                     PRINTF1("CORRECTION_0 === correction = %.2f\n", correction );
+                     applyCorrection( correction );
+                     PRINTF1("CORRECTION_0 === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
+                     //****
+                     break;
+                 case CORRECTION_1:
+                     //************
+                     PRINTF("CORRECTION_1 ===\n");
+                     state = MEASURE_0;
+                     computeCorrection( timePtr );
+                     PRINTF1("CORRECTION_1 === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
+                     //****
+                     break;
+                 default:
+                     break;
                  }
              }

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