HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r185:193b5419a0cb

2.0.2.1

paul -

r185:193b5419a0cb VHDL_0_1_28

parent child

Context file:

r185:193b5419a0cb

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters	1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters
2	b984c315bf99562bdfbbd6bda8de296d2e692adc header/lfr_common_headers	2	6d02d4b02291d2b25c387fa74037dc7929cd92b5 header/lfr_common_headers

header/fsw_misc.h +1 -1

             void getTime( unsigned char *time);
             unsigned long long int getTimeAsUnsignedLongLongInt( );
             void send_dumb_hk( void );
+            void get_temperatures( unsigned char *temperatures );
             void get_v_e1_e2_f3( unsigned char *spacecraft_potential );
-            void get_temperatures( unsigned char *temperatures );
             void get_cpu_load( unsigned char *resource_statistics );
             extern int sched_yield( void );

header/processing/fsw_processing.h +13 -25

@@ -139,9 +139,10 static inline void SM_average(float *ave
139	ring_node *ring_node_tab[],	139	ring_node *ring_node_tab[],
140	unsigned int nbAverageNORM, unsigned int nbAverageSBM,	140	unsigned int nbAverageNORM, unsigned int nbAverageSBM,
141	asm_msg *msgForMATR );	141	asm_msg *msgForMATR );
142	static inline void SM_average_debug( float averaged_spec_mat_NORM, float averaged_spec_mat_SBM,	142	static inline void SM_average_debug(float averaged_spec_mat_NORM, float averaged_spec_mat_SBM,
143	ring_node *ring_node_tab[],	143	ring_node *ring_node_tab[],
144	unsigned int nbAverageNORM, unsigned int nbAverageSBM );	144	unsigned int nbAverageNORM, unsigned int nbAverageSBM,
		145	asm_msg *msgForMATR );
145		146
146	void ASM_patch( float inputASM, float outputASM );	147	void ASM_patch( float inputASM, float outputASM );
147	void extractReImVectors(float inputASM, float outputASM, unsigned int asmComponent );	148	void extractReImVectors(float inputASM, float outputASM, unsigned int asmComponent );
@@ -201,8 +202,9 void SM_average( float *averaged_spec_ma
201	}	202	}
202		203
203	void SM_average_debug( float averaged_spec_mat_NORM, float averaged_spec_mat_SBM,	204	void SM_average_debug( float averaged_spec_mat_NORM, float averaged_spec_mat_SBM,
204	ring_node *ring_node_tab[],	205	ring_node *ring_node_tab[],
205	unsigned int nbAverageNORM, unsigned int nbAverageSBM )	206	unsigned int nbAverageNORM, unsigned int nbAverageSBM,
		207	asm_msg *msgForMATR )
