HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r195:868116ca6c4a

R2 parameter added to TC_LFR_LOAD_COMMON_PAR...

paul -

r195:868116ca6c4a R3

parent child

Context file:

r195:868116ca6c4a

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters	1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters
2	5467523e44cd6a627a81b156673a891f4d6b0017 header/lfr_common_headers	2	a806a190dcd72f71d336545073400d3cdaaa3119 header/lfr_common_headers

header/processing/fsw_processing.h +11 0

             // parameters
             extern struct param_local_str param_local;
+            extern Packet_TM_LFR_PARAMETER_DUMP_t parameter_dump_packet;
             // registers
             extern time_management_regs_t *time_management_regs;
                                           ring_node *ring_node_tab[],
                                           unsigned int nbAverageNORM, unsigned int nbAverageSBM,
                                           asm_msg *msgForMATR );
             static inline void SM_average_debug(float *averaged_spec_mat_NORM, float *averaged_spec_mat_SBM,
                                           ring_node *ring_node_tab[],
                                           unsigned int nbAverageNORM, unsigned int nbAverageSBM,
                                           asm_msg *msgForMATR );
             void ASM_patch( float *inputASM, float *outputASM );
             void extractReImVectors(float *inputASM, float *outputASM, unsigned int asmComponent );
             static inline void ASM_reorganize_and_divide(float *averaged_spec_mat, float *averaged_spec_mat_reorganized,
                                            float divider );
             static inline void ASM_compress_reorganize_and_divide(float *averaged_spec_mat, float *compressed_spec_mat,
                                               float divider,
                                               unsigned char nbBinsCompressedMatrix, unsigned char nbBinsToAverage , unsigned char ASMIndexStart);
             static inline void ASM_convert(volatile float *input_matrix, char *output_matrix);
             void SM_average( float *averaged_spec_mat_NORM, float *averaged_spec_mat_SBM,
                 }
             }
+            void ASM_compress_reorganize_and_divide_mask(float *averaged_spec_mat, float *compressed_spec_mat,
+                                              float divider,
+                                              unsigned char nbBinsCompressedMatrix, unsigned char nbBinsToAverage , unsigned char ASMIndexStart);
+            int getFBinMask(int k);
             #endif // FSW_PROCESSING_H_INCLUDED

header/tc_load_dump_parameters.h +5 0

             #include "tm_lfr_tc_exe.h"
             #include "fsw_misc.h"
             #include "basic_parameters_params.h"
+            #include "avf0_prc0.h"
             #define FLOAT_EQUAL_ZERO 0.001
             unsigned int check_update_info_hk_tds_mode( unsigned char mode );
             unsigned int check_update_info_hk_thr_mode( unsigned char mode );
+            // FBINS_MASK
+            int set_sy_lfr_fbins( ccsdsTelecommandPacket_t *TC );
             // KCOEFFICIENTS
             int set_sy_lfr_kcoeff( ccsdsTelecommandPacket_t *TC );
+            void copyFloatByChar( unsigned char *destination, unsigned char *source );
             void init_parameter_dump( void );
             void init_kcoefficients_dump( void );

python_scripts/LFRControlPlugin_reload_fsw.py +1 -1

             # LOAD FSW USING LINK 1
-            SpwPlugin0.StarDundeeSelectLinkNumber( 1 )
+            SpwPlugin0.StarDundeeSelectLinkNumber( 2 )
             dsu3plugin0.openFile("/opt/DEV_PLE/FSW-qt/bin/fsw")
             #dsu3plugin0.openFile("/opt/LFR/LFR-FSW/2.0.2.3/fsw")

python_scripts/LFRControlPlugin_setup.py +1 0

             SpwPlugin0.StarDundeeSelectBrick(1)
             SpwPlugin0.StarDundeeSetBrickAsARouter(1)
+            SpwPlugin0.StarDundeeSelectLinkNumber( 2 )
             SpwPlugin0.connectBridge()
             #SpwPlugin0.TCPServerSetIP("127.0.0.1")

src/fsw_init.c 0 -2

                 BOOT_PRINTF("delete INIT\n")
-            //    test_TCH();
                 status = rtems_task_delete(RTEMS_SELF);
             }

src/fsw_misc.c +2 0

                         spacewire_update_statistics();
