HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r19:beef07605c12

waveform initialization modified due to a problem of compatibility...

paul@pc-solar1.lab-lpp.local -

r19:beef07605c12 default

parent child

Context file:

r19:beef07605c12

Collapse all files

header/wf_handler.h +1 0

             extern int fdSPW;
             extern volatile int wf_snap_f0[ ];
             extern volatile int wf_snap_f1[ ];
+            extern volatile int wf_snap_f1_bis[ ];
             extern volatile int wf_snap_f2[ ];
             extern volatile int wf_cont_f3[ ];
             extern waveform_picker_regs_t *waveform_picker_regs;

src/fsw_globals.c +6 -5

             waveform_picker_regs_t *waveform_picker_regs = (waveform_picker_regs_t*) REGS_ADDR_WAVEFORM_PICKER;
             gptimer_regs_t         *gptimer_regs         = (gptimer_regs_t *)        REGS_ADDR_GPTIMER;
-            // WAVEFORMS GLOBAL VARIABLES
+            // WAVEFORMS GLOBAL VARIABLES // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
-            volatile int wf_snap_f0[ 2 * NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + 2]; // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
+            volatile int wf_snap_f0[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET];
-            volatile int wf_snap_f1[ 2 * NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + 2]; // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
+            volatile int wf_snap_f1[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET];
-            volatile int wf_snap_f2[ 2 * NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + 2]; // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
+            volatile int wf_snap_f1_bis[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET];
-            volatile int wf_cont_f3[ 2 * NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + 2]; // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
+            volatile int wf_snap_f2[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET];
+            volatile int wf_cont_f3[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET];
             // SPECTRAL MATRICES GLOBAL VARIABLES
             volatile int spec_mat_f0_a[ TOTAL_SIZE_SPEC_MAT ];

src/fsw_init.c +3 -3

                 LEON_Unmask_interrupt( IRQ_TIME2 );
             #ifdef GSA
-                if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
+                //if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
-                    printf("in INIT *** Error sending event to WFRM\n");
+                //    printf("in INIT *** Error sending event to WFRM\n");
+                //}
             #endif
                 status = rtems_task_delete(RTEMS_SELF);

src/tc_handler.c +27 -2

                 printf("enter mode %d\n", lfr_mode);
                 switch(lfr_mode)
                 {
+                    //********
+                    // STANDBY
                     case(LFR_MODE_STANDBY):
                         LEON_Mask_interrupt( IRQ_WF );
                         LEON_Mask_interrupt( IRQ_SM );
                         LEON_Mask_interrupt( IRQ_WAVEFORM_PICKER );
                         waveform_picker_regs->burst_enable = 0x00;
                         break;
+                    //******
+                    // NORMAL
                     case(LFR_MODE_NORMAL):
             #ifdef GSA
                         LEON_Unmask_interrupt( IRQ_WF );
             #else
                         waveform_picker_regs->burst_enable = 0x07;
                         waveform_picker_regs->status = 0x00;
             #endif
+                        LEON_Unmask_interrupt( IRQ_SM );
+                        break;
-                        break;
+                    //******
+                    // BURST
                     case(LFR_MODE_BURST):
                         break;
+                    //*****
+                    // SBM1
                     case(LFR_MODE_SBM1):
+            #ifdef GSA
+            #else
+                        LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
+                        LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
+                        waveform_picker_regs->burst_enable = 0x20;  // [0010 0000] burst f2, f1, f0 enable f3 f2 f1 f0
+                        waveform_picker_regs->burst_enable =  waveform_picker_regs->burst_enable | 0x02;
+                        waveform_picker_regs->status = 0x00;
+            #endif
+                        //LEON_Unmask_interrupt( IRQ_SM );
                         break;
+                    //*****
+                    // SBM2
                     case(LFR_MODE_SBM2):
                         break;
+                    //********
+                    // DEFAULT
                     default:
                         break;
                 }

