HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r340:4f755502e98f

Correction of a bug in set_sy_lfr_kcoeff (misalignment)

paul -

r340:4f755502e98f R3++

parent child

Context file:

r340:4f755502e98f

Collapse all files

header/tc_load_dump_parameters.h +1 0

             int set_sy_lfr_kcoeff(ccsdsTelecommandPacket_t *TC , rtems_id queue_id);
             void copyFloatByChar( unsigned char *destination, unsigned char *source );
             void copyInt32ByChar( unsigned char *destination, unsigned char *source );
+            void copyInt16ByChar( unsigned char *destination, unsigned char *source );
             void floatToChar( float value, unsigned char* ptr);
             void init_parameter_dump( void );

src/fsw_misc.c +1 -1

                     if (k == (MOVING_AVERAGE-1))
                     {
                         k = 0;
-                        printf("tick\n");
+                        PRINTF("tick\n");
                     }
                     else
                     {

src/fsw_spacewire.c +1 -1

                         }
                         else {
                             estimatedPacketLength = (unsigned int) (len - CCSDS_TC_TM_PACKET_OFFSET - PROTID_RES_APP); // => -3 is for Prot ID, Reserved and User App bytes
-                            //PRINTF1("incoming TC with Length (byte): %d\n", len - 3);
+                            PRINTF1("incoming TC with Length (byte): %d\n", len - 3);
                             currentTC_LEN_RCV[ 0 ] = (unsigned char) (estimatedPacketLength >> SHIFT_1_BYTE);
                             currentTC_LEN_RCV[ 1 ] = (unsigned char) (estimatedPacketLength     );
                             // CHECK THE TC

src/tc_handler.c 0 -8

                 unsigned int transitionCoarseTime;
                 unsigned char * bytePosPtr;
-                printf("(0)\n");
                 bytePosPtr = (unsigned char *) &TC->packetID;
-                printf("(1)\n");
                 requestedMode = bytePosPtr[ BYTE_POS_CP_MODE_LFR_SET ];
-                printf("(2)\n");
                 copyInt32ByChar( (char*) &transitionCoarseTime, &bytePosPtr[ BYTE_POS_CP_LFR_ENTER_MODE_TIME ] );
-                printf("(3)\n");
                 transitionCoarseTime = transitionCoarseTime & COARSE_TIME_MASK;
-                printf("(4)\n");
                 status = check_mode_value( requestedMode );
-                printf("(5)\n");
                 if ( status != LFR_SUCCESSFUL )     // the mode value is inconsistent
                 {
                 status = RTEMS_UNSATISFIED;
-                printf("hop\n");
                 switch( lfrCurrentMode )
                 {
                 case LFR_MODE_STANDBY:

src/tc_load_dump_parameters.c +12 -6

                 unsigned int kcoeff;
                 unsigned short sy_lfr_kcoeff_frequency;
                 unsigned short bin;
-                unsigned short *freqPtr;
                 float *kcoeffPtr_norm;
                 float *kcoeffPtr_sbm;
                 int status;
                 unsigned char *kcoeffSbmPtr_a;
                 unsigned char *kcoeffSbmPtr_b;
-                status = LFR_SUCCESSFUL;
+                sy_lfr_kcoeff_frequency = 0;
+                bin = 0;
                 kcoeffPtr_norm = NULL;
                 kcoeffPtr_sbm  = NULL;
-                bin = 0;
+                status = LFR_SUCCESSFUL;
-                freqPtr = (unsigned short *) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_FREQUENCY];
+                // copy the value of the frequency byte by byte DO NOT USE A SHORT* POINTER
-                sy_lfr_kcoeff_frequency = *freqPtr;
+                copyInt16ByChar( (unsigned char*) &sy_lfr_kcoeff_frequency, &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_FREQUENCY] );
                 if ( sy_lfr_kcoeff_frequency >= NB_BINS_COMPRESSED_SM )
                 {
                 destination[BYTE_3] = source[BYTE_3];
             }
+            void copyInt16ByChar( unsigned char *destination, unsigned char *source )
+            {
+                destination[BYTE_0] = source[BYTE_0];
+                destination[BYTE_1] = source[BYTE_1];
+            }
             void floatToChar( float value, unsigned char* ptr)
             {
                 unsigned char* valuePtr;

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