HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r129:85c441b3b744

The HK packet contains v, e1 and e2 valid data at f3....

paul -

r129:85c441b3b744 VHDLib206

parent child

Context file:

r129:85c441b3b744

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri May 2 15:40:46 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue May 6 08:24:43 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=6 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=7 -DPRINT_MESSAGES_ON_CONSOLE -DPRINT_TASK_STATISTICS
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/basic_parameters

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

             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
+            CONFIG += console verbose cpu_usage_report
             CONFIG -= qt
             include(./sparc.pri)
             DEFINES += SW_VERSION_N1=1 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=6 # internal
+            DEFINES += SW_VERSION_N4=7 # internal
             contains( CONFIG, debug_tch ) {
                 DEFINES += DEBUG_TCH

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-05-02T15:40:56. -->
+            <!-- Written by QtCreator 3.0.1, 2014-05-06T09:36:02. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_misc.h +1 0

             void getTime( unsigned char *time);
             unsigned long long int getTimeAsUnsignedLongLongInt( );
             void send_dumb_hk( void );
+            void get_v_e1_e2_f3 (unsigned char *v, unsigned char *e1, unsigned char *e2, bool init_buffer_addr );
             extern int sched_yield( void );

src/fsw_init.c +1 -1

                 {
                     status = rtems_task_create(
                         Task_name[TASKID_ACTN], TASK_PRIORITY_ACTN, RTEMS_MINIMUM_STACK_SIZE,
-                        RTEMS_DEFAULT_MODES,
+                        RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT,
                         RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT, &Task_id[TASKID_ACTN]
                     );
                 }

src/fsw_misc.c +68 -1

@@ -221,6 +221,10 rtems_task hous_task(rtems_task_argument
221		221
222	spacewire_update_statistics();	222	spacewire_update_statistics();
223		223
		224	get_v_e1_e2_f3(
		225	housekeeping_packet.hk_lfr_sc_v_f3, housekeeping_packet.hk_lfr_sc_e1_f3, housekeeping_packet.hk_lfr_sc_e2_f3,
		226	false );
		227
224	// SEND PACKET	228	// SEND PACKET
225	status = rtems_message_queue_urgent( queue_id, &housekeeping_packet,	229	status = rtems_message_queue_urgent( queue_id, &housekeeping_packet,
226	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);	230	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
@@ -255,7 +259,7 rtems_task dumb_task( rtems_task_argumen
255		259
256	char DumbMessages[10] = {"in DUMB ** default", // RTEMS_EVENT_0	260	char DumbMessages[10] = {"in DUMB ** default", // RTEMS_EVENT_0
257	"in DUMB *** timecode_irq_handler", // RTEMS_EVENT_1	261	"in DUMB *** timecode_irq_handler", // RTEMS_EVENT_1
258	"in DUMB *** ~~waveforms_isr~~", // RTEMS_EVENT_2	262	"in DUMB *** f3 buffer changed", // RTEMS_EVENT_2
259	"in DUMB * in SMIQ * Error sending event to AVF0", // RTEMS_EVENT_3	263	"in DUMB * in SMIQ * Error sending event to AVF0", // RTEMS_EVENT_3
260	"in DUMB * spectral_matrices_isr * Error sending event to SMIQ", // RTEMS_EVENT_4	264	"in DUMB * spectral_matrices_isr * Error sending event to SMIQ", // RTEMS_EVENT_4
261	"in DUMB *** waveforms_simulator_isr", // RTEMS_EVENT_5	265	"in DUMB *** waveforms_simulator_isr", // RTEMS_EVENT_5
@@ -432,3 +436,66 void send_dumb_hk( void )
432	rtems_message_queue_urgent( queue_id, &dummy_hk_packet,	436	rtems_message_queue_urgent( queue_id, &dummy_hk_packet,
433	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);	437	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
434	}	438	}
		439
		440	void get_v_e1_e2_f3( unsigned char v, unsigned char e1, unsigned char *e2, bool init_buffer_addr )
		441	{
		442	static int *current_addr_data_f3 = NULL;
		443	int *new_addr_data_f3;
		444	unsigned char *ptr;
		445
		446	static unsigned int counter = 0;
		447	unsigned int offset_in_samples;
		448	unsigned int offset_in_words;
		449	unsigned char delta = 16; // v, e1 and e2 will be picked up each second, f3 = 16 Hz
		450
		451	new_addr_data_f3 = (int *) waveform_picker_regs->addr_data_f3;
		452
		453	if (init_buffer_addr == true) // when the waveform_picker is launched
		454	{
		455	current_addr_data_f3 = NULL;
		456	}
		457	else
		458	{
		459	if (lfrCurrentMode == LFR_MODE_STANDBY)
		460	{
		461	v[0] = 0x00;
		462	v[1] = 0x00;
		463	e1[0] = 0x00;
		464	e1[1] = 0x00;
		465	e2[0] = 0x00;
		466	e2[1] = 0x00;
		467	}
		468	else
		469	{
		470	if ( new_addr_data_f3 != current_addr_data_f3 )
		471	{
		472	counter = 0;
		473	offset_in_samples = 0;
		474	current_addr_data_f3 = new_addr_data_f3;
		475	}
		476	else
		477	{
		478	counter = counter + 1;
		479	offset_in_samples = counter * delta;
		480	if ( offset_in_samples > NB_SAMPLES_PER_SNAPSHOT )
		481	{
		482	offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1;
		483	PRINTF1("ERR * in get_v_e1_e2_f3 * trying to read out the buffer, counter = %d\n", counter)
		484	}
		485	}
		486	offset_in_words = TIME_OFFSET + offset_in_samples * NB_WORDS_SWF_BLK;
		487	ptr = (unsigned char*) &current_addr_data_f3[ offset_in_words ];
		488	v[0] = ptr[0];
		489	v[1] = ptr[1];
		490	e1[0] = ptr[2];
		491	e1[1] = ptr[3];
		492	e2[0] = ptr[4];
		493	e2[1] = ptr[5];
		494	}
		495	}
		496	}
		497
		498
		499
		500
		501

src/tc_handler.c +1 0

                 reset_current_ring_nodes();
                 reset_waveform_picker_regs();
                 set_wfp_burst_enable_register( mode );
+                get_v_e1_e2_f3( NULL, NULL, NULL, true );
                 LEON_Clear_interrupt( IRQ_WAVEFORM_PICKER );
                 LEON_Unmask_interrupt( IRQ_WAVEFORM_PICKER );

src/wf_handler.c +11 -2

                 rtems_status_code status;
-                if ( (lfrCurrentMode == LFR_MODE_NORMAL)
+                if ( (lfrCurrentMode == LFR_MODE_NORMAL) || (lfrCurrentMode == LFR_MODE_BURST)  // in BURST the data are used to place v, e1 and e2 in the HK packet
                      || (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) )
                 { // in modes other than STANDBY and BURST, send the CWF_F3 data
                     if ((waveform_picker_regs->status & 0x08) == 0x08){     // [1000] f3 is full
                     // wait for an RTEMS_EVENT
                     rtems_event_receive( RTEMS_EVENT_0,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
+                    if ( (lfrCurrentMode == LFR_MODE_NORMAL)
+                         || (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode==LFR_MODE_SBM2) )
+                    {
                         if ( (parameter_dump_packet.sy_lfr_n_cwf_long_f3 & 0x01) == 0x01)
                         {
                             PRINTF("send CWF_LONG_F3\n")
                         }
                     }
+                    else
+                    {
+                        PRINTF1("in CWF3 *** lfrCurrentMode is %d, no data will be sent\n", lfrCurrentMode)
+                    }
+                }
             }
             rtems_task cwf2_task(rtems_task_argument argument)  // ONLY USED IN BURST AND SBM2
                     break;
                 case(LFR_MODE_BURST):
                     waveform_picker_regs->run_burst_enable = 0x40;  // [0100 0000] f2 burst enabled
-                    waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x04; // [0100] enable f2
+            //        waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x04; // [0100] enable f2
+                    waveform_picker_regs->run_burst_enable =  waveform_picker_regs->run_burst_enable | 0x06; // [0110] enable f3 AND f2
                     break;
                 case(LFR_MODE_SBM1):
                     waveform_picker_regs->run_burst_enable = 0x20;  // [0010 0000] f1 burst enabled

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