206	{	208	{
207	float sum;	209	float sum;
208	unsigned int i;	210	unsigned int i;
@@ -210,26 +212,12 void SM_average_debug( float *averaged_s
210	for(i=0; i<TOTAL_SIZE_SM; i++)	212	for(i=0; i<TOTAL_SIZE_SM; i++)
211	{	213	{
212	sum = ( (int *) (ring_node_tab[0]->buffer_address) ) [ i ];	214	sum = ( (int *) (ring_node_tab[0]->buffer_address) ) [ i ];
213		215	averaged_spec_mat_NORM[ i ] = sum;
214	if ( (nbAverageNORM == 0) && (nbAverageSBM == 0) )	216	averaged_spec_mat_SBM[ i ] = sum;
215	{	217	msgForMATR->coarseTimeNORM = ring_node_tab[0]->coarseTime;
216	averaged_spec_mat_NORM[ i ] = sum;	218	msgForMATR->fineTimeNORM = ring_node_tab[0]->fineTime;
217	averaged_spec_mat_SBM[ i ] = sum;	219	msgForMATR->coarseTimeSBM = ring_node_tab[0]->coarseTime;
218	}	220	msgForMATR->fineTimeSBM = ring_node_tab[0]->fineTime;
219	else if ( (nbAverageNORM != 0) && (nbAverageSBM != 0) )
220	{
221	averaged_spec_mat_NORM[ i ] = sum;
222	averaged_spec_mat_SBM[ i ] = sum;
223	}
224	else if ( (nbAverageNORM != 0) && (nbAverageSBM == 0) )
225	{
226	averaged_spec_mat_NORM[ i ] = sum;
227	averaged_spec_mat_SBM[ i ] = sum;
228	}
229	else
230	{
231	PRINTF2("ERR * in SM_average * unexpected parameters %d %d\n", nbAverageNORM, nbAverageSBM)
232	}
233	}	221	}
234	}	222	}
235		223

src/fsw_misc.c +20 -20

@@ -225,8 +225,8 rtems_task hous_task(rtems_task_argument
225		225
226	spacewire_update_statistics();	226	spacewire_update_statistics();
227		227
228	get_~~v_e1_e2_f3~~( housekeeping_packet.hk_lfr_~~sc_v_f3~~ );	228	get_temperatures( housekeeping_packet.hk_lfr_temp_scm );
229	get_~~temperatures~~( housekeeping_packet.hk_lfr_~~temp_scm~~);	229	get_v_e1_e2_f3( housekeeping_packet.hk_lfr_sc_v_f3 );
230	get_cpu_load( (unsigned char *) &housekeeping_packet.hk_lfr_cpu_load );	230	get_cpu_load( (unsigned char *) &housekeeping_packet.hk_lfr_cpu_load );
231		231
232	// SEND PACKET	232	// SEND PACKET
@@ -442,6 +442,24 void send_dumb_hk( void )
442	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);	442	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
443	}	443	}
444		444
		445	void get_temperatures( unsigned char *temperatures )
		446	{
		447	unsigned char* temp_scm_ptr;
		448	unsigned char* temp_pcb_ptr;
		449	unsigned char* temp_fpga_ptr;
		450
		451	temp_scm_ptr = (unsigned char *) &time_management_regs->temp_scm;
		452	temp_pcb_ptr = (unsigned char *) &time_management_regs->temp_pcb;
		453	temp_fpga_ptr = (unsigned char *) &time_management_regs->temp_fpga;
		454
		455	temperatures[0] = temp_scm_ptr[2];
		456	temperatures[1] = temp_scm_ptr[3];
		457	temperatures[2] = temp_pcb_ptr[2];
		458	temperatures[3] = temp_pcb_ptr[3];
		459	temperatures[4] = temp_fpga_ptr[2];
		460	temperatures[5] = temp_fpga_ptr[3];
		461	}
		462