+                        housekeeping_packet.sy_lfr_common_parameters_spare  = parameter_dump_packet.sy_lfr_common_parameters_spare;
+                        housekeeping_packet.sy_lfr_common_parameters        = parameter_dump_packet.sy_lfr_common_parameters;
                         get_temperatures( housekeeping_packet.hk_lfr_temp_scm );
                         get_v_e1_e2_f3(   housekeeping_packet.hk_lfr_sc_v_f3  );
                         get_cpu_load( (unsigned char *) &housekeeping_packet.hk_lfr_cpu_load );

src/processing/fsw_processing.c +65 0

@@ -584,3 +584,68 void ASM_patch( float inputASM, float
584	copyReVectors(inputASM, outputASM, 21); // e1e1	584	copyReVectors(inputASM, outputASM, 21); // e1e1
585	copyReVectors(inputASM, outputASM, 24); // e2e2	585	copyReVectors(inputASM, outputASM, 24); // e2e2
586	}	586	}
		587
		588	void ASM_compress_reorganize_and_divide_mask(float averaged_spec_mat, float compressed_spec_mat , float divider,
		589	unsigned char nbBinsCompressedMatrix, unsigned char nbBinsToAverage, unsigned char ASMIndexStart )
		590	{
		591	//*************
		592	// input format
		593	// component0[0 .. 127] component1[0 .. 127] .. component24[0 .. 127]
		594	//**************
		595	// output format
		596	// matr0[0 .. 24] matr1[0 .. 24] .. matr127[0 .. 24]
		597	//************
		598	// compression
		599	// matr0[0 .. 24] matr1[0 .. 24] .. matr11[0 .. 24] => f0 NORM
		600	// matr0[0 .. 24] matr1[0 .. 24] .. matr22[0 .. 24] => f0 BURST, SBM
		601
		602	int frequencyBin;
		603	int asmComponent;
		604	int offsetASM;
		605	int offsetCompressed;
		606	int offsetFBin;
		607	int fBinMask;
		608	int k;
		609
		610	// BUILD DATA
		611	for (asmComponent = 0; asmComponent < NB_VALUES_PER_SM; asmComponent++)
		612	{
		613	for( frequencyBin = 0; frequencyBin < nbBinsCompressedMatrix; frequencyBin++ )
		614	{
		615	offsetCompressed = // NO TIME OFFSET
		616	frequencyBin * NB_VALUES_PER_SM
		617	+ asmComponent;
		618	offsetASM = // NO TIME OFFSET
		619	asmComponent * NB_BINS_PER_SM
		620	+ ASMIndexStart
		621	+ frequencyBin * nbBinsToAverage;
		622	offsetFBin = ASMIndexStart
		623	+ frequencyBin * nbBinsToAverage;
		624	compressed_spec_mat[ offsetCompressed ] = 0;
		625	for ( k = 0; k < nbBinsToAverage; k++ )
		626	{
		627	fBinMask = getFBinMask( offsetFBin + k );
		628	compressed_spec_mat[offsetCompressed ] =
		629	( compressed_spec_mat[ offsetCompressed ]
		630	+ averaged_spec_mat[ offsetASM + k ] * fBinMask );
		631	}
		632	compressed_spec_mat[ offsetCompressed ] =
		633	compressed_spec_mat[ offsetCompressed ] / (divider * nbBinsToAverage);
		634	}
		635	}
		636
		637	}
		638
		639	int getFBinMask( int index )
		640	{
		641	unsigned int indexInChar;
		642	unsigned int indexInTheChar;
		643	int fbin;
		644
		645	indexInChar = index >> 3;
		646	indexInTheChar = index - indexInChar * 8;
		647
		648	fbin = (int) ((parameter_dump_packet.sy_lfr_fbins_f0_word1[ NB_BYTES_PER_FREQ_MASK - 1 - indexInChar] >> indexInTheChar) & 0x1);
		649
		650	return fbin;
		651	}

src/tc_load_dump_parameters.c +64 -36

                  *
                  */
-                parameter_dump_packet.unused0 = TC->dataAndCRC[0];
+                parameter_dump_packet.sy_lfr_common_parameters_spare    = TC->dataAndCRC[0];
-                parameter_dump_packet.sy_lfr_common_parameters = TC->dataAndCRC[1];
+                parameter_dump_packet.sy_lfr_common_parameters          = TC->dataAndCRC[1];
                 set_wfp_data_shaping( );
                 return LFR_SUCCESSFUL;
             }
                 flag = LFR_DEFAULT;
-                send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
+                flag = set_sy_lfr_fbins( TC );
                 return flag;
             }
                 {
                     kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + 1] = freq;
                     bin = freq;
