HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r53:572a09e609bc

last version before VHDL design upgrade...

paul -

r53:572a09e609bc nov2013

parent child

Context file:

r53:572a09e609bc

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Nov 4 07:05:32 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 5 07:57:53 2013
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=20 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=21 -DPRINT_MESSAGES_ON_CONSOLE
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header

FSW-qt/bin/fsw binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-20
+            SWVERSION=-0-21
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=20
+            DEFINES += SW_VERSION_N4=21
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.0, 2013-11-04T07:04:49. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-05T13:07:12. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/grlib_regs.h +2 -18

@@ -45,23 +45,7 struct time_management_regs_str{
45	};	45	};
46	typedef struct time_management_regs_str time_management_regs_t;	46	typedef struct time_management_regs_str time_management_regs_t;
47		47
48	struct waveform_picker_regs_str{	48	struct new_waveform_picker_regs_str{
49	volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
50	volatile int burst_enable; // 0x04 01 *** burst f2, f1, f0 enable f3, f2, f1, f0
51	volatile int addr_data_f0; // 0x08 10 ***
52	volatile int addr_data_f1; // 0x0c 11 ***
53	volatile int addr_data_f2; // 0x10 100 ***
54	volatile int addr_data_f3; // 0x14 101 ***
55	volatile int status; // 0x18 110 ***
56	volatile int delta_snapshot; // 0x1c 111 ***
57	volatile int delta_f2_f1; // 0x20 0000 ***
58	volatile int delta_f2_f0; // 0x24 0001 ***
59	volatile int nb_burst_available;// 0x28 0010 ***
60	volatile int nb_snapshot_param; // 0x2c 0011 ***
61	};
62	typedef struct waveform_picker_regs_str waveform_picker_regs_t;
63
64	struct waveform_picker_regs_str_alt{
65	volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW	49	volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
66	volatile int run_burst_enable; // 0x04 01 * [run * burst f2, f1, f0 *** enable f3, f2, f1, f0 ]	50	volatile int run_burst_enable; // 0x04 01 * [run * burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
67	volatile int addr_data_f0; // 0x08	51	volatile int addr_data_f0; // 0x08
@@ -78,7 +62,7 struct waveform_picker_regs_str_alt{
78	volatile int snapshot_param;	62	volatile int snapshot_param;
79	volatile int start_date;	63	volatile int start_date;
80	};	64	};
81	typedef struct waveform_picker_regs_str~~_alt~~ waveform_picker_regs_t~~_alt~~;	65	typedef struct new_waveform_picker_regs_str new_waveform_picker_regs_t;
82		66
83	struct spectral_matrix_regs_str{	67	struct spectral_matrix_regs_str{
84	volatile int config;	68	volatile int config;

header/tc_handler.h +1 -1

             extern struct param_sbm1_str param_sbm1;
             extern struct param_sbm2_str param_sbm2;
             extern time_management_regs_t *time_management_regs;
-            extern waveform_picker_regs_t *waveform_picker_regs;
+            extern new_waveform_picker_regs_t *new_waveform_picker_regs;
             extern gptimer_regs_t         *gptimer_regs;
             extern rtems_name  misc_name[5];
             extern rtems_id    Task_id[20];         /* array of task ids */

header/wf_handler.h +2 -1

             void set_wfp_data_shaping();
             char set_wfp_delta_snapshot();
             void set_wfp_burst_enable_register( unsigned char mode);
-            void reset_wfp_burst_enable();
+            void reset_wfp_run_burst_enable();
             void reset_wfp_status();
             void reset_new_waveform_picker_regs();
+            void reset_new_waveform_picker_regs_alt();
             //*****************
             // local parameters

src/fsw_config.c 0 -1

@@ -52,4 +52,3 struct drvmgr_bus_res grlib_drv_resource
52	}	52	}
53	};	53	};
54		54
55

src/fsw_init.c +4 -1

                  *
                  */
                 rtems_status_code status;
                 rtems_status_code status_spw;
                 rtems_isr_entry  old_isr_handler;
                 //send_console_outputs_on_apbuart_port();
                 set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);
+                // waveform picker registers initialization
+                reset_wfp_run_burst_enable();
+                reset_wfp_status();
                 init_parameter_dump();
                 init_local_mode_parameters();
                 init_housekeeping_parameters();

src/tc_handler.c +9 -5

                 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_run_burst_enable();                       // reset run, burst and enable bits, [r b2 b1 b0 e3 e2 e1 e0]
                 reset_wfp_status();                             // reset all the status bits
                 // creal interruptions
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );    // clear waveform picker interrupt
             int enter_normal_mode()
             {
                 rtems_status_code status;
+                int startDate;
                 status = restart_science_tasks();
             #else
                 //****************
                 // waveform picker
-                reset_waveform_picker_regs();
+                reset_new_waveform_picker_regs();
                 set_wfp_burst_enable_register(LFR_MODE_NORMAL);
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
+                startDate = time_management_regs->coarse_time + 2;
+                new_waveform_picker_regs->start_date = startDate;
+                new_waveform_picker_regs->run_burst_enable = new_waveform_picker_regs->run_burst_enable | 0x80; // [1000 0000]
                 //****************
                 // spectral matrix
             #endif
             #ifdef GSA
                 LEON_Unmask_interrupt( IRQ_SM );
             #else
-                reset_waveform_picker_regs();
+                reset_new_waveform_picker_regs();
                 set_wfp_burst_enable_register(LFR_MODE_BURST);
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
             #ifdef GSA
                 LEON_Unmask_interrupt( IRQ_SM );
             #else
-                reset_waveform_picker_regs();
+                reset_new_waveform_picker_regs();
                 set_wfp_burst_enable_register(LFR_MODE_SBM1);
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );
             #ifdef GSA
                 LEON_Unmask_interrupt( IRQ_SM );
             #else
