Skip to content

misc trace format string fixes #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ourairquality wants to merge 1 commit into
base: main
Choose a base branch
from
Open

misc trace format string fixes #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/qtapp/rtkplot_qt/plotmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ void Plot::mousePressEvent(QMouseEvent *event)
#endif
dragCentX = centX;

trace(3, "mousePressEvent: X=%d Y=%d\n", dragStartX, dragStartY);
trace(3, "mousePressEvent: X=%f Y=%f\n", dragStartX, dragStartY);

dragState = event->buttons().testFlag(Qt::LeftButton) ? 1 : (event->buttons().testFlag(Qt::RightButton) ? 11 : 0);

Expand Down Expand Up @@ -1435,10 +1435,10 @@ void Plot::mouseMove(QMouseEvent *event)
void Plot::mouseReleaseEvent(QMouseEvent *event)
{
#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
trace(3, "mouseReleaseEvent: X=%d Y=%d\n", ui->lblDisplay->mapFromGlobal(event->globalPosition()).x(),
trace(3, "mouseReleaseEvent: X=%f Y=%f\n", ui->lblDisplay->mapFromGlobal(event->globalPosition()).x(),
ui->lblDisplay->mapFromGlobal(event->globalPosition()).y());
#else
trace(3, "mouseReleaseEvent: X=%d Y=%d\n", ui->lblDisplay->mapFromGlobal(event->globalPos()).x(),
trace(3, "mouseReleaseEvent: X=%f Y=%f\n", ui->lblDisplay->mapFromGlobal(event->globalPos()).x(),
ui->lblDisplay->mapFromGlobal(event->globalPos()).y());
#endif
if (dragState == 0) return;
Expand Down
4 changes: 2 additions & 2 deletions src/rcv/javad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ static int decode_L2nav(uint8_t *buff, int len, int sat, raw_t *raw)
alert =getbitu(msg,i, 1); i+= 1;

if (preamb!=PREAMB_CNAV) {
trace(2,"javad *d sat=%2d L2 CNAV preamble error preamb=%02X\n",preamb);
trace(2,"javad L2nav sat=%2d L2 CNAV preamble error preamb=%02X\n",sat,preamb);
return -1;
}
trace(3,"L2CNAV: sat=%2d prn=%2d msgid=%2d tow=%6d alert=%d\n",sat,prn,
Expand Down Expand Up @@ -971,7 +971,7 @@ static int decode_L5nav(uint8_t *buff, int len, int sat, raw_t *raw)
alert =getbitu(msg,i, 1); i+= 1;

if (preamb!=PREAMB_CNAV) {
trace(2,"javad *d sat=%2d L5 CNAV preamble error preamb=%02X\n",preamb);
trace(2,"javad L5nav sat=%2d L5 CNAV preamble error preamb=%02X\n",sat,preamb);
return -1;
}
trace(3,"L5CNAV: sat=%2d prn=%2d msgid=%2d tow=%6d alert=%d\n",sat,prn,
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/rt17.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ static int GetWeek(raw_t *Raw, double Tow)
{
rt17->Week = Week;
rt17->Flags |= M_WEEK_OPTION;
tracet(2, "RT17: Initial GPS WEEK explicitly set to %d by user.\n", Week, Week);
tracet(2, "RT17: Initial GPS WEEK explicitly set to %d by user.\n", Week);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/swiftnav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ static int decode_gpsnav_dep_e(raw_t *raw) {
eph.iode,
raw->nav.eph[sat - 1].iode);
trace(3,
"%decode_gpsnav_dep_e: eph.iodc %d raw->nav.eph[sat - 1].iodc %d\n",
"decode_gpsnav_dep_e: eph.iodc %d raw->nav.eph[sat - 1].iodc %d\n",
eph.iode,
raw->nav.eph[sat - 1].iode);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/unicore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static int decode_track_stat(uint32_t stat, int* sys, int* code, int* plock, int
case 5: *sys = SYS_QZS; break;
case 6: *sys = SYS_IRN; break;
default:
trace(2, "unicore unknown system: sys=%d\n", satsys);
trace(2, "unicore unknown system: sysno=%d\n", sysno);
return -1;
}
if (!(*code = sig2code(*sys, sigtype, l2c)) || (idx = code2idx(*sys, *code)) < 0) {
Expand Down