src/wf_handler.c +32 -29

             rtems_isr waveforms_isr( rtems_vector_number vector )
             {
-                if ( (waveform_picker_regs->burst_enable & 0x7) == 0x0 ){// if no channel is enable
+                if (rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ) != RTEMS_SUCCESSFUL) {
+                    printf("In waveforms_isr *** Error sending event to WFRM\n");
+                }
+                if (waveform_picker_regs->burst_enable == 0x22) {
+                    if (waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1) {
+                        waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1_bis);
+                    }
+                    else {
+                        waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);
+                    }
+                    if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_0 ) != RTEMS_SUCCESSFUL) {
+                        printf("In waveforms_isr *** Error sending event to WFRM\n");
+                    }
+                }
+                waveform_picker_regs->status = 0x00;
+                /*else if ( (waveform_picker_regs->burst_enable & 0x7) == 0x0 ){// if no channel is enable
                     if (rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ) != RTEMS_SUCCESSFUL) {
                         printf("In timecode_irq_handler *** Error sending event to DUMB\n");
                     }
                             printf("In waveforms_isr *** Error sending event to WFRM\n");
                         }
                     }
+                }*/
             }
             rtems_isr waveforms_simulator_isr( rtems_vector_number vector )
                     //***************
                     // send snapshots
                     // F0
-                    send_waveform( &header, wf_snap_f0, SID_NORM_SWF_F0, &spw_ioctl_send);
+                    //send_waveform( &header, wf_snap_f0, SID_NORM_SWF_F0, &spw_ioctl_send);
                     // F1
-                    send_waveform( &header, wf_snap_f1, SID_NORM_SWF_F1, &spw_ioctl_send);
+                    if (waveform_picker_regs->addr_data_f1 == (int) wf_snap_f1) {
+                       send_waveform( &header, wf_snap_f1_bis, SID_NORM_SWF_F1, &spw_ioctl_send);
+                    }
+                    else {
+                        send_waveform( &header, wf_snap_f1, SID_NORM_SWF_F1, &spw_ioctl_send);
+                    }
                     // F2
-                    send_waveform( &header, wf_snap_f2, SID_NORM_SWF_F2, &spw_ioctl_send);
+                    //send_waveform( &header, wf_snap_f2, SID_NORM_SWF_F2, &spw_ioctl_send);
             #ifdef GSA
                     // irq processed, reset the related register of the timer unit
                     gptimer_regs->timer[2].ctrl = gptimer_regs->timer[2].ctrl | 0x00000010;
             #else
                     // irq processed, reset the related register of the waveform picker
-                    waveform_picker_regs->status = 0x00;
+                    //waveform_picker_regs->status = 0x00;
-                    waveform_picker_regs->burst_enable = 0x07;
+                    //waveform_picker_regs->burst_enable = 0x07;
             #endif
                 }
             void init_waveforms( void )
             {
                 int i = 0;
-                int aux1 = 0;
-                int aux2 = 0;
-                int val1 = 0;
-                int val2 = 0;
-                int val3 = 0;
-                int val4 = 0;
-                int amplitude1 = pow(2, 10);
-                static int delta_phi = 0;
                 for (i=0; i< NB_SAMPLES_PER_SNAPSHOT; i++)
                 {
-                    aux1 = (int) (amplitude1 * cos((2*pi*i)/2048 + (delta_phi*pi)/180));
-                    aux2 = (int) (amplitude1 * sin((2*pi*i)/2048 + (delta_phi*pi)/180));
-                    val1 = build_value(aux1, aux2);
-                    val2 = build_value(i, 2*i);
-                    val3 = build_value(-aux1, -aux2);
-                    val4 = build_value(-i, -2*i);
                     //***
                     // F0
                     wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET ] = 0x88887777;     //
                     //***
                     // F1
-                    wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = val1;
+                    wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = 0x22221111;
-                    wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = val2;
+                    wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = 0x44443333;
                     wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET  ] = 0xaaaa0000;
                     //***
                     // F2
-                    wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = val1;
+                    wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET  ] = 0x44443333;
-                    wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = val2;
+                    wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET  ] = 0x22221111;
                     wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET  ] = 0xaaaa0000;
                     //***
                     //wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 1 ] = val2;
                     //wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 2 ] = 0xaaaa0000;
                 }
-                delta_phi = delta_phi + 10;
             }
             void init_waveform_header( ExtendedTMHeader_t * header, unsigned int sid )
                          spw_ioctl_send->data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) + (1 * TIME_OFFSET) ];
                     }
                     else if (sid == SID_NORM_SWF_F2) {
-                         spw_ioctl_send->data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) + (0 * TIME_OFFSET) ];
+                         spw_ioctl_send->data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) + (1 * TIME_OFFSET) ];
                     }
                     else {
                          spw_ioctl_send->data = (char*) &waveform[ (i * 340 * NB_WORDS_SWF_BLK) ];

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