##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

Sync before going back to 1.0.0.12 for srec generation
paul -
r162:32d2a1c32a62 VHDLib206
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: bin/fsw
2 # Makefile for building: bin/fsw
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Jun 23 07:48:42 2014
3 # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 24 09:17:30 2014
4 # Project: fsw-qt.pro
4 # Project: fsw-qt.pro
5 # Template: app
5 # Template: app
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
@@ -10,7 +10,7
10
10
11 CC = sparc-rtems-gcc
11 CC = sparc-rtems-gcc
12 CXX = sparc-rtems-g++
12 CXX = sparc-rtems-g++
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=12 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=13 -DPRINT_MESSAGES_ON_CONSOLE
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters
Show file before | Show file after | Hide comments
@@ -11,7 +11,7 SWVERSION=-1-0
11 DEFINES += SW_VERSION_N1=1 # major
11 DEFINES += SW_VERSION_N1=1 # major
12 DEFINES += SW_VERSION_N2=0 # minor
12 DEFINES += SW_VERSION_N2=0 # minor
13 DEFINES += SW_VERSION_N3=0 # patch
13 DEFINES += SW_VERSION_N3=0 # patch
14 DEFINES += SW_VERSION_N4=12 # internal
14 DEFINES += SW_VERSION_N4=13 # internal
15
15
16 contains( CONFIG, debug_tch ) {
16 contains( CONFIG, debug_tch ) {
17 DEFINES += DEBUG_TCH
17 DEFINES += DEBUG_TCH
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 3.0.1, 2014-06-23T07:07:05. -->
3 <!-- Written by QtCreator 3.0.1, 2014-06-24T12:52:17. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -160,23 +160,29 void SM_average( float *averaged_spec_ma
160
160
161 void ASM_reorganize_and_divide( float *averaged_spec_mat, float *averaged_spec_mat_reorganized, float divider )
161 void ASM_reorganize_and_divide( float *averaged_spec_mat, float *averaged_spec_mat_reorganized, float divider )
162 {
162 {
163 // reorganize the data to have a matrix in the VHDL format
164 // INPUT (VHDL format)
165 // component_0[0 .. 127] component_1[0 .. 127] .. component_24[0 .. 127]
166 // OUTPUT (ICD format)
167 // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
168
163 int frequencyBin;
169 int frequencyBin;
164 int asmComponent;
170 int asmComponent;
165 unsigned int offsetAveragedSpecMatReorganized;
171 unsigned int offsetASMReorganized;
166 unsigned int offsetAveragedSpecMat;
172 unsigned int offsetASM;
167
173
168 for (asmComponent = 0; asmComponent < NB_VALUES_PER_SM; asmComponent++)
174 for (asmComponent = 0; asmComponent < NB_VALUES_PER_SM; asmComponent++)
169 {
175 {
170 for( frequencyBin = 0; frequencyBin < NB_BINS_PER_SM; frequencyBin++ )
176 for( frequencyBin = 0; frequencyBin < NB_BINS_PER_SM; frequencyBin++ )
171 {
177 {
172 offsetAveragedSpecMatReorganized =
178 offsetASM =
179 asmComponent * NB_BINS_PER_SM
180 + frequencyBin;
181 offsetASMReorganized =
173 frequencyBin * NB_VALUES_PER_SM
182 frequencyBin * NB_VALUES_PER_SM
174 + asmComponent;
183 + asmComponent;
175 offsetAveragedSpecMat =
184 averaged_spec_mat_reorganized[ offsetASMReorganized ] =
176 asmComponent * NB_BINS_PER_SM
185 averaged_spec_mat[ offsetASM ] / divider;
177 + frequencyBin;
178 averaged_spec_mat_reorganized[offsetAveragedSpecMatReorganized ] =
179 averaged_spec_mat[ offsetAveragedSpecMat ] / divider;
180 }
186 }
181 }
187 }
182 }
188 }
@@ -215,6 +221,12 void ASM_compress_reorganize_and_divide(
215
221
216 void ASM_convert( volatile float *input_matrix, char *output_matrix)
222 void ASM_convert( volatile float *input_matrix, char *output_matrix)
217 {
223 {
224 // convert the data to have a matrix in compressed float, 16 bits = [sign 1 bit *** exp 8 bits *** fraction 7 bits]
225 // INTPUT (ICD format)
226 // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
227 // OUTPUT (ICD format)
228 // matrix_0[0 .. 24] matrix_1[0 .. 24] .. matrix_127[0 .. 24]
229
218 unsigned int frequencyBin;
230 unsigned int frequencyBin;
219 unsigned int asmComponent;
231 unsigned int asmComponent;
220 char * pt_char_input;
232 char * pt_char_input;
General Comments 0
You need to be logged in to leave comments. Login now