-                    printKCoefficients( freq, bin, k_coeff_intercalib_f0_norm);
+            //        printKCoefficients( freq, bin, k_coeff_intercalib_f0_norm);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + coeff*NB_BYTES_PER_FLOAT + 2 ]; // 2 for the kcoeff_frequency
                         kCoeffPtr     = (unsigned char*) &k_coeff_intercalib_f0_norm[ (bin*NB_K_COEFF_PER_BIN) + coeff ];
-                        kCoeffDumpPtr[0] = kCoeffPtr[0];
+                        copyFloatByChar( kCoeffDumpPtr, kCoeffPtr );
-                        kCoeffDumpPtr[1] = kCoeffPtr[1];
-                        kCoeffDumpPtr[2] = kCoeffPtr[2];
-                        kCoeffDumpPtr[3] = kCoeffPtr[3];
                     }
                 }
                 for( freq=NB_BINS_COMPRESSED_SM_F0;
                 {
                     kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + 1 ] = freq;
                     bin = freq - NB_BINS_COMPRESSED_SM_F0;
-                    printKCoefficients( freq, bin, k_coeff_intercalib_f1_norm);
+            //        printKCoefficients( freq, bin, k_coeff_intercalib_f1_norm);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + coeff*NB_BYTES_PER_FLOAT + 2 ]; // 2 for the kcoeff_frequency
                         kCoeffPtr     = (unsigned char*) &k_coeff_intercalib_f1_norm[ (bin*NB_K_COEFF_PER_BIN) + coeff ];
-                        kCoeffDumpPtr[0] = kCoeffPtr[0];
+                        copyFloatByChar( kCoeffDumpPtr, kCoeffPtr );
-                        kCoeffDumpPtr[1] = kCoeffPtr[1];
-                        kCoeffDumpPtr[2] = kCoeffPtr[2];
-                        kCoeffDumpPtr[3] = kCoeffPtr[3];
                     }
                 }
                 for( freq=(NB_BINS_COMPRESSED_SM_F0+NB_BINS_COMPRESSED_SM_F1);
                 {
                     kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + 1 ] = freq;
                     bin = freq - (NB_BINS_COMPRESSED_SM_F0+NB_BINS_COMPRESSED_SM_F1);
-                    printKCoefficients( freq, bin, k_coeff_intercalib_f2);
+            //        printKCoefficients( freq, bin, k_coeff_intercalib_f2);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + coeff*NB_BYTES_PER_FLOAT + 2 ]; // 2 for the kcoeff_frequency
                         kCoeffPtr     = (unsigned char*) &k_coeff_intercalib_f2[ (bin*NB_K_COEFF_PER_BIN) + coeff ];
-                        kCoeffDumpPtr[0] = kCoeffPtr[0];
+                        copyFloatByChar( kCoeffDumpPtr, kCoeffPtr );
-                        kCoeffDumpPtr[1] = kCoeffPtr[1];
-                        kCoeffDumpPtr[2] = kCoeffPtr[2];
-                        kCoeffDumpPtr[3] = kCoeffPtr[3];
                     }
                 }
                 kcoefficients_dump_1.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 {
                     kcoefficients_dump_2.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + 1 ] = NB_BINS_COMPRESSED_SM_F0 + NB_BINS_COMPRESSED_SM_F1 + 6 + freq;
                     bin = freq + 6;
-                    printKCoefficients( freq, bin, k_coeff_intercalib_f2);
+            //        printKCoefficients( freq, bin, k_coeff_intercalib_f2);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_2.kcoeff_blks[ freq*KCOEFF_BLK_SIZE + coeff*NB_BYTES_PER_FLOAT + 2 ]; // 2 for the kcoeff_frequency
                         kCoeffPtr     = (unsigned char*) &k_coeff_intercalib_f2[ (bin*NB_K_COEFF_PER_BIN) + coeff ];
-                        kCoeffDumpPtr[0] = kCoeffPtr[0];
+                        copyFloatByChar( kCoeffDumpPtr, kCoeffPtr );
-                        kCoeffDumpPtr[1] = kCoeffPtr[1];
-                        kCoeffDumpPtr[2] = kCoeffPtr[2];
-                        kCoeffDumpPtr[3] = kCoeffPtr[3];
                     }
                 }
                 kcoefficients_dump_2.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 return status;
             }
