HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r267:3616e7d285c0

Snapshot resynchro modified

paul -

r267:3616e7d285c0 R3a

parent child

Context file:

r267:3616e7d285c0

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	b0e42058c39c77fc42a5bd3bf529e4547497c4c3 header/lfr_common_headers	2	449d1ebc41af2e62571508883dab8043a33f16df header/lfr_common_headers

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

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

header/grlib_regs.h +1 -1

                 int addr_data_f3_0;     // 0x20
                 int addr_data_f3_1;     // 0x24
                 volatile int status;    // 0x28
-                int delta_snapshot;     // 0x2c
+                volatile int delta_snapshot;     // 0x2c
                 int delta_f0;           // 0x30
                 int delta_f0_2;         // 0x34
                 int delta_f1;           // 0x38

src/fsw_init.c +1 0

                 // the timeout is larger because the spw IP needs to receive several valid timecodes before generating a tickout
                 // if a tickout is generated, the timer is restarted
                 status = rtems_timer_fire_after( timecode_timer_id, TIMECODE_TIMER_TIMEOUT_INIT, timecode_timer_routine, NULL );
                 grspw_timecode_callback = &timecode_irq_handler;
                 status = rtems_task_delete(RTEMS_SELF);

src/wf_handler.c +23 -31

             typedef enum resynchro_state_t
             {
-                MEASURE_0,
+                MEASURE,
-                MEASURE_1,
+                CORRECTION
-                CORRECTION_0,
-                CORRECTION_1
             } resynchro_state;
             //*********************
                         waveform_picker_regs->addr_data_f0_1    = current_ring_node_f0->buffer_address;
                         waveform_picker_regs->status            = waveform_picker_regs->status & 0x00001102; // [0001 0001 0000 0010]
                     }
+                    // send an event to the WFRM task for resynchro activities
+                    status = rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_SWF_RESYNCH );
                 }
                 //***
                 while(1){
                     // wait for an RTEMS_EVENT
-                    rtems_event_receive(RTEMS_EVENT_MODE_NORMAL,
+                    rtems_event_receive(RTEMS_EVENT_MODE_NORMAL | RTEMS_EVENT_SWF_RESYNCH,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
-                    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");
                         status =  rtems_message_queue_send( queue_id, &ring_node_swf1_extracted_ptr, sizeof( ring_node* ) );
                         status =  rtems_message_queue_send( queue_id, &ring_node_swf2_extracted_ptr, sizeof( ring_node* ) );
                     }
+                    if (event_out == RTEMS_EVENT_SWF_RESYNCH)
+                    {
+                        snapshot_resynchronization( (unsigned char *)  &ring_node_to_send_swf_f0->coarseTime );
+                    }
                 }
             }
                 BOOT_PRINTF("in CWF2 ***\n")
                         while(1){
-                    // wait for an RTEMS_EVENT
+                    // 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 );
                             // extract the snapshot
                             build_snapshot_from_ring( ring_node_to_send_swf_f2, 2, acquisitionTimeF0_asLong,
                                                       &ring_node_swf2_extracted, swf2_extracted );
-                            // send the snapshot when built
-                            status = rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_SBM2 );
                             extractSWF2 = false;
-                            swf2_ready = true;
+                            swf2_ready = true;  // once the snapshot at f2 is ready the CWF1 task will send an event to WFRM
                         }
                         if (swf0_ready_flag_f2 == true)
                         {
             void snapshot_resynchronization( unsigned char *timePtr )
             {
                 static double correction    = 0.;
-                static resynchro_state state = MEASURE_0;
+                static resynchro_state state = MEASURE;
                 int correctionInt;
                 switch (state)
                 {
-                case MEASURE_0:
+                case MEASURE:
                     // ********
-                    PRINTF("MEASURE_0 ===\n");
+                    PRINTF("MEASURE ===\n");
-                    state = CORRECTION_0;
+                    state = CORRECTION;
                     correction = computeCorrection( timePtr );
-                    PRINTF1("MEASURE_0 === correction = %.2f\n", correction );
+                    PRINTF1("MEASURE === correction = %.2f\n", correction );
                     applyCorrection( correction );
-                    PRINTF1("MEASURE_0 === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
+                    PRINTF1("MEASURE === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
                     //****
                     break;
-                case CORRECTION_0:
+                case CORRECTION:
                     //************
-                    PRINTF("CORRECTION_0 ===\n");
+                    PRINTF("CORRECTION ===\n");
-                    state = CORRECTION_1;
+                    state = MEASURE;
                     computeCorrection( timePtr );
                     correction = -correction;
-                    PRINTF1("CORRECTION_0 === correction = %.2f\n", correction );
+                    PRINTF1("CORRECTION === correction = %.2f\n", correction );
                     applyCorrection( correction );
-                    PRINTF1("CORRECTION_0 === delta_snapshot = %d\n", waveform_picker_regs->delta_snapshot);
+                    PRINTF1("CORRECTION === 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;

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