HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r114:46134e185f55

rev 1.0.0.5

paul -

r114:46134e185f55 VHDLib206

parent child

Context file:

r114:46134e185f55

Collapse all files

FSW-qt/Makefile +2 -2

              #############################################################################
              # Makefile for building: bin/fsw
-             # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Apr 1 12:03:12 2014
+             # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Apr 3 10:09:31 2014
              # 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=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=5 -DPRINT_MESSAGES_ON_CONSOLE -DPRINT_TASK_STATISTICS
+             DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=5 -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 -I../../LFR_basic-parameters

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

              TEMPLATE = app
              # CONFIG += console v8 sim
              # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** vhdl_dev *** debug_tch
-             CONFIG += console verbose cpu_usage_report
+             CONFIG += console verbose
              CONFIG -= qt
              include(./sparc.pri)

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-01T07:09:49. -->
+             <!-- Written by QtCreator 3.0.1, 2014-04-03T08:17:16. -->
              <qtcreator>
               <data>
                <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_params_processing.h +2 -2

              #define TOTAL_SIZE_COMPRESSED_ASM_F1    325 // 13 * 25 WORDS
              #define TOTAL_SIZE_COMPRESSED_ASM_F2    300 // 12 * 25 WORDS
              #define TOTAL_SIZE_COMPRESSED_ASM_SBM1  550 // 22 * 25 WORDS
