fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 06:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always log both GPS SNR sets. Assign array IDs by PRN to get a per-satellite unique mapping

Browse Source
This commit is contained in:
Lorenz Meier
2014-05-23 13:01:20 +02:00
parent 19989b4314
commit e71c386547
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/sdlog2.c
+13 -16
View File
@@ -1068,27 +1068,24 @@ int sdlog2_thread_main(int argc, char *argv[])
log_msg.msg_type = LOG_GS0A_MSG; log_msg.msg_type = LOG_GS0A_MSG;
memset(&log_msg.body.log_GS0A, 0, sizeof(log_msg.body.log_GS0A)); memset(&log_msg.body.log_GS0A, 0, sizeof(log_msg.body.log_GS0A));
/* fill set A */ /* fill set A */
unsigned max_sats_a = (log_max_snr > gps_msg_max_snr) ? gps_msg_max_snr : log_max_snr; for (unsigned i = 0; i < gps_msg_max_snr; i++) {
if (buf_gps_pos.satellite_prn[i] < log_max_snr) {
for (unsigned i = 0; i < max_sats_a; i++) { /* map satellites by their ID so that logs from two receivers can be compared */
log_msg.body.log_GS0A.satellite_snr[i] = buf_gps_pos.satellite_snr[i]; log_msg.body.log_GS0A.satellite_snr[buf_gps_pos.satellite_prn[i]] = buf_gps_pos.satellite_snr[i];
}
} }
LOGBUFFER_WRITE_AND_COUNT(GS0A); LOGBUFFER_WRITE_AND_COUNT(GS0A);
/* do we need a 2nd set? */ log_msg.msg_type = LOG_GS0B_MSG;
if (gps_msg_max_snr > log_max_snr) { memset(&log_msg.body.log_GS0B, 0, sizeof(log_msg.body.log_GS0B));
log_msg.msg_type = LOG_GS0B_MSG; /* fill set B */
memset(&log_msg.body.log_GS0B, 0, sizeof(log_msg.body.log_GS0B)); for (unsigned i = 0; i < gps_msg_max_snr; i++) {
/* fill set B - deduct the count we already have taken care of */ if (buf_gps_pos.satellite_prn[i] < log_max_snr) {
gps_msg_max_snr -= log_max_snr; /* map satellites by their ID so that logs from two receivers can be compared */
unsigned max_sats_b = (log_max_snr > gps_msg_max_snr) ? gps_msg_max_snr : log_max_snr; log_msg.body.log_GS0B.satellite_snr[buf_gps_pos.satellite_prn[i]] = buf_gps_pos.satellite_snr[i];
for (unsigned i = 0; i < max_sats_b; i++) {
/* count from zero, but obey offset of log_max_snr consumed units */
log_msg.body.log_GS0B.satellite_snr[i] = buf_gps_pos.satellite_snr[log_max_snr + i];
} }
LOGBUFFER_WRITE_AND_COUNT(GS0B);
} }
LOGBUFFER_WRITE_AND_COUNT(GS0B);
} }
} }