From fbe057f4c92ab28e7e1f852b3c24c27cdd711b45 Mon Sep 17 00:00:00 2001 From: oaq Date: Sat, 18 Jul 2026 00:34:27 +1000 Subject: [PATCH] misc trace format string fixes --- app/qtapp/rtkplot_qt/plotmain.cpp | 6 +++--- src/rcv/javad.c | 4 ++-- src/rcv/rt17.c | 2 +- src/rcv/swiftnav.c | 2 +- src/rcv/unicore.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/qtapp/rtkplot_qt/plotmain.cpp b/app/qtapp/rtkplot_qt/plotmain.cpp index 13c1f7db7..fa3309a85 100644 --- a/app/qtapp/rtkplot_qt/plotmain.cpp +++ b/app/qtapp/rtkplot_qt/plotmain.cpp @@ -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); @@ -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; diff --git a/src/rcv/javad.c b/src/rcv/javad.c index 77f64ee6d..fbd255fc3 100644 --- a/src/rcv/javad.c +++ b/src/rcv/javad.c @@ -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, @@ -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, diff --git a/src/rcv/rt17.c b/src/rcv/rt17.c index 10e41643c..531025a12 100644 --- a/src/rcv/rt17.c +++ b/src/rcv/rt17.c @@ -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); } } } diff --git a/src/rcv/swiftnav.c b/src/rcv/swiftnav.c index 2fba8f2e3..3a31b75be 100644 --- a/src/rcv/swiftnav.c +++ b/src/rcv/swiftnav.c @@ -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; diff --git a/src/rcv/unicore.c b/src/rcv/unicore.c index c578b8419..0923f2286 100644 --- a/src/rcv/unicore.c +++ b/src/rcv/unicore.c @@ -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) {