HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r91:6af3303996c6

VHDL_DEV implemented. The code is compatible with:...

paul -

r91:6af3303996c6 VHDLib206

parent child

Context file:

r91:6af3303996c6

Collapse all files

FSW-qt/Makefile +6 -6

             #############################################################################
-            # Makefile for building: bin/fsw
+            # Makefile for building: bin/fsw-vhdl-dev
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Jan 21 15:38:15 2014
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Jan 23 13:51:15 2014
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		fsw-qt.pro
-            QMAKE_TARGET  = fsw
+            QMAKE_TARGET  = fsw-vhdl-dev
             DESTDIR       = bin/
-            TARGET        = bin/fsw
+            TARGET        = bin/fsw-vhdl-dev
             first: all
             ####### Implicit rules
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             dist:
-            	@$(CHK_DIR_EXISTS) obj/fsw1.0.0 || $(MKDIR) obj/fsw1.0.0
+            	@$(CHK_DIR_EXISTS) obj/fsw-vhdl-dev1.0.0 || $(MKDIR) obj/fsw-vhdl-dev1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw1.0.0/ && (cd `dirname obj/fsw1.0.0` && $(TAR) fsw1.0.0.tar fsw1.0.0 && $(COMPRESS) fsw1.0.0.tar) && $(MOVE) `dirname obj/fsw1.0.0`/fsw1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw-vhdl-dev1.0.0/ && (cd `dirname obj/fsw-vhdl-dev1.0.0` && $(TAR) fsw-vhdl-dev1.0.0.tar fsw-vhdl-dev1.0.0 && $(COMPRESS) fsw-vhdl-dev1.0.0.tar) && $(MOVE) `dirname obj/fsw-vhdl-dev1.0.0`/fsw-vhdl-dev1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw-vhdl-dev1.0.0
             clean:compiler_clean

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

             TARGET = fsw
             contains( CONFIG, vhdl_dev ) {
                 DEFINES += VHDL_DEV
-                TARGET = fsw
+                TARGET = fsw-vhdl-dev
             }
             INCLUDEPATH += \

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.0, 2014-01-21T15:59:52. -->
+            <!-- Written by QtCreator 3.0.0, 2014-01-24T06:51:07. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/wf_handler.h +3 -4

             // waveform buffers
             // F0
             extern volatile int wf_snap_f0[ ];
-            // F1
+            // F1 F2
-            extern volatile int wf_snap_f1[ ][ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];
+            extern volatile int wf_snap_f1[ ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ];
-            // F2
+            extern volatile int wf_snap_f2[ ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ];
-            extern volatile int wf_snap_f2[ ][ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];
             // F3
             extern volatile int wf_cont_f3_a[ ];
             extern volatile int wf_cont_f3_b[ ];

src/fsw_globals.c +9 -9

@@ -32,15 +32,15 int fdUART = 0;
32	unsigned char lfrCurrentMode;	32	unsigned char lfrCurrentMode;
33		33
34	// WAVEFORMS GLOBAL VARIABLES // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes	34	// WAVEFORMS GLOBAL VARIABLES // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes
35	volatile int wf_snap_f0[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];	35	// F0
36	//	36	volatile int wf_snap_f0[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ] __attribute__((aligned(0x100)));
37	volatile int wf_snap_f1[ NB_RING_NODES_F1 ][ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];	37	// F1 F2
38	//	38	volatile int wf_snap_f1[ NB_RING_NODES_F1 ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
39	volatile int wf_snap_f2[ NB_RING_NODES_F2 ][ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];	39	volatile int wf_snap_f2[ NB_RING_NODES_F2 ][ (NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK) + TIME_OFFSET + 46 ] __attribute__((aligned(0x100)));
40	//	40	// F3
41	volatile int wf_cont_f3_a[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];	41	volatile int wf_cont_f3_a[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ] __attribute__((aligned(0x100)));
42	volatile int wf_cont_f3_b[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ];	42	volatile int wf_cont_f3_b[ NB_SAMPLES_PER_SNAPSHOT * NB_WORDS_SWF_BLK + TIME_OFFSET ] __attribute__((aligned(0x100)));
43	char wf_cont_f3_light[ NB_SAMPLES_PER_SNAPSHOT * NB_BYTES_CWF3_LIGHT_BLK ];	43	char wf_cont_f3_light[ NB_SAMPLES_PER_SNAPSHOT * NB_BYTES_CWF3_LIGHT_BLK ] __attribute__((aligned(0x100)));
44		44
45	// SPECTRAL MATRICES GLOBAL VARIABLES	45	// SPECTRAL MATRICES GLOBAL VARIABLES
46	volatile int spec_mat_f0_0[ SM_HEADER + TOTAL_SIZE_SM ];	46	volatile int spec_mat_f0_0[ SM_HEADER + TOTAL_SIZE_SM ];

