HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r230:f6bd2f6c2315

corrected, TC_LFR_UPDATE_INFO fields copied in...

paul -

r230:f6bd2f6c2315 R3

parent child

Context file:

r230:f6bd2f6c2315

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	6a30b7a924d9c3824f432332ed79bcee25954455 header/lfr_common_headers	2	82603593a3f6185e68418200fe1fee7d81fe6e3d header/lfr_common_headers

FSW-qt/fsw-qt.pro +1 -1

             DEFINES += SW_VERSION_N1=3 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=9 # internal
+            DEFINES += SW_VERSION_N4=10 # internal
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

src/fsw_spacewire.c +3 -7

                 rtems_id queue_send_id;
                 unsigned int sid;
                 unsigned char sidAsUnsignedChar;
+                unsigned char type;
                 incomingRingNodePtr = NULL;
                 ring_node_address = 0;
                         {
                             sidAsUnsignedChar = (unsigned char) incomingData[ PACKET_POS_PA_LFR_SID_PKT ];
                             sid = sidAsUnsignedChar;
+                            type = (unsigned char) incomingData[ PACKET_POS_SERVICE_TYPE ];
+                            if (type == TM_TYPE_LFR_SCIENCE)    // this is a BP packet, all other types are handled differently
                             // SET THE SEQUENCE_CNT PARAMETER IN CASE OF BP0 OR BP1 PACKETS
-                            if ( (sid == SID_NORM_BP1_F0) || (sid == SID_NORM_BP1_F1) || (sid == SID_NORM_BP1_F2)
-                                 || (sid == SID_NORM_BP2_F0) || (sid == SID_NORM_BP2_F1) || (sid == SID_NORM_BP2_F2)
-                                 || (sid == SID_BURST_BP1_F0) || (sid == SID_BURST_BP1_F1)
-                                 || (sid == SID_BURST_BP2_F0) || (sid == SID_BURST_BP2_F1)
-                                 || (sid == SID_SBM1_BP1_F0) || (sid == SID_SBM1_BP2_F0)
-                                 || (sid == SID_SBM2_BP1_F0) || (sid == SID_SBM2_BP1_F1)
-                                 || (sid == SID_SBM2_BP2_F0) || (sid == SID_SBM2_BP2_F1))
                             {
                                 increment_seq_counter_source_id( (unsigned char*) &incomingData[ PACKET_POS_SEQUENCE_CNT ], sid );
                             }

src/processing/avf0_prc0.c +4 0

                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1.time,            (unsigned char *) &incomingMsg->coarseTimeSBM );
                         set_time( packet_sbm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM );
+                        packet_sbm_bp1.biaStatusInfo = pa_bia_status_info;
                         packet_sbm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_sbm_bp1, queue_id,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0 + PACKET_LENGTH_DELTA,
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2.time,            (unsigned char *) &incomingMsg->coarseTimeSBM );
                             set_time( packet_sbm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM );
+                            packet_sbm_bp2.biaStatusInfo = pa_bia_status_info;
                             packet_sbm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                             BP_send( (char *) &packet_sbm_bp2, queue_id,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0 + PACKET_LENGTH_DELTA,
                         // 3) send the BP1 set
                         set_time( packet_norm_bp1.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                         set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                        packet_norm_bp1.biaStatusInfo = pa_bia_status_info;
                         packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_norm_bp1, queue_id,
                                   PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0 + PACKET_LENGTH_DELTA,
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                             set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                            packet_norm_bp2.biaStatusInfo = pa_bia_status_info;
                             packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                             BP_send( (char *) &packet_norm_bp2, queue_id,
                                       PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0 + PACKET_LENGTH_DELTA,

src/processing/avf1_prc1.c +4 0

                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1.time,            (unsigned char *) &incomingMsg->coarseTimeSBM );
                         set_time( packet_sbm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM );
+                        packet_sbm_bp1.biaStatusInfo = pa_bia_status_info;
                         packet_sbm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_sbm_bp1, queue_id_send,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1 + PACKET_LENGTH_DELTA,
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2.time,            (unsigned char *) &incomingMsg->coarseTimeSBM );
                             set_time( packet_sbm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM );
+                            packet_sbm_bp2.biaStatusInfo = pa_bia_status_info;
                             packet_sbm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                             BP_send( (char *) &packet_sbm_bp2, queue_id_send,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1 + PACKET_LENGTH_DELTA,
                         // 3) send the BP1 set
                         set_time( packet_norm_bp1.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                         set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                        packet_norm_bp1.biaStatusInfo = pa_bia_status_info;
                         packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_norm_bp1, queue_id_send,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1 + PACKET_LENGTH_DELTA,
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                             set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                            packet_norm_bp2.biaStatusInfo = pa_bia_status_info;
                             packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                             BP_send( (char *) &packet_norm_bp2, queue_id_send,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1 + PACKET_LENGTH_DELTA,

src/processing/avf2_prc2.c +2 0

                         // 2) send the BP1 set
                         set_time( packet_norm_bp1.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                         set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                        packet_norm_bp1.biaStatusInfo = pa_bia_status_info;
                         packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_norm_bp1, queue_id_send,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2 + PACKET_LENGTH_DELTA,
                         // 2) send the BP2 set
                         set_time( packet_norm_bp2.time,            (unsigned char *) &incomingMsg->coarseTimeNORM );
                         set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM );
+                        packet_norm_bp2.biaStatusInfo = pa_bia_status_info;
                         packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters;
                         BP_send( (char *) &packet_norm_bp2, queue_id_send,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2 + PACKET_LENGTH_DELTA,

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