From c3ec23c7583fd3d3490da9b8a51750fce53e38f3 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 4 Mar 2020 10:46:38 +0100 Subject: [PATCH] Compilation + warning fix --- radio/src/debug.h | 2 +- radio/src/gui/colorlcd/radio_spectrum_analyser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/debug.h b/radio/src/debug.h index 62d704454..f5faa7933 100644 --- a/radio/src/debug.h +++ b/radio/src/debug.h @@ -54,7 +54,7 @@ uint8_t auxSerialTracesEnabled(); #endif #define TRACE_TIME_FORMAT "%0.2f " -#define TRACE_TIME_VALUE float(g_tmr10ms) / 100 +#define TRACE_TIME_VALUE ((float)g_tmr10ms / 100) #define TRACE_NOCRLF(...) debugPrintf(__VA_ARGS__) #define TRACE(f_, ...) debugPrintf((TRACE_TIME_FORMAT f_ CRLF), TRACE_TIME_VALUE, ##__VA_ARGS__) diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp index 0e5a1c90f..c599b7c76 100644 --- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp @@ -58,11 +58,11 @@ class SpectrumFooterWindow: public FormGroup char label[10]; // Frequency - sprintf(label,"T: %dMHz", reusableBuffer.spectrumAnalyser.freq / 1000000); + sprintf(label,"T: %dMHz", int(reusableBuffer.spectrumAnalyser.freq / 1000000)); new StaticText(this, grid.getFieldSlot(3, 0), label); // Span - sprintf(label,"S: %dMHz", reusableBuffer.spectrumAnalyser.span / 1000000); + sprintf(label,"S: %dMHz", int(reusableBuffer.spectrumAnalyser.span / 1000000)); new StaticText(this, grid.getFieldSlot(3, 1), label); } else {