HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r127:3be3eafe14de

Sync

paul -

r127:3be3eafe14de VHDLib206

parent child

Context file:

r127:3be3eafe14de

Collapse all files

FSW-qt/Makefile +1 -1

              #############################################################################
              # Makefile for building: bin/fsw
-             # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Apr 28 15:02:06 2014
+             # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Apr 29 14:02:09 2014
              # Project:  fsw-qt.pro
              # Template: app
              # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro

FSW-qt/bin/load_spectral_matrix_TCH.py +16 -1

              ## WRITE THE DATA ##
              ####################
+             # F0 buffer address
              address_to_read = 0x80000f08
              val = RMAPPlugin0.Read( address_to_read, 1)
              matrixF0_Address0 = val[0]
+             # F1 buffer address
+             address_to_read = 0x80000f10
+             val = RMAPPlugin0.Read( address_to_read, 1)
+             matrixF1_Address = val[0]
+             # F2 buffer address
+             address_to_read = 0x80000f14
+             val = RMAPPlugin0.Read( address_to_read, 1)
+             matrixF2_Address = val[0]
              print str( len(dataInIntReorganized) ) + " data to write"
              RMAPPlugin0.Write( matrixF0_Address0, dataInIntReorganized )
              print str( len(dataInIntReorganized) ) + " data written @" + hex(matrixF0_Address0)
+             RMAPPlugin0.Write( matrixF1_Address, dataInIntReorganized )
+             print str( len(dataInIntReorganized) ) + " data written @" + hex(matrixF1_Address)
+             RMAPPlugin0.Write( matrixF2_Address, dataInIntReorganized )
+             print str( len(dataInIntReorganized) ) + " data written @" + hex(matrixF2_Address)

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

                  ../header/tc_acceptance.h \
                  ../header/fsw_params_nb_bytes.h \
                  ../src/basic_parameters/basic_parameters.h \
+                 ../header/fsw_params_processing.h \
                  ../header/processing/fsw_processing.h \
-                 ../header/processing/fsw_params_processing.h \
                  ../header/processing/avf0_prc0.h \
                  ../header/processing/avf1_prc1.h \
                  ../header/processing/avf2_prc2.h

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

              <?xml version="1.0" encoding="UTF-8"?>
              <!DOCTYPE QtCreatorProject>
-             <!-- Written by QtCreator 3.0.1, 2014-04-28T15:34:21. -->
+             <!-- Written by QtCreator 3.0.1, 2014-04-29T15:43:03. -->
              <qtcreator>
               <data>
                <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_spacewire.h +1 -1

              int spacewire_open_link( void );
              int spacewire_start_link( int fd );
-             int spacewire_stop_start_link( int fd );
+             int spacewire_stop_and_start_link( int fd );
              int spacewire_configure_link(int fd );
              int spacewire_reset_link( void );
              void spacewire_set_NP( unsigned char val, unsigned int regAddr ); // No Port force

header/grlib_regs.h +15 -15

		@@ -80,21 +80,21 typedef struct{
80	80	} waveform_picker_regs_new_t;
81	81
82	82	typedef struct {
83		volatile int config;
84		volatile int status;
85		volatile int matrixF0_Address0;
86		volatile int matrixFO_Address1;
87		volatile int matrixF1_Address;
88		volatile int matrixF2_Address;
89		volatile int coarse_time_F0_0;
90		volatile int coarse_time_F0_1;
91		volatile int coarse_time_F1;
92		volatile int coarse_time_F2;
93		volatile int fine_time_FO_0;
94		volatile int fine_time_F0_1;
95		volatile int fine_time_F1;
96		volatile int fine_time_F2;
97		volatile int debug;
	83	volatile int config; // 0x00
	84	volatile int status; // 0x04
	85	volatile int matrixF0_Address0; // 0x08
	86	volatile int matrixFO_Address1; // 0x0C
	87	volatile int matrixF1_Address; // 0x10
	88	volatile int matrixF2_Address; // 0x14
	89	volatile int coarse_time_F0_0; // 0x18
	90	volatile int coarse_time_F0_1; // 0x1C
	91	volatile int coarse_time_F1; // 0x20
	92	volatile int coarse_time_F2; // 0x24
	93	volatile int fine_time_FO_0; // 0x28
	94	volatile int fine_time_F0_1; // 0x2C
	95	volatile int fine_time_F1; // 0x30
	96	volatile int fine_time_F2; // 0x34
	97	volatile int debug; // 0x38
98	98	} spectral_matrix_regs_t;
99	99
100	100	#endif // GRLIB_REGS_H_INCLUDED

src/fsw_spacewire.c +8 -8

                      }
                      else                    // [2.b] in run state, start the link
                      {
-                         status = spacewire_stop_start_link( fdSPW ); // start the link
+                         status = spacewire_stop_and_start_link( fdSPW ); // start the link
                          if ( status != RTEMS_SUCCESSFUL)
                          {
                              PRINTF1("in SPIQ *** ERR spacewire_start_link %d\n", status)
                          status = ioctl(fdSPW, SPACEWIRE_IOCTRL_GET_LINK_STATUS, &linkStatus);    // get the link status
                      }
-                     status = spacewire_stop_start_link( fdSPW );
+                     status = spacewire_stop_and_start_link( fdSPW );
                      if (status != RTEMS_SUCCESSFUL)
                      {
              //****************
              // OTHER FUNCTIONS
-             int spacewire_open_link( void )
+             int spacewire_open_link( void )  // by default, the driver resets the core: [SPW_CTRL_WRITE(pDev, SPW_CTRL_RESET);]
              {
                  /** This function opens the SpaceWire link.
                   *
              {
                  rtems_status_code status;
-                 status = ioctl( fdSPW, SPACEWIRE_IOCTRL_START, -1); // returns successfuly if the link is started
+                 status = ioctl( fd, SPACEWIRE_IOCTRL_START, -1); // returns successfuly if the link is started
                                                                      // -1 default hardcoded driver timeout
                  return status;
              }
-             int spacewire_stop_start_link( int fd )
+             int spacewire_stop_and_start_link( int fd )
              {
                  rtems_status_code status;
-                 status = ioctl( fdSPW, SPACEWIRE_IOCTRL_STOP);      // start fails if link pDev->running != 0
-                 status = ioctl( fdSPW, SPACEWIRE_IOCTRL_START, -1); // returns successfuly if the link is started
+                 status = ioctl( fd, SPACEWIRE_IOCTRL_STOP);      // start fails if link pDev->running != 0
+                 status = ioctl( fd, SPACEWIRE_IOCTRL_START, -1); // returns successfuly if the link is started
                                                                      // -1 default hardcoded driver timeout
                  return status;
                      // CLOSING THE DRIVER AT THIS POINT WILL MAKE THE SEND TASK BLOCK THE SYSTEM
-                     status_spw = spacewire_stop_start_link( fdSPW );
+                     status_spw = spacewire_stop_and_start_link( fdSPW );
                      if (  status_spw != RTEMS_SUCCESSFUL )
                      {
                          PRINTF1("in spacewire_reset_link *** ERR spacewire_start_link code %d\n",  status_spw)

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