+            //***********
+            // FBINS MASK
+            int set_sy_lfr_fbins( ccsdsTelecommandPacket_t *TC )
+            {
+                int status;
+                unsigned int k;
+                unsigned char *fbins_mask_dump;
+                unsigned char *fbins_mask_TC;
+                status = LFR_SUCCESSFUL;
+                fbins_mask_dump = parameter_dump_packet.sy_lfr_fbins_f0_word1;
+                fbins_mask_TC = TC->dataAndCRC;
+                for (k=0; k < NB_FBINS_MASKS * NB_BYTES_PER_FBINS_MASK; k++)
+                {
+                    fbins_mask_dump[k] = fbins_mask_TC[k];
+                }
+                for (k=0; k < NB_FBINS_MASKS; k++)
+                {
+                    unsigned char *auxPtr;
+                    auxPtr = &parameter_dump_packet.sy_lfr_fbins_f0_word1[k*NB_BYTES_PER_FBINS_MASK];
+                    printf("%x %x %x %x\n", auxPtr[0], auxPtr[1], auxPtr[2], auxPtr[3]);
+                }
+                return status;
+            }
             //**************
             // KCOEFFICIENTS
             int set_sy_lfr_kcoeff( ccsdsTelecommandPacket_t *TC )
                     printf("freq = %d, bin = %d\n", sy_lfr_kcoeff_frequency, bin);
                     for (i=0; i<NB_K_COEFF_PER_BIN; i++)
                     {
-                        kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i];
+                        // destination
                         kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + i ];
-                        kcoeffNormPtr[0] = kcoeffLoadPtr[0];
+                        // source
-                        kcoeffNormPtr[1] = kcoeffLoadPtr[1];
+                        kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i];
-                        kcoeffNormPtr[2] = kcoeffLoadPtr[2];
+                        copyFloatByChar( kcoeffNormPtr, kcoeffLoadPtr );
-                        kcoeffNormPtr[3] = kcoeffLoadPtr[3];
-                        printf("kcoeffPtr: %x %x %x %x *** %f \n",
-                                kcoeffLoadPtr[0],
-                                kcoeffLoadPtr[1],
-                                kcoeffLoadPtr[2],
-                                kcoeffLoadPtr[3],
-                                kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + i ]);
                     }
                 }
                 return status;
             }
+            void copyFloatByChar( unsigned char *destination, unsigned char *source )
+            {
+                destination[0] = source[0];
+                destination[1] = source[1];
+                destination[2] = source[2];
+                destination[3] = source[3];
+            }
             //**********
             // init dump
                  *
                  */
+                unsigned int k;
                 parameter_dump_packet.targetLogicalAddress = CCSDS_DESTINATION_ID;
                 parameter_dump_packet.protocolIdentifier = CCSDS_PROTOCOLE_ID;
                 parameter_dump_packet.reserved = CCSDS_RESERVED;
                 //******************
                 // COMMON PARAMETERS
-                parameter_dump_packet.unused0 = DEFAULT_SY_LFR_COMMON0;
+                parameter_dump_packet.sy_lfr_common_parameters_spare    = DEFAULT_SY_LFR_COMMON0;
-                parameter_dump_packet.sy_lfr_common_parameters = DEFAULT_SY_LFR_COMMON1;
+                parameter_dump_packet.sy_lfr_common_parameters          = DEFAULT_SY_LFR_COMMON1;
                 //******************
                 // NORMAL PARAMETERS
                 // SBM2 PARAMETERS
                 parameter_dump_packet.sy_lfr_s2_bp_p0 = (unsigned char) DEFAULT_SY_LFR_S2_BP_P0;
                 parameter_dump_packet.sy_lfr_s2_bp_p1 = (unsigned char) DEFAULT_SY_LFR_S2_BP_P1;
+                //************
+                // FBINS MASKS
+                for (k=0; k < NB_FBINS_MASKS * NB_BYTES_PER_FBINS_MASK; k++)
+                {
+                    parameter_dump_packet.sy_lfr_fbins_f0_word1[k] = 0xff;
+                }
             }
             void init_kcoefficients_dump( void )

src/wf_handler.c +2 -4

                         + ( (data_shaping & 0x08) >> 2 )     // SP0
                         + ( (data_shaping & 0x04)      )     // SP1
                         + ( (data_shaping & 0x02) << 2 )     // R0
-                        + ( (data_shaping & 0x01) << 4 );    // R1
+                        + ( (data_shaping & 0x01) << 4 )     // R1
+                        + ( (data_shaping & 0x01) << 5 );    // R2
-                // this is a temporary way to set R2, compatible with the release 2 of the flight software
-                waveform_picker_regs->data_shaping = waveform_picker_regs->data_shaping + ( (0x1) << 5 );    // R2
             }
             void set_wfp_burst_enable_register( unsigned char mode )

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