src/fsw_init.c +3 0

                 BOOT_PRINTF("\n\n\n\n\n")
                 BOOT_PRINTF("***************************\n")
                 BOOT_PRINTF("** START Flight Software **\n")
+                    #ifdef VHDL_DEV
+                        PRINTF("/!\\ this is the VHDL_DEV flight software /!\\ \n")
+                    #endif
                 BOOT_PRINTF("***************************\n")
                 BOOT_PRINTF("\n\n")

src/tc_handler.c +9 -8

                 }
                 else
                 {
-                    printf("try to enter mode %d\n", requestedMode);
+                    printf("in action_enter_mode *** enter mode %d\n", requestedMode);
             #ifdef PRINT_TASK_STATISTICS
                     if (requestedMode != LFR_MODE_STANDBY)
                 status = RTEMS_SUCCESSFUL;
-            #ifdef GSA
-                LEON_Mask_interrupt( IRQ_WF );                  // mask waveform interrupt (coming from the timer VHDL IP)
-                LEON_Clear_interrupt( IRQ_WF );                  // clear waveform interrupt (coming from the timer VHDL IP)
-                timer_stop( (gptimer_regs_t*) REGS_ADDR_GPTIMER, TIMER_WF_SIMULATOR );
-            #else
                 // mask interruptions
                 LEON_Mask_interrupt( IRQ_WAVEFORM_PICKER );     // mask waveform picker interrupt
                 LEON_Mask_interrupt( IRQ_SPECTRAL_MATRIX );     // mask spectral matrix interrupt
                 // reset registers
                 reset_wfp_burst_enable();                       // reset burst and enable bits
                 reset_wfp_status();                             // reset all the status bits
-                // creal interruptions
+                // clear interruptions
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );    // clear waveform picker interrupt
                 LEON_Clear_interrupt( IRQ_SPECTRAL_MATRIX );    // clear spectarl matrix interrupt
-            #endif
                 //**********************
                 // suspend several tasks
                 if (lfrCurrentMode != LFR_MODE_STANDBY) {
             void launch_waveform_picker( unsigned char mode )
             {
+                int startDate;
                 reset_current_ring_nodes();
                 reset_waveform_picker_regs();
                 set_wfp_burst_enable_register( mode );
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
+            #ifdef VHDL_DEV
+                startDate = time_management_regs->coarse_time + 2;
+                waveform_picker_regs->run_burst_enable = waveform_picker_regs->run_burst_enable | 0x80; // [1000 0000]
+                waveform_picker_regs->start_date = startDate;
+            #endif
             }
             //****************

src/wf_handler.c +4 -4

                         current_ring_node_f2 = current_ring_node_f2->next;
                         waveform_picker_regs->addr_data_f2 = current_ring_node_f2->buffer_address;
                         // (2) send an event for the waveforms transmission
-                        if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_SBM2 ) != RTEMS_SUCCESSFUL) {
+                        if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_BURST ) != RTEMS_SUCCESSFUL) {
                             rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
                         }
                         waveform_picker_regs->status = waveform_picker_regs->status & 0xfffffbbb; // [1111 1011 1011 1011] f2 bit = 0
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     if (event_out == RTEMS_EVENT_MODE_BURST)
                     {
-                        send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2, SID_BURST_CWF_F2, headerCWF_F2_BURST, queue_id );
+                        send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2->buffer_address, SID_BURST_CWF_F2, headerCWF_F2_BURST, queue_id );
                     }
                     if (event_out == RTEMS_EVENT_MODE_SBM2)
                     {
-                        send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2, SID_SBM2_CWF_F2, headerCWF_F2_SBM2, queue_id );
+                        send_waveform_CWF( (volatile int *) ring_node_to_send_cwf_f2->buffer_address, SID_SBM2_CWF_F2, headerCWF_F2_SBM2, queue_id );
                     }
                 }
             }
                     // wait for an RTEMS_EVENT
                     rtems_event_receive( RTEMS_EVENT_MODE_SBM1,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
-                    send_waveform_CWF((volatile int*) ring_node_to_send_cwf_f1->buffer_address, SID_SBM1_CWF_F1, headerCWF_F1, queue_id );
+                    send_waveform_CWF( (volatile int*) ring_node_to_send_cwf_f1->buffer_address, SID_SBM1_CWF_F1, headerCWF_F1, queue_id );
                 }
             }

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