# HG changeset patch # User paul # Date 2015-10-05 06:22:33 # Node ID f6bd2f6c23152fb4cf0065b848d2a5c54fbf9abe # Parent 9eaf0ce320a4c6d593f9dd9cd4524cca71b502eb #456 #532 #532 #533 corrected, TC_LFR_UPDATE_INFO fields copied in TM_LFR_SCIENCE_... BP paquets diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters -6a30b7a924d9c3824f432332ed79bcee25954455 header/lfr_common_headers +82603593a3f6185e68418200fe1fee7d81fe6e3d header/lfr_common_headers diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro --- a/FSW-qt/fsw-qt.pro +++ b/FSW-qt/fsw-qt.pro @@ -12,7 +12,7 @@ SWVERSION=-1-0 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 # #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage diff --git a/src/fsw_spacewire.c b/src/fsw_spacewire.c --- a/src/fsw_spacewire.c +++ b/src/fsw_spacewire.c @@ -217,6 +217,7 @@ rtems_task send_task( rtems_task_argumen rtems_id queue_send_id; unsigned int sid; unsigned char sidAsUnsignedChar; + unsigned char type; incomingRingNodePtr = NULL; ring_node_address = 0; @@ -295,14 +296,9 @@ rtems_task send_task( rtems_task_argumen { 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 ); } diff --git a/src/processing/avf0_prc0.c b/src/processing/avf0_prc0.c --- a/src/processing/avf0_prc0.c +++ b/src/processing/avf0_prc0.c @@ -283,6 +283,7 @@ rtems_task prc0_task( rtems_task_argumen // 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, @@ -295,6 +296,7 @@ rtems_task prc0_task( rtems_task_argumen // 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, @@ -319,6 +321,7 @@ rtems_task prc0_task( rtems_task_argumen // 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, @@ -330,6 +333,7 @@ rtems_task prc0_task( rtems_task_argumen // 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, diff --git a/src/processing/avf1_prc1.c b/src/processing/avf1_prc1.c --- a/src/processing/avf1_prc1.c +++ b/src/processing/avf1_prc1.c @@ -278,6 +278,7 @@ rtems_task prc1_task( rtems_task_argumen // 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, @@ -290,6 +291,7 @@ rtems_task prc1_task( rtems_task_argumen // 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, @@ -314,6 +316,7 @@ rtems_task prc1_task( rtems_task_argumen // 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, @@ -325,6 +328,7 @@ rtems_task prc1_task( rtems_task_argumen // 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, diff --git a/src/processing/avf2_prc2.c b/src/processing/avf2_prc2.c --- a/src/processing/avf2_prc2.c +++ b/src/processing/avf2_prc2.c @@ -200,6 +200,7 @@ rtems_task prc2_task( rtems_task_argumen // 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, @@ -213,6 +214,7 @@ rtems_task prc2_task( rtems_task_argumen // 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,