HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r174:c6546d192260

.hgsub created 644 +2 0

@@ -0,0 +1,2
	1	header/common_lfr_headers = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/lfr_common_headers
	2

.hgsubstate created 644 +1 0

	@@ -0,0 +1,1
				1	0000000000000000000000000000000000000000 header/common_lfr_headers

docs/RPW-MEB-LFR-NTT-00125-1-0_GSE_System_clock_simulator.odt created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

docs/block diagram.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

docs/star dundee little user s guide.odt created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

.hgignore +1 -1

             *.srec
             FSW-qt/bin/fsw
             src/LFR_basic-parameters
+            *.pro.user.*

FSW-qt/Makefile +1 -1

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Fri Nov 14 07:56:09 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Wed Nov 26 13:14:53 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 +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.2.1, 2014-11-13T16:06:58. -->
+            <!-- Written by QtCreator 3.2.1, 2014-12-10T17:20:49. -->
             <qtcreator>
              <data>
               <variable>EnvironmentId</variable>

src/fsw_misc.c +1 -1

                                     "in DUMB *** in SMIQ *** Error sending event to AVF0",                  // RTEMS_EVENT_3
                                     "in DUMB *** spectral_matrices_isr *** Error sending event to SMIQ",    // RTEMS_EVENT_4
                                     "in DUMB *** waveforms_simulator_isr",                                  // RTEMS_EVENT_5
-                                    "ERR HK",                                                               // RTEMS_EVENT_6
+                                    "VHDL SM *** two buffers f0 ready",                                     // RTEMS_EVENT_6
                                     "ready for dump",                                                       // RTEMS_EVENT_7
                                     "VHDL ERR *** spectral matrix",                                         // RTEMS_EVENT_8
                                     "tick",                                                                 // RTEMS_EVENT_9

src/processing/fsw_processing.c +10 -6

                 case 0:
                     break;
                 case 3:
+                    // send a message if two buffers are ready
+                    rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_6 );
                     if ( time_0 < time_1 )
                     {
                         close_matrix_actions( &nb_sm_f0, NB_SM_BEFORE_AVF0, Task_id[TASKID_AVF0],
             void spectral_matrix_isr_error_handler( void )
             {
-                rtems_status_code status_code;
+            //    rtems_status_code status_code;
-                if (spectral_matrix_regs->status & 0x7c0)    // [0111 1100 0000]
+            //    if (spectral_matrix_regs->status & 0x7c0)    // [0111 1100 0000]
+            //    {
-                    status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_8 );
+            //        status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_8 );
+            //    }
+            //    spectral_matrix_regs->status = spectral_matrix_regs->status & 0x7c0;
             }
             rtems_isr spectral_matrices_isr( rtems_vector_number vector )
                 spectral_matrices_isr_f2();
-            //    spectral_matrix_isr_error_handler();
+                spectral_matrix_isr_error_handler();
             }
             rtems_isr spectral_matrices_isr_simu( rtems_vector_number vector )

src/wf_handler.c +2 -2

                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out);
                     if(resynchronisationEngaged == false)
                     {   // engage resynchronisation
-                        snapshot_resynchronization( (unsigned char *)  ring_node_to_send_swf_f0->coarseTime );
+            //            snapshot_resynchronization( (unsigned char *)  ring_node_to_send_swf_f0->coarseTime );
                         resynchronisationEngaged = true;
                     }
                     else
                     {   // reset delta_snapshot to the nominal value
                         PRINTF("no resynchronisation, reset delta_snapshot to the nominal value\n")
-                        set_wfp_delta_snapshot();
+            //            set_wfp_delta_snapshot();
                         resynchronisationEngaged = false;
                     }
                     //

header/TC_types.h removed 0 -199

NO CONTENT: file was removed

header/ccsds_types.h removed 0 -670

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (670 lines changed) Show them Hide them

star dundee little user s guide.odt removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

timegen-qt/RPW-MEB-LFR-NTT-00125-1-0_GSE_System_clock_simulator.odt removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

timegen-qt/block diagram.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

	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