-                reset_waveform_picker_regs();
+                reset_new_waveform_picker_regs();
                 set_wfp_burst_enable_register(LFR_MODE_SBM2);
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );

src/wf_handler.c +38 -13

                  *
                  */
+                rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
+                new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff00f;   // clear new_err and full_err
             #ifdef GSA
             #else
                 if ( (lfrCurrentMode == LFR_MODE_NORMAL)
                 switch(mode) {
                 case(LFR_MODE_NORMAL):
                     new_waveform_picker_regs->run_burst_enable = 0x00;  // [0000 0000] no burst enable
-                    new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
+            //        new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
+                    new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0
                     break;
                 case(LFR_MODE_BURST):
                     new_waveform_picker_regs->run_burst_enable = 0x40;  // [0100 0000] f2 burst enabled
             #endif
             }
-            void reset_wfp_burst_enable()
+            void reset_wfp_run_burst_enable()
             {
                 /** This function resets the waveform picker burst_enable register.
                  *
             void reset_new_waveform_picker_regs()
             {
-                new_waveform_picker_regs->data_shaping = 0x01;      // 0x00 00      *** R1 R0 SP1 SP0 BW
+                new_waveform_picker_regs->data_shaping = 0x01;      // 0x00 *** R1 R0 SP1 SP0 BW
-                new_waveform_picker_regs->run_burst_enable = 0x00;  // 0x04 01      *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
+                new_waveform_picker_regs->run_burst_enable = 0x00;  // 0x04 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
                 new_waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0);    // 0x08
                 new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);    // 0x0c
                 new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);    // 0x10
                 new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3);    // 0x14
-                new_waveform_picker_regs->status = 0x00;                        // 0x18
+                new_waveform_picker_regs->status = 0x00;                // 0x18
-                new_waveform_picker_regs->delta_snapshot = 0x12800;             // 0x1c
+            //    new_waveform_picker_regs->delta_snapshot = 0x12800;     // 0x1c 296 * 256 = 75776
-                new_waveform_picker_regs->delta_f0 = 0x3f5;                     // 0x20 *** 1013
+                new_waveform_picker_regs->delta_snapshot = 0x1000;      // 0x1c 16 * 256 = 4096
-                new_waveform_picker_regs->delta_f0_2 = 0x7;                     // 0x24 *** 7
+                new_waveform_picker_regs->delta_f0 = 0x3f5;             // 0x20 *** 1013
-                new_waveform_picker_regs->delta_f1 = 0x3c0;                     // 0x28 *** 960
+                new_waveform_picker_regs->delta_f0_2 = 0x7;             // 0x24 *** 7
-                new_waveform_picker_regs->delta_f2 = 0x12200;                   // 0x2c *** 74240
+                new_waveform_picker_regs->delta_f1 = 0x3c0;             // 0x28 *** 960
-                new_waveform_picker_regs->nb_data_by_buffer = 0x1802;           // 0x30 *** 2048 * 3 + 2
+            //    new_waveform_picker_regs->delta_f2 = 0x12200;         // 0x2c *** 74240
-                new_waveform_picker_regs->snapshot_param = 0x7ff;               // 0x34 *** 2048 -1
+                new_waveform_picker_regs->delta_f2 = 0xc00;             // 0x2c *** 12 * 256 = 2048
-                new_waveform_picker_regs->start_date = 0x00;
+                new_waveform_picker_regs->nb_data_by_buffer = 0x1802;   // 0x30 *** 2048 * 3 + 2
+                new_waveform_picker_regs->snapshot_param = 0x7ff;       // 0x34 *** 2048 -1
+                new_waveform_picker_regs->start_date = 0x00;            // 0x38
+            }
+            void reset_new_waveform_picker_regs_alt()
+            {
+                new_waveform_picker_regs->data_shaping = 0x01;      // 0x00 *** R1 R0 SP1 SP0 BW
+                new_waveform_picker_regs->run_burst_enable = 0x00;  // 0x04 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
+                new_waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0);    // 0x08
+                new_waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);    // 0x0c
+                new_waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);    // 0x10
+                new_waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3);    // 0x14
+                new_waveform_picker_regs->status = 0x00;            // 0x18
+                new_waveform_picker_regs->delta_snapshot = 0x1000;  // 0x1c 16 * 256 = 4096
+                new_waveform_picker_regs->delta_f0 = 0x19;          // 0x20 *** 1013
+                new_waveform_picker_regs->delta_f0_2 = 0x7;         // 0x24 *** 7
+                new_waveform_picker_regs->delta_f1 = 0x19;          // 0x28 *** 960
+                new_waveform_picker_regs->delta_f2 = 0x400;         // 0x2c *** 4 * 256 = 1024
+                new_waveform_picker_regs->nb_data_by_buffer = 0x32; // 0x30 *** 16 * 3 + 2
+                new_waveform_picker_regs->snapshot_param = 0xf;     // 0x34 *** 16 -1
+                new_waveform_picker_regs->start_date = 0x00;        // 0x38
             }
             //*****************

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