445	void get_v_e1_e2_f3( unsigned char *spacecraft_potential )	463	void get_v_e1_e2_f3( unsigned char *spacecraft_potential )
446	{	464	{
447	unsigned char* v_ptr;	465	unsigned char* v_ptr;
@@ -460,24 +478,6 void get_v_e1_e2_f3( unsigned char *spac
460	spacecraft_potential[5] = e2_ptr[3];	478	spacecraft_potential[5] = e2_ptr[3];
461	}	479	}
462		480
463	void get_temperatures( unsigned char *temperatures )
464	{
465	unsigned char* temp_scm_ptr;
466	unsigned char* temp_pcb_ptr;
467	unsigned char* temp_fpga_ptr;
468
469	temp_scm_ptr = (unsigned char *) &time_management_regs->temp_scm;
470	temp_pcb_ptr = (unsigned char *) &time_management_regs->temp_pcb;
471	temp_fpga_ptr = (unsigned char *) &time_management_regs->temp_fpga;
472
473	temperatures[0] = temp_scm_ptr[2];
474	temperatures[1] = temp_scm_ptr[3];
475	temperatures[2] = temp_pcb_ptr[2];
476	temperatures[3] = temp_pcb_ptr[3];
477	temperatures[4] = temp_fpga_ptr[2];
478	temperatures[5] = temp_fpga_ptr[3];
479	}
480
481	void get_cpu_load( unsigned char *resource_statistics )	481	void get_cpu_load( unsigned char *resource_statistics )
482	{	482	{
483	unsigned char cpu_load;	483	unsigned char cpu_load;

src/fsw_spacewire.c 0 -3

                 header->blkNr[0] = (unsigned char) (BLK_NR_CWF_SHORT_F3 >> 8);
                 header->blkNr[1] = (unsigned char) (BLK_NR_CWF_SHORT_F3     );
-                printf("spw_send_waveform_CWF3_light => [0] = %x, [1] = %x, [2] = %x, [3] = %x, [4] = %x, [5] = %x\n",
-                       dataPtr[0], dataPtr[1], dataPtr[2], dataPtr[3], dataPtr[4], dataPtr[5]);
                 //*********************
                 // SEND CWF3_light DATA
                 for (i=0; i<NB_PACKETS_PER_GROUP_OF_CWF_LIGHT; i++) // send waveform

src/wf_handler.c +11 -11

                 switch(status)
                 {
                 case 1:
-                    ring_node_to_send_cwf_f2    = current_ring_node_f2->previous;
+                    ring_node_to_send_cwf_f2                = current_ring_node_f2->previous;
-                    ring_node_to_send_cwf_f2->sid = SID_BURST_CWF_F2;
+                    ring_node_to_send_cwf_f2->sid           = SID_BURST_CWF_F2;
-                    current_ring_node_f2        = current_ring_node_f2->next;
                     ring_node_to_send_cwf_f2->coarseTime    = waveform_picker_regs->f2_0_coarse_time;
                     ring_node_to_send_cwf_f2->fineTime      = waveform_picker_regs->f2_0_fine_time;
+                    current_ring_node_f2                    = current_ring_node_f2->next;
                     waveform_picker_regs->addr_data_f2_0    = current_ring_node_f2->buffer_address;
                     if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_BURST ) != RTEMS_SUCCESSFUL) {
                         spare_status = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_0 );
                     waveform_picker_regs->status            = waveform_picker_regs->status & 0x00004410; // [0100 0100 0001 0000]
                     break;
                 case 2:
-                    ring_node_to_send_cwf_f2    = current_ring_node_f2->previous;
+                    ring_node_to_send_cwf_f2                = current_ring_node_f2->previous;
-                    ring_node_to_send_cwf_f2->sid = SID_BURST_CWF_F2;
+                    ring_node_to_send_cwf_f2->sid           = SID_BURST_CWF_F2;
-                    current_ring_node_f2        = current_ring_node_f2->next;
                     ring_node_to_send_cwf_f2->coarseTime    = waveform_picker_regs->f2_1_coarse_time;
                     ring_node_to_send_cwf_f2->fineTime      = waveform_picker_regs->f2_1_fine_time;
+                    current_ring_node_f2                    = current_ring_node_f2->next;
                     waveform_picker_regs->addr_data_f2_1    = current_ring_node_f2->buffer_address;
                     if (rtems_event_send( Task_id[TASKID_CWF2], RTEMS_EVENT_MODE_BURST ) != RTEMS_SUCCESSFUL) {
                         spare_status = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_0 );
                     wf_cont_f3_light[ (i * NB_BYTES_CWF3_LIGHT_BLK) + 5 ] = sample[ 5 ];
                 }
-                printf("send_waveform_CWF3_light => [0] = %x, [1] = %x, [2] = %x\n", dataPtr[0], dataPtr[1], dataPtr[2]);
                 // SEND PACKET
                 status =  rtems_message_queue_send( queue_id, &ring_node_cwf3_light, sizeof( ring_node* ) );
                 if (status != RTEMS_SUCCESSFUL) {
                 // (2) compute the central reference time
                 centerTime_asLong = acquisitionTimeF0_asLong + deltaT_F0;
-                printf("centerTime_asLong = %llx\n", centerTime_asLong);
                 // (3) compute the acquisition time of the current snapshot
                 switch(frequencyChannel)
                 deltaPrevious       = ((double) deltaPreviousTick) / 65536. * 1000.;
                 deltaNext           = ((double) deltaNextTick) / 65536. * 1000.;
-                printf("delta previous = %f ms, delta next = %f ms\n", deltaPrevious, deltaNext);
+                PRINTF2("delta previous = %f ms, delta next = %f ms\n", deltaPrevious, deltaNext)
-                printf("delta previous = %llu, delta next = %llu\n", deltaPreviousTick, deltaNextTick);
+                PRINTF2("delta previous = %llu, delta next = %llu\n", deltaPreviousTick, deltaNextTick)
                 // which tick is the closest
                 if (deltaPreviousTick > deltaNextTick)
                         + ( (data_shaping & 0x04)      )     // SP1
                         + ( (data_shaping & 0x02) << 2 )     // R0
                         + ( (data_shaping & 0x01) << 4 );    // R1
+                // 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