HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r316:f8bdd7f20886

Bug corrected, TC with Length > 228 are dropped by the driver, not parsed

paul -

r316:f8bdd7f20886 R3_plus

parent child

Context file:

r316:f8bdd7f20886

Collapse all files

.hgsubstate +1 -1

		@@ -1,2 +1,2
1	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2		57edc38eadba4601cf0b1e2fa1eeab85082e9f41 header/lfr_common_headers
	2	3e4216a0e6981bead8bcb201012ebadb53f60dff header/lfr_common_headers

src/fsw_spacewire.c +11 -1

                              PRINTF("in RECV *** packet lenght too short\n")
                          }
                          else {
-             //                PRINTF1("incoming TC with len: %d\n", len);
                              estimatedPacketLength = (unsigned int) (len - CCSDS_TC_TM_PACKET_OFFSET - 3); // => -3 is for Prot ID, Reserved and User App bytes
+                             PRINTF1("incoming TC with Length (byte): %d\n", len - 3);
                              currentTC_LEN_RCV[ 0 ] = (unsigned char) (estimatedPacketLength >> 8);
                              currentTC_LEN_RCV[ 1 ] = (unsigned char) (estimatedPacketLength     );
                              // CHECK THE TC
                  spacewire_set_NP(1, REGS_ADDR_GRSPW); // [N]o [P]ort force
                  spacewire_set_RE(1, REGS_ADDR_GRSPW); // [R]MAP [E]nable, the dedicated call seems to  break the no port force configuration
+                 spw_ioctl_packetsize packetsize;
+                 packetsize.rxsize = 228;
+                 packetsize.txdsize = 4096;
+                 packetsize.txhsize = 34;
                  status = ioctl(fd, SPACEWIRE_IOCTRL_SET_RXBLOCK, 1);              // sets the blocking mode for reception
                  if (status!=RTEMS_SUCCESSFUL) {
                  if (status!=RTEMS_SUCCESSFUL) {
                      PRINTF("in SPIQ *** Error SPACEWIRE_IOCTRL_SET_TCODE_CTRL,\n")
                  }
+                 //
+                 status = ioctl(fd, SPACEWIRE_IOCTRL_SET_PACKETSIZE, packetsize); // set rxsize, txdsize and txhsize
+                 if (status!=RTEMS_SUCCESSFUL) {
+                     PRINTF("in SPIQ *** Error SPACEWIRE_IOCTRL_SET_PACKETSIZE,\n")
+                 }
                  return status;
              }

src/tc_acceptance.c +1 -1

                  }
                  if (status == CCSDS_TM_VALID)   // CHECK THAT THE PACKET DOES NOT EXCEED THE MAX SIZE
                  {
-                     if ( packetLength >= CCSDS_TC_PKT_MAX_SIZE ) {
+                     if ( packetLength > CCSDS_TC_PKT_MAX_SIZE ) {
                          status = WRONG_LEN_PKT;
                      }
                  }

src/tc_handler.c +3 0

                  getReactionWheelsFrequencies( TC );
                  build_sy_lfr_rw_masks();
+                 // once the masks are built, they have to be merged with the fbins_mask
+                 merge_fbins_masks();
                  result = status;
                  return result;

src/tc_load_dump_parameters.c +6 -22

                  flag = set_sy_lfr_fbins( TC );
+                 // once the fbins masks have been stored, they have to be merged with the masks which handle the reaction wheels frequencies filtering
+                 merge_fbins_masks();
                  return flag;
              }
                   */
                  int status;
-                 int k;
                  increment_seq_counter_destination_id_dump( parameter_dump_packet.packetSequenceControl, TC->sourceID );
                  parameter_dump_packet.destinationID = TC->sourceID;
                  parameter_dump_packet.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                  parameter_dump_packet.time[5] = (unsigned char) (time_management_regs->fine_time);
                  // SEND DATA
-                 printf("f0\n");
-                 for (k = 0; k<16; k++)
+                 {
-                     printf("%x ", parameter_dump_packet.sy_lfr_rw_mask.fx.f0_word1[k]);
+                 }
-                 printf("\n");
-                 printf("f1\n");
-                 for (k = 0; k<16; k++)
+                 {
-                     printf("%x ", parameter_dump_packet.sy_lfr_rw_mask.fx.f1_word1[k]);
+                 }
-                 printf("\n");
-                 printf("f2\n");
-                 for (k = 0; k<16; k++)
+                 {
-                     printf("%x ", parameter_dump_packet.sy_lfr_rw_mask.fx.f2_word1[k]);
+                 }
-                 printf("\n");
                  status =  rtems_message_queue_send( queue_id, &parameter_dump_packet,
                                                      PACKET_LENGTH_PARAMETER_DUMP + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
                  if (status != RTEMS_SUCCESSFUL) {
                  build_sy_lfr_rw_mask( 0 );
                  build_sy_lfr_rw_mask( 1 );
                  build_sy_lfr_rw_mask( 2 );
-                 merge_fbins_masks();
              }
              void merge_fbins_masks( void )
                  {
                      parameter_dump_packet.sy_lfr_rw_mask.raw[k] = 0xff;
                  }
+                 // once the reaction wheels masks have been initialized, they have to be merged with the fbins masks
+                 merge_fbins_masks();
              }
              void init_kcoefficients_dump( void )

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