HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r253:cc5f75e74b54

Snapshot resynchro rewritten, drift is measured one snapshot in two...

paul -

r253:cc5f75e74b54 R3a

parent child

Context file:

r253:cc5f75e74b54

Collapse all files

header/GscMemoryLPP.hpp +3 -3

                 if( (vendorId == VENDORID_GAISLER) & (deviceId ==DEVICEID_LEON3FT) )
                 {
-                    PRINTF("in faultTolerantScheme *** Leon3FT detected, configure the CCR FT bits");
+                    PRINTF("in faultTolerantScheme *** Leon3FT detected, configure the CCR FT bits\n");
                     cacheControlRegister = CCR_getValue();
                     cacheControlRegister = (cacheControlRegister | 0xc);
                     CCR_setValue(cacheControlRegister);
             //*******************************************
             // ASR16 Register protection control register
-            static unsigned int ASR16_get_FPRF_IURF_ErrorCounters( unsigned int* fprfErrorCounter, unsigned int* iurfErrorCounter)
+            static void ASR16_get_FPRF_IURF_ErrorCounters( unsigned int* fprfErrorCounter, unsigned int* iurfErrorCounter)
             {
                 /** This function is used to retrieve the integer unit register file error counter and the floating point unit
                  *  register file error counter
                 *iurfErrorCounter = ( asr16 & COUNTER_FIELD_IURF ) >> POS_IURF;
                 // reset the counter to 0
-                asr16 = asr16Ptr
+                asr16 = asr16
                         & COUNTER_MASK_FPRF
                         & COUNTER_FIELD_IURF;

header/fsw_spacewire.h +1 -1

             int spacewire_start_link( int fd );
             int spacewire_stop_and_start_link( int fd );
             int spacewire_configure_link(int fd );
-            int spacewire_reset_link( void );
+            int spacewire_several_connect_attemps( void );
             void spacewire_set_NP( unsigned char val, unsigned int regAddr ); // No Port force
             void spacewire_set_RE( unsigned char val, unsigned int regAddr ); // RMAP Enable
             void spacewire_compute_stats_offsets( void );

python_scripts/LFRControlPlugin_reload_fsw.py +1 -1

             dsu3plugin0.run()
             # START SENDING TIMECODES AT 1 Hz
-            SpwPlugin0.StarDundeeStartTimecodes( 1 )
+            #SpwPlugin0.StarDundeeStartTimecodes( 1 )
             # it is possible to change the time code frequency
             #RMAPPlugin0.changeTimecodeFrequency(2)

src/fsw_init.c +2 -3

                 CCR_faultTolerantScheme();
-                // FT activation
+                PRINTF("\n");
             }
             rtems_task Init( rtems_task_argument ignored )
                 rtems_isr_entry  old_isr_handler;
                 // UART settings
-                send_console_outputs_on_apbuart_port();
+                enable_apbuart_transmitter();
                 set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);
-                enable_apbuart_transmitter();
                 DEBUG_PRINTF("\n\n\n\n\nIn INIT *** Now the console is on port COM1\n")

src/fsw_misc.c +2 -10

             }
-            int send_console_outputs_on_apbuart_port( void ) // Send the console outputs on the apbuart port
+            int enable_apbuart_transmitter( void )  // set the bit 1, TE Transmitter Enable to 1 in the APBUART control register
             {
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) REGS_ADDR_APBUART;
                 return 0;
             }
-            int enable_apbuart_transmitter( void )  // set the bit 1, TE Transmitter Enable to 1 in the APBUART control register
-                struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) REGS_ADDR_APBUART;
-                apbuart_regs->ctrl = apbuart_regs->ctrl | APBUART_CTRL_REG_MASK_TE;
-                return 0;
             void set_apbuart_scaler_reload_register(unsigned int regs, unsigned int value)
             {
                 /** This function sets the scaler reload register of the apbuart module
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) regs;
                 apbuart_regs->scaler = value;
                 BOOT_PRINTF1("OK  *** apbuart port scaler reload register set to 0x%x\n", value)
             }

src/fsw_spacewire.c +4 -3

                     if ( linkStatus != 5 )  // [2.a] not in run state, reset the link
                     {
                         spacewire_compute_stats_offsets();
-                        status = spacewire_reset_link( );
+                        status = spacewire_several_connect_attemps( );
                     }
                     else                    // [2.b] in run state, start the link
                     {
                     else                                // [3.b] the link is not in run state, go in STANDBY mode
                     {
                         status = enter_mode_standby();
-                        if ( status != RTEMS_SUCCESSFUL ) {
+                        if ( status != RTEMS_SUCCESSFUL )
+                        {
                             PRINTF1("in SPIQ *** ERR enter_standby_mode *** code %d\n", status)
                         }
                         // wake the WTDG task up to wait for the link recovery
                 return status;
             }
-            int spacewire_reset_link( void )
+            int spacewire_several_connect_attemps( void )
             {
                 /** This function is executed by the SPIQ rtems_task wehn it has been awaken by an interruption raised by the SpaceWire driver.
                  *

src/tc_handler.c +3 -2

             void update_last_valid_transition_date( unsigned int transitionCoarseTime )
             {
                 lastValidEnterModeTime = transitionCoarseTime;
+                PRINTF1("lastValidEnterModeTime = %x\n", transitionCoarseTime);
             }
             int check_transition_date( unsigned int transitionCoarseTime )
                 {
                     localCoarseTime = time_management_regs->coarse_time & 0x7fffffff;
-                    PRINTF2("localTime = %x, transitionTime = %x\n", localCoarseTime, transitionCoarseTime)
+                    PRINTF2("localTime = %x, transitionTime = %x\n", localCoarseTime, transitionCoarseTime);
                     if ( transitionCoarseTime <= localCoarseTime )   // SSS-CP-EQS-322
                     {
                         status = LFR_DEFAULT;
-                        PRINTF("ERR *** in check_transition_date *** transitionCoarseTime <= localCoarseTime\n")
+                        PRINTF("ERR *** in check_transition_date *** transitionCoarseTime <= localCoarseTime\n");
                     }
                     if (status == LFR_SUCCESSFUL)

src/wf_handler.c +27 -9

                 unsigned long long int nextTick;
                 unsigned long long int deltaPreviousTick;
                 unsigned long long int deltaNextTick;
-                unsigned int deltaTickInF2;
+                int deltaTickInF2;
                 double deltaPrevious_ms;
                 double deltaNext_ms;
+                double correctionInF2;
+                static unsigned char resynchroEngaged = 0;
+                if (resynchroEngaged == 0)
+                {
+                    resynchroEngaged = 1;
                     // get acquisition time in fine time ticks
                     acquisitionTime = get_acquisition_time( timePtr );
                     PRINTF2("delta previous = %f ms, delta next = %f ms\n", deltaPrevious_ms, deltaNext_ms);
                     PRINTF2("delta previous = %llu fine time ticks, delta next = %llu fine time ticks\n", deltaPreviousTick, deltaNextTick);
-                // which tick is the closest
+                    // which tick is the closest?
                     if (deltaPreviousTick > deltaNextTick)
                     {
                         // the snapshot center is just before the second => increase delta_snapshot
-                    deltaTickInF2 = ceil( (deltaNext_ms * 256. / 1000.) );
+                        correctionInF2 = + (deltaNext_ms * 256. / 1000. );
-                    waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot + 1 * deltaTickInF2;
-                    PRINTF2("correction of = + %u, delta_snapshot = %d\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
                     }
                     else
                     {
-                    // the snapshot center is just after the second => decrease delat_snapshot
+                        // the snapshot center is just after the second => decrease delta_snapshot
-                    deltaTickInF2 = ceil( (deltaPrevious_ms * 256. / 1000.) );
+                        correctionInF2 = - (deltaPrevious_ms * 256. / 1000. );
-                    waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot - 1 * deltaTickInF2;
-                    PRINTF2("correction of = - %u, delta_snapshot = %d\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
+                    if (correctionInF2 >=0 )
+                    {
+                        deltaTickInF2 = floor( correctionInF2 );
+                    }
+                    else
+                    {
+                        deltaTickInF2 = ceil( correctionInF2 );
+                    }
+                    waveform_picker_regs->delta_snapshot = waveform_picker_regs->delta_snapshot + deltaTickInF2;
+                    PRINTF2("Correction of = %d, delta_snapshot = %d\n\n", deltaTickInF2, waveform_picker_regs->delta_snapshot);
+                }
+                else
+                {
+                    PRINTF1("No resynchro, delta_snapshot = %d\n\n", waveform_picker_regs->delta_snapshot);
+                    resynchroEngaged = 0;
                 }
             }

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