@@ -1,2 +1,2 | |||
|
1 | 1 | 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters |
|
2 | 6a30b7a924d9c3824f432332ed79bcee25954455 header/lfr_common_headers | |
|
2 | 82603593a3f6185e68418200fe1fee7d81fe6e3d header/lfr_common_headers |
@@ -12,7 +12,7 SWVERSION=-1-0 | |||
|
12 | 12 | DEFINES += SW_VERSION_N1=3 # major |
|
13 | 13 | DEFINES += SW_VERSION_N2=0 # minor |
|
14 | 14 | DEFINES += SW_VERSION_N3=0 # patch |
|
15 |
DEFINES += SW_VERSION_N4= |
|
|
15 | DEFINES += SW_VERSION_N4=10 # internal | |
|
16 | 16 | |
|
17 | 17 | # <GCOV> |
|
18 | 18 | #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage |
@@ -217,6 +217,7 rtems_task send_task( rtems_task_argumen | |||
|
217 | 217 | rtems_id queue_send_id; |
|
218 | 218 | unsigned int sid; |
|
219 | 219 | unsigned char sidAsUnsignedChar; |
|
220 | unsigned char type; | |
|
220 | 221 | |
|
221 | 222 | incomingRingNodePtr = NULL; |
|
222 | 223 | ring_node_address = 0; |
@@ -295,14 +296,9 rtems_task send_task( rtems_task_argumen | |||
|
295 | 296 | { |
|
296 | 297 | sidAsUnsignedChar = (unsigned char) incomingData[ PACKET_POS_PA_LFR_SID_PKT ]; |
|
297 | 298 | sid = sidAsUnsignedChar; |
|
299 | type = (unsigned char) incomingData[ PACKET_POS_SERVICE_TYPE ]; | |
|
300 | if (type == TM_TYPE_LFR_SCIENCE) // this is a BP packet, all other types are handled differently | |
|
298 | 301 | // SET THE SEQUENCE_CNT PARAMETER IN CASE OF BP0 OR BP1 PACKETS |
|
299 | if ( (sid == SID_NORM_BP1_F0) || (sid == SID_NORM_BP1_F1) || (sid == SID_NORM_BP1_F2) | |
|
300 | || (sid == SID_NORM_BP2_F0) || (sid == SID_NORM_BP2_F1) || (sid == SID_NORM_BP2_F2) | |
|
301 | || (sid == SID_BURST_BP1_F0) || (sid == SID_BURST_BP1_F1) | |
|
302 | || (sid == SID_BURST_BP2_F0) || (sid == SID_BURST_BP2_F1) | |
|
303 | || (sid == SID_SBM1_BP1_F0) || (sid == SID_SBM1_BP2_F0) | |
|
304 | || (sid == SID_SBM2_BP1_F0) || (sid == SID_SBM2_BP1_F1) | |
|
305 | || (sid == SID_SBM2_BP2_F0) || (sid == SID_SBM2_BP2_F1)) | |
|
306 | 302 | { |
|
307 | 303 | increment_seq_counter_source_id( (unsigned char*) &incomingData[ PACKET_POS_SEQUENCE_CNT ], sid ); |
|
308 | 304 | } |
@@ -283,6 +283,7 rtems_task prc0_task( rtems_task_argumen | |||
|
283 | 283 | // 3) send the BP1 set |
|
284 | 284 | set_time( packet_sbm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
285 | 285 | set_time( packet_sbm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
286 | packet_sbm_bp1.biaStatusInfo = pa_bia_status_info; | |
|
286 | 287 | packet_sbm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
287 | 288 | BP_send( (char *) &packet_sbm_bp1, queue_id, |
|
288 | 289 | PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0 + PACKET_LENGTH_DELTA, |
@@ -295,6 +296,7 rtems_task prc0_task( rtems_task_argumen | |||
|
295 | 296 | // 2) send the BP2 set |
|
296 | 297 | set_time( packet_sbm_bp2.time, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
297 | 298 | set_time( packet_sbm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
299 | packet_sbm_bp2.biaStatusInfo = pa_bia_status_info; | |
|
298 | 300 | packet_sbm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
299 | 301 | BP_send( (char *) &packet_sbm_bp2, queue_id, |
|
300 | 302 | PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0 + PACKET_LENGTH_DELTA, |
@@ -319,6 +321,7 rtems_task prc0_task( rtems_task_argumen | |||
|
319 | 321 | // 3) send the BP1 set |
|
320 | 322 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
321 | 323 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
324 | packet_norm_bp1.biaStatusInfo = pa_bia_status_info; | |
|
322 | 325 | packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
323 | 326 | BP_send( (char *) &packet_norm_bp1, queue_id, |
|
324 | 327 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0 + PACKET_LENGTH_DELTA, |
@@ -330,6 +333,7 rtems_task prc0_task( rtems_task_argumen | |||
|
330 | 333 | // 2) send the BP2 set |
|
331 | 334 | set_time( packet_norm_bp2.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
332 | 335 | set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
336 | packet_norm_bp2.biaStatusInfo = pa_bia_status_info; | |
|
333 | 337 | packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
334 | 338 | BP_send( (char *) &packet_norm_bp2, queue_id, |
|
335 | 339 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0 + PACKET_LENGTH_DELTA, |
@@ -278,6 +278,7 rtems_task prc1_task( rtems_task_argumen | |||
|
278 | 278 | // 3) send the BP1 set |
|
279 | 279 | set_time( packet_sbm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
280 | 280 | set_time( packet_sbm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
281 | packet_sbm_bp1.biaStatusInfo = pa_bia_status_info; | |
|
281 | 282 | packet_sbm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
282 | 283 | BP_send( (char *) &packet_sbm_bp1, queue_id_send, |
|
283 | 284 | PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1 + PACKET_LENGTH_DELTA, |
@@ -290,6 +291,7 rtems_task prc1_task( rtems_task_argumen | |||
|
290 | 291 | // 2) send the BP2 set |
|
291 | 292 | set_time( packet_sbm_bp2.time, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
292 | 293 | set_time( packet_sbm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
294 | packet_sbm_bp2.biaStatusInfo = pa_bia_status_info; | |
|
293 | 295 | packet_sbm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
294 | 296 | BP_send( (char *) &packet_sbm_bp2, queue_id_send, |
|
295 | 297 | PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1 + PACKET_LENGTH_DELTA, |
@@ -314,6 +316,7 rtems_task prc1_task( rtems_task_argumen | |||
|
314 | 316 | // 3) send the BP1 set |
|
315 | 317 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
316 | 318 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
319 | packet_norm_bp1.biaStatusInfo = pa_bia_status_info; | |
|
317 | 320 | packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
318 | 321 | BP_send( (char *) &packet_norm_bp1, queue_id_send, |
|
319 | 322 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F1 + PACKET_LENGTH_DELTA, |
@@ -325,6 +328,7 rtems_task prc1_task( rtems_task_argumen | |||
|
325 | 328 | // 2) send the BP2 set |
|
326 | 329 | set_time( packet_norm_bp2.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
327 | 330 | set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
331 | packet_norm_bp2.biaStatusInfo = pa_bia_status_info; | |
|
328 | 332 | packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
329 | 333 | BP_send( (char *) &packet_norm_bp2, queue_id_send, |
|
330 | 334 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1 + PACKET_LENGTH_DELTA, |
@@ -200,6 +200,7 rtems_task prc2_task( rtems_task_argumen | |||
|
200 | 200 | // 2) send the BP1 set |
|
201 | 201 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
202 | 202 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
203 | packet_norm_bp1.biaStatusInfo = pa_bia_status_info; | |
|
203 | 204 | packet_norm_bp1.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
204 | 205 | BP_send( (char *) &packet_norm_bp1, queue_id_send, |
|
205 | 206 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2 + PACKET_LENGTH_DELTA, |
@@ -213,6 +214,7 rtems_task prc2_task( rtems_task_argumen | |||
|
213 | 214 | // 2) send the BP2 set |
|
214 | 215 | set_time( packet_norm_bp2.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
215 | 216 | set_time( packet_norm_bp2.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
217 | packet_norm_bp2.biaStatusInfo = pa_bia_status_info; | |
|
216 | 218 | packet_norm_bp2.sy_lfr_common_parameters = parameter_dump_packet.sy_lfr_common_parameters; |
|
217 | 219 | BP_send( (char *) &packet_norm_bp2, queue_id_send, |
|
218 | 220 | PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2 + PACKET_LENGTH_DELTA, |
General Comments 0
You need to be logged in to leave comments.
Login now