HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r132:f919b72104cf

HK packet changed due to misalignment of one int data...

paul -

r132:f919b72104cf VHDLib206

parent child

Context file:

r132:f919b72104cf

Collapse all files

FSW-qt/Makefile +1 -1

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue May 13 07:12:26 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue May 13 15:18:10 2014
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-05-13T07:49:30. -->
+            <!-- Written by QtCreator 3.0.1, 2014-05-13T15:58:32. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
              <data>
               <variable>ProjectExplorer.Project.Target.0</variable>
               <valuemap type="QVariantMap">
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 4.8.3 in PATH (System)</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 4.8.3 in PATH (System)</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt 4.8.2 in PATH (System)</value>
-               <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{be73cf6a-f9d8-4d5a-8adf-adc2d83e2e44}</value>
+               <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5289e843-9ef2-45ce-88c6-ad27d8e08def}</value>
                <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-              <value type="QByteArray">{cdbf9cdc-1e84-406e-889b-c4feef49e75c}</value>
+              <value type="QByteArray">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

header/ccsds_types.h +1 -1

                 unsigned char hk_lfr_dpu_spw_tick_out_cnt;
                 unsigned char hk_lfr_dpu_spw_last_timc;
                 // ahb error statistics
-                unsigned int hk_lfr_last_fail_addr;
+                unsigned char hk_lfr_last_fail_addr[4];
                 // temperatures
                 unsigned char hk_lfr_temp_scm[2];
                 unsigned char hk_lfr_temp_pcb[2];

header/fsw_misc.h +3 -1

             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 );
+            void get_v_e1_e2_f3 (unsigned char *v, unsigned char *e1, unsigned char *e2);
             extern int sched_yield( void );
+            extern ring_node *current_ring_node_f3;
+            extern ring_node *ring_node_to_send_cwf_f3;
             #endif // FSW_MISC_H_INCLUDED

header/wf_handler.h 0 -1

             //******************
             // general functions
-            void init_waveforms( void );
             void init_waveform_rings( void );
             void init_waveform_ring( ring_node waveform_ring[], unsigned char nbNodes, volatile int wfrm[] );
             void reset_current_ring_nodes( void );

src/fsw_misc.c +6 -6

                         spacewire_update_statistics();
                         get_v_e1_e2_f3(
-                                    housekeeping_packet.hk_lfr_sc_v_f3, housekeeping_packet.hk_lfr_sc_e1_f3, housekeeping_packet.hk_lfr_sc_e2_f3,
+                                    housekeeping_packet.hk_lfr_sc_v_f3, housekeeping_packet.hk_lfr_sc_e1_f3, housekeeping_packet.hk_lfr_sc_e2_f3 );
-                                    false );
                         // SEND PACKET
                         status =  rtems_message_queue_urgent( queue_id, &housekeeping_packet,
                                             PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
             }
-            void get_v_e1_e2_f3( unsigned char *v, unsigned char *e1, unsigned char *e2, bool init_buffer_addr )
+            void get_v_e1_e2_f3( unsigned char *v, unsigned char *e1, unsigned char *e2 )
             {
                 unsigned int coarseTime;
                 unsigned int acquisitionTime;
                 else
                 {
                     coarseTime = time_management_regs->coarse_time & 0x7fffffff;
-                    bufferPtr = (unsigned char*) waveform_picker_regs->addr_data_f3;
+                    bufferPtr = (unsigned char*) current_ring_node_f3->buffer_address;
                     acquisitionTime = (unsigned int) ( ( bufferPtr[2] & 0x7f ) << 24 )
                             + (unsigned int) ( bufferPtr[3] << 16 )
                             + (unsigned int) ( bufferPtr[0] << 8  )
                     }
                     else if( coarseTime == acquisitionTime )
                     {
-                        offset_in_samples = 0;
+                        bufferPtr = (unsigned char*) current_ring_node_f3->previous->buffer_address;    // pick up v e1 and e2 in the previous f3 buffer
+                        offset_in_samples = NB_SAMPLES_PER_SNAPSHOT-1;
                     }
                     else
                     {
                     if ( offset_in_samples > (NB_SAMPLES_PER_SNAPSHOT - 1) )
                     {
-                        PRINTF1("ERR *** in get_v_e1_e2_f3 *** trying to read out the buffer, counter = %d\n", offset_in_samples)
+                        PRINTF1("ERR *** in get_v_e1_e2_f3 *** trying to read out of the buffer, counter = %d\n", offset_in_samples)
                         offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1;
                     }
                     PRINTF1("f3 data @ %x *** ", waveform_picker_regs->addr_data_f3 )

src/wf_handler.c 0 -33

@@ -214,8 +214,6 rtems_task wfrm_task(rtems_task_argument
214	init_header_snapshot_wf_table( SID_NORM_SWF_F1, headerSWF_F1 );	214	init_header_snapshot_wf_table( SID_NORM_SWF_F1, headerSWF_F1 );
215	init_header_snapshot_wf_table( SID_NORM_SWF_F2, headerSWF_F2 );	215	init_header_snapshot_wf_table( SID_NORM_SWF_F2, headerSWF_F2 );
216		216
217	init_waveforms();
218
219	status = get_message_queue_id_send( &queue_id );	217	status = get_message_queue_id_send( &queue_id );
220	if (status != RTEMS_SUCCESSFUL)	218	if (status != RTEMS_SUCCESSFUL)
221	{	219	{
@@ -449,37 +447,6 rtems_task swbd_task(rtems_task_argument
449		447
450	//******************	448	//******************
451	// general functions	449	// general functions
452	void init_waveforms( void )
453	{
454	int i = 0;
455
456	for (i=0; i< NB_SAMPLES_PER_SNAPSHOT; i++)
457	{
458	//***
459	// F0
460	// wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET ] = 0x88887777; //
461	// wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET ] = 0x22221111; //
462	// wf_snap_f0[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET ] = 0x44443333; //
463
464	//***
465	// F1
466	// wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET ] = 0x22221111;
467	// wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET ] = 0x44443333;
468	// wf_snap_f1[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET ] = 0xaaaa0000;
469
470	//***
471	// F2
472	// wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 0 + TIME_OFFSET ] = 0x44443333;
473	// wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 1 + TIME_OFFSET ] = 0x22221111;
474	// wf_snap_f2[ (i* NB_WORDS_SWF_BLK) + 2 + TIME_OFFSET ] = 0xaaaa0000;
475
476	//***
477	// F3
478	// wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 0 ] = val1;
479	// wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 1 ] = val2;
480	// wf_cont_f3[ (i* NB_WORDS_SWF_BLK) + 2 ] = 0xaaaa0000;
481	}
482	}
483		450
484	void init_waveform_rings( void )	451	void init_waveform_rings( void )
485	{	452	{

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