HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r151:058ea1100118

Bug

paul -

r151:058ea1100118 VHDLib206

parent child

Context file:

r151:058ea1100118

Collapse all files

FSW-qt/Makefile +1 -1

              #############################################################################
              # Makefile for building: bin/fsw
-             # Generated by qmake (2.01a) (Qt 4.8.6) on: Mon Jun 16 15:44:22 2014
+             # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 07:27:34 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.0.1, 2014-06-16T15:53:55. -->
+             <!-- Written by QtCreator 3.0.1, 2014-06-17T07:01:31. -->
              <qtcreator>
               <data>
                <variable>ProjectExplorer.Project.ActiveTarget</variable>

src/fsw_init.c +3 -3

                      sequenceCounters_TC_EXE[i] = 0x00;
                  }
                  sequenceCounters_SCIENCE_NORMAL_BURST = 0x00;
-                 sequenceCounters_SCIENCE_SBM1_SBM2 = 0x00;
-                 sequenceCounterHK = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
-                 sequenceCounterParameterDump = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
+                 sequenceCounters_SCIENCE_SBM1_SBM2 =    0x00;
+                 sequenceCounterHK =                     TM_PACKET_SEQ_CTRL_STANDALONE << 8;
+                 sequenceCounterParameterDump =          TM_PACKET_SEQ_CTRL_STANDALONE << 8;
              }
              void reset_local_time( void )

src/fsw_misc.c +4 -37

                          rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_6 );
                      }
                      else {
-                         housekeeping_packet.packetSequenceControl[0] = (unsigned char) sequenceCounterHK >> 8;
-                         housekeeping_packet.packetSequenceControl[1] = (unsigned char) sequenceCounterHK;
+                         housekeeping_packet.packetSequenceControl[0] = (unsigned char) (sequenceCounterHK >> 8);
+                         housekeeping_packet.packetSequenceControl[1] = (unsigned char) (sequenceCounterHK     );
                          increment_seq_counter( &sequenceCounterHK );
                          housekeeping_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                  housekeeping_packet.lfr_fpga_version[2] = parameters[3]; // n3
              }
-             void increment_seq_counter_old( unsigned char *packet_sequence_control)
+             {
-                 /** This function increment the sequence counter psased in argument.
+                  *
-                  * The increment does not affect the grouping flag. In case of an overflow, the counter is reset to 0.
+                  *
-                  */
-                 unsigned short sequence_cnt;
-                 unsigned short segmentation_grouping_flag;
-                 unsigned short new_packet_sequence_control;
-                 segmentation_grouping_flag  = TM_PACKET_SEQ_CTRL_STANDALONE << 8;   // keep bits 7 downto 6
-                 sequence_cnt                = (unsigned short) (
-                             ( (packet_sequence_control[0] & 0x3f) << 8 )    // keep bits 5 downto 0
-                                             + packet_sequence_control[1]
-                         );
-                 new_packet_sequence_control = segmentation_grouping_flag | sequence_cnt ;
-                 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
-                 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control     );
-                 if ( sequence_cnt < SEQ_CNT_MAX)
+                 {
-                     sequence_cnt = sequence_cnt + 1;
+                 }
-                 else
+                 {
-                     sequence_cnt = 0;
+                 }
+             }
              void increment_seq_counter( unsigned short *packetSequenceControl )
              {
                  /** This function increment the sequence counter psased in argument.
                   *
                   */
+                 unsigned short segmentation_grouping_flag;
                  unsigned short sequence_cnt;
-                 unsigned short segmentation_grouping_flag;
                  segmentation_grouping_flag  = TM_PACKET_SEQ_CTRL_STANDALONE << 8;   // keep bits 7 downto 6
-                 sequence_cnt                = (*packetSequenceControl) & 0x3fff;       // [0011 1111 1111 1111]
+                 sequence_cnt                = (*packetSequenceControl) & 0x3fff;    // [0011 1111 1111 1111]
                  if ( sequence_cnt < SEQ_CNT_MAX)
                  {

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