HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r319:9f779b655c52

Bug Tr_BoucleSortie...

paul -

r319:9f779b655c52 R3_plus

parent child

Context file:

r319:9f779b655c52

Collapse all files

src/fsw_misc.c +6 -2

                  rtems_status_code spare_status;
                  rtems_id queue_id;
                  rtems_rate_monotonic_period_status period_status;
+                 bool isSynchronized;
+                 isSynchronized = false;
                  status =  get_message_queue_id_send( &queue_id );
                  if (status != RTEMS_SUCCESSFUL)
                  status = rtems_rate_monotonic_period( HK_id, SY_LFR_TIME_SYN_TIMEOUT_in_ticks );
                  status = rtems_rate_monotonic_get_status( HK_id, &period_status );
                  DEBUG_PRINTF1("startup HK, HK_id status = %d\n", period_status.state)
-                 while(period_status.state != RATE_MONOTONIC_EXPIRED )   // after SY_LFR_TIME_SYN_TIMEOUT ms, starts HK anyway
+                 while( (period_status.state != RATE_MONOTONIC_EXPIRED)
+                        && (isSynchronized == false) )   // after SY_LFR_TIME_SYN_TIMEOUT ms, starts HK anyway
                  {
                      if ((time_management_regs->coarse_time & VAL_LFR_SYNCHRONIZED) == INT32_ALL_0) // check time synchronization
                      {
-                         break;  // break if LFR is synchronized
+                         isSynchronized = true;
                      }
                      else
                      {

src/fsw_spacewire.c +6 -5

                  rtems_status_code status;
                  int i;
-                 for ( i=0; i<SY_LFR_DPU_CONNECT_ATTEMPT; i++ )
+                 i = 0;
+                 while (i < SY_LFR_DPU_CONNECT_ATTEMPT)
                  {
                      PRINTF1("in spacewire_reset_link *** link recovery, try %d\n", i);
                      if (  status_spw != RTEMS_SUCCESSFUL )
                      {
-                         PRINTF1("in spacewire_reset_link *** ERR spacewire_start_link code %d\n",  status_spw)
+                         i = i + 1;
+                         PRINTF1("in spacewire_reset_link *** ERR spacewire_start_link code %d\n",  status_spw);
                      }
-                     if ( status_spw == RTEMS_SUCCESSFUL)
+                     else
                      {
-                         break;
+                         i = SY_LFR_DPU_CONNECT_ATTEMPT;
                      }
                  }

src/processing/fsw_processing.c +6 0

                      }
                      spectral_matrix_regs->status = BIT_READY_1;   // [0000 0010]
                      break;
+                 default:
+                     break;
                  }
              }
                      }
                      spectral_matrix_regs->status = BIT_STATUS_F1_1;   // [1000 0000]
                      break;
+                 default:
+                     break;
                  }
              }
                          status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_3 );
                      }
                      break;
+                 default:
+                     break;
                  }
              }

src/wf_handler.c +12 -5

                      if (event_out == RTEMS_EVENT_MODE_NORM_S1_S2)
                      {
                          acquisitionTimeF0_asLong = get_acquisition_time( (unsigned char *) &ring_node_to_send_swf_f0->coarseTime );
-                         build_snapshot_from_ring( ring_node_to_send_swf_f1, 1, acquisitionTimeF0_asLong,
+                         build_snapshot_from_ring( ring_node_to_send_swf_f1, CHANNELF1, acquisitionTimeF0_asLong,
                                                    &ring_node_swf1_extracted, swf1_extracted );
                          swf1_ready = true;    // the snapshot has been extracted and is ready to be sent
                      }
                                             int *swf_extracted)
              {
                  unsigned int i;
+                 unsigned int node;
                  unsigned long long int centerTime_asLong;
                  unsigned long long int acquisitionTime_asLong;
                  unsigned long long int bufferAcquisitionTime_asLong;
                      break;
                  default:
                      acquisitionTime_asLong = centerTime_asLong;
+                     nb_ring_nodes = 0;
                      frequency_asLong = FREQ_F2;
                      nbTicksPerSample_asLong = TICKS_PER_T2;
                      break;
                  }
-                 //****************************************************************************
+                 //*****************************************************************************
                  // (4) search the ring_node with the acquisition time <= acquisitionTime_asLong
-                 for (i=0; i<nb_ring_nodes; i++)
+                 node = 0;
+                 while ( node < nb_ring_nodes)
                  {
-                     //PRINTF1("%d ... ", i);
+                     //PRINTF1("%d ... ", node);
-                             bufferAcquisitionTime_asLong = get_acquisition_time( (unsigned char *) &ring_node_to_send->coarseTime );
                      if (bufferAcquisitionTime_asLong <= acquisitionTime_asLong)
                      {
                          //PRINTF1("buffer found with acquisition time = %llx\n", bufferAcquisitionTime_asLong);
-                                 break;
+                         node = nb_ring_nodes;
                      }
+                     else
+                     {
+                         node = node + 1;
                      ring_node_to_send = ring_node_to_send->previous;
                  }
+                 }
                  // (5) compute the number of samples to take in the current buffer
                  sampleOffset_asLong = ((acquisitionTime_asLong - bufferAcquisitionTime_asLong) * frequency_asLong ) >> SHIFT_2_BYTES;

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