-             #define NB_AVERAGE_NORMAL_f0    384 // 96 * 4
-             #define NB_AVERAGE_SBM1_f0      24  // 24 matrices at f0 = 0.25 second
+             #define NB_AVERAGE_NORMAL_F0    384 // 96 * 4
+             #define NB_AVERAGE_SBM1_F0      24  // 24 matrices at f0 = 0.25 second
              #define NB_SM_TO_RECEIVE_BEFORE_AVF0 8
              typedef struct {

src/fsw_processing.c +44 -42

              rtems_task avf0_task(rtems_task_argument argument)
              {
                  int i;
-                 static unsigned int nb_average_norm;
-                 static unsigned int nb_average_sbm1;
+                 static unsigned int nb_average_norm_f0;
+                 static unsigned int nb_average_sbm1_f0;
                  rtems_event_set event_out;
                  rtems_status_code status;
                  ring_node_sm *ring_node_tab[8];
-                 nb_average_norm = 0;
-                 nb_average_sbm1 = 0;
+                 nb_average_norm_f0 = 0;
+                 nb_average_sbm1_f0 = 0;
                  BOOT_PRINTF("in AVFO *** \n")
                      // copy time information in the averaged_sm_f0 buffer
                      averaged_sm_f0[0] = ring_node_tab[7]->coarseTime;
                      averaged_sm_f0[1] = ring_node_tab[7]->fineTime;
-                     averaged_sm_f1[0] = ring_node_tab[7]->coarseTime;
-                     averaged_sm_f1[1] = ring_node_tab[7]->fineTime;
+                     averaged_sm_sbm1[0] = ring_node_tab[7]->coarseTime;
+                     averaged_sm_sbm1[1] = ring_node_tab[7]->fineTime;
                      // compute the average and store it in the averaged_sm_f1 buffer
-                     ASM_average( averaged_sm_f0, averaged_sm_f1,
+                     ASM_average( averaged_sm_f0, averaged_sm_sbm1,
                                   ring_node_tab,
-                                  nb_average_norm, nb_average_sbm1 );
+                                  nb_average_norm_f0, nb_average_sbm1_f0 );
                      // update nb_average
-                     nb_average_norm = nb_average_norm + NB_SM_TO_RECEIVE_BEFORE_AVF0;
-                     nb_average_sbm1 = nb_average_sbm1 + NB_SM_TO_RECEIVE_BEFORE_AVF0;
+                     nb_average_norm_f0 = nb_average_norm_f0 + NB_SM_TO_RECEIVE_BEFORE_AVF0;
+                     nb_average_sbm1_f0 = nb_average_sbm1_f0 + NB_SM_TO_RECEIVE_BEFORE_AVF0;
                      // launch actions depending on the current mode
-                     if (lfrCurrentMode == LFR_MODE_SBM1)
+                     if (nb_average_sbm1_f0 == NB_AVERAGE_SBM1_F0)
                      {
-                         if (nb_average_sbm1 == NB_AVERAGE_SBM1_f0) {
-                             nb_average_sbm1 = 0;
+                         nb_average_sbm1_f0 = 0;
+                         if (lfrCurrentMode == LFR_MODE_SBM1)
+                         {
                              status = rtems_event_send( Task_id[TASKID_MATR], RTEMS_EVENT_MODE_SBM1 ); // sending an event to the task 7, BPF0
-                             if (status != RTEMS_SUCCESSFUL) {
-                                 printf("in AVF0 *** Error sending RTEMS_EVENT_0, code %d\n", status);
+                             if (status != RTEMS_SUCCESSFUL)
+                             {
+                                 printf("in AVF0 *** Error sending RTEMS_EVENT_MODE_SBM1, code %d\n", status);
                              }
                          }
                      }
-                     if (lfrCurrentMode == LFR_MODE_NORMAL)
+                     {
-                         if (nb_average_norm == NB_AVERAGE_NORMAL_f0) {
-                             nb_average_norm = 0;
-                             status = rtems_event_send( Task_id[TASKID_MATR], RTEMS_EVENT_MODE_NORMAL ); // sending an event to the task 7, BPF0
-                             if (status != RTEMS_SUCCESSFUL) {
-                                 printf("in AVF0 *** Error sending RTEMS_EVENT_0, code %d\n", status);
+                             }
+                     if (nb_average_norm_f0 == NB_AVERAGE_NORMAL_F0) {
+                         nb_average_norm_f0 = 0;
+                         status = rtems_event_send( Task_id[TASKID_MATR], RTEMS_EVENT_MODE_NORMAL ); // sending an event to the task 7, BPF0
+                         if (status != RTEMS_SUCCESSFUL) {
+                             printf("in AVF0 *** Error sending RTEMS_EVENT_0, code %d\n", status);
                          }
                      }
                  }
                          ASM_compress( averaged_sm_f0, 0, compressed_sm_f0 );
                          // 2) compute the BP1 set
-                         // 3) convert the float array in a char array
+                         // 3) send the BP1 set
+                         // 4) convert the float array in a char array
                          ASM_reorganize( averaged_sm_f0, averaged_sm_f0_reorganized );
                          ASM_convert( averaged_sm_f0_reorganized, averaged_sm_f0_char);
-                         // 4) send the spectral matrix packets
+                         // 5) send the spectral matrix packets
                          ASM_send( &headerASM, averaged_sm_f0_char, SID_NORM_ASM_F0, &spw_ioctl_send_ASM, queue_id);
                      }
                      else if (event_out==RTEMS_EVENT_MODE_SBM1)
                      {
                          // 1)  compress the matrix for Basic Parameters calculation
-                         ASM_compress( averaged_sm_f1, 0, compressed_sm_f1 );
+                         ASM_compress( averaged_sm_sbm1, 0, compressed_sm_sbm1 );
                          // 2) compute the BP1 set
-                         // 4) send the basic parameters set 1 packet
-                         BP1_send( );
+                         // 3) send the basic parameters set 1 packet
                      }
                      else
                      {
              void ASM_average( float *averaged_spec_mat_f0, float *averaged_spec_mat_f1,
                                ring_node_sm *ring_node_tab[],
-                               unsigned int firstTimeF0, unsigned int firstTimeF1 )
+                               unsigned int nbAverageNormF0, unsigned int nbAverageSBM1F0 )
              {
                  float sum;
                  unsigned int i;
                              + ( (int *) (ring_node_tab[6]->buffer_address) ) [ i ]
                              + ( (int *) (ring_node_tab[7]->buffer_address) ) [ i ];
-                     if ( (firstTimeF0 == 0) && (firstTimeF1 == 0) )
+                     if ( (nbAverageNormF0 == 0) && (nbAverageSBM1F0 == 0) )
                      {
-                         averaged_spec_mat_f0[ i ] = averaged_spec_mat_f0[ i ] + sum;
-                         averaged_spec_mat_f1[ i ] = averaged_spec_mat_f1[ i ] + sum;
+                         averaged_spec_mat_f0[ TIME_OFFSET + i ] = sum;
+                         averaged_spec_mat_f1[ TIME_OFFSET + i ] = sum;
                      }
-                     else if ( (firstTimeF0 == 0) && (firstTimeF1 != 0) )
+                     else if ( (nbAverageNormF0 != 0) && (nbAverageSBM1F0 != 0) )
                      {
-                         averaged_spec_mat_f0[ i ] = averaged_spec_mat_f0[ i ] + sum;
-                         averaged_spec_mat_f1[ i ] = sum;
+                         averaged_spec_mat_f0[ TIME_OFFSET + i ] = ( averaged_spec_mat_f0[ TIME_OFFSET + i ] + sum );
+                         averaged_spec_mat_f1[ TIME_OFFSET + i ] = ( averaged_spec_mat_f1[ TIME_OFFSET + i ] + sum );
                      }
-                     else if ( (firstTimeF0 != 0) && (firstTimeF1 == 0) )
+                     else if ( (nbAverageNormF0 != 0) && (nbAverageSBM1F0 == 0) )
                      {
-                         averaged_spec_mat_f0[ i ] = sum;
-                         averaged_spec_mat_f1[ i ] = averaged_spec_mat_f1[ i ] + sum;
+                         averaged_spec_mat_f0[ TIME_OFFSET + i ] = ( averaged_spec_mat_f0[ TIME_OFFSET + i ] + sum );
+                         averaged_spec_mat_f1[ TIME_OFFSET + i ] = sum;
                      }
                      else
                      {
-                         averaged_spec_mat_f0[ i ] = sum;
-                         averaged_spec_mat_f1[ i ] = sum;
+                         PRINTF2("ERR *** in ASM_average *** unexpected parameters %d %d\n", nbAverageNormF0, nbAverageSBM1F0)
                      }
                  }
              }
                  {
                      for( frequencyBin = 0; frequencyBin < NB_BINS_PER_SM; frequencyBin++ )
                      {
-                         averaged_spec_mat_reorganized[ frequencyBin * NB_VALUES_PER_SM + asmComponent + TIME_OFFSET ] =
-                                 averaged_spec_mat[ asmComponent * NB_BINS_PER_SM + frequencyBin + TIME_OFFSET];
+                         averaged_spec_mat_reorganized[ TIME_OFFSET + frequencyBin * NB_VALUES_PER_SM + asmComponent ] =
+                                 averaged_spec_mat[ TIME_OFFSET + asmComponent * NB_BINS_PER_SM + frequencyBin ];
                      }
                  }
              }

src/tc_handler.c +1 -1

              #endif
                      status = restart_science_tasks();
                      launch_waveform_picker( mode, transitionCoarseTime );
-                     launch_spectral_matrix_simu( mode );
+             //        launch_spectral_matrix_simu( mode );
                  }
                  else if ( mode == LFR_MODE_STANDBY )
                  {

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