From 9cea3ed9ad35dc8a5d722ebb0967e62b7991f603 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Wed, 22 May 2019 23:04:06 +0200 Subject: [PATCH] minor cleanup --- libraries/SondeLib/Display.cpp | 5 +++-- libraries/SondeLib/Sonde.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/SondeLib/Display.cpp b/libraries/SondeLib/Display.cpp index 5403df5..0004d1c 100644 --- a/libraries/SondeLib/Display.cpp +++ b/libraries/SondeLib/Display.cpp @@ -164,7 +164,7 @@ void Display::drawVS(DispEntry *de) { void Display::drawID(DispEntry *de) { SETFONT((de->fmt&0x01)); if(!sonde.si()->validID) { - u8x8->drawString(de->x, de->y, "nnnnnnnn "); + u8x8->drawString(de->x, de->y, "nnnnnnnn "); return; } u8x8->drawString(de->x, de->y, sonde.si()->id); @@ -199,7 +199,8 @@ void Display::drawFreq(DispEntry *de) { void Display::drawAFC(DispEntry *de) { if(!sonde.config.showafc) return; SETFONT(de->fmt); - snprintf(buf, 15, " %+3.2fk", sonde.si()->afc*0.001); + if(sonde.si()->afc==0) { strcpy(buf, " "); } + else { snprintf(buf, 15, " %+3.2fk", sonde.si()->afc*0.001); } u8x8->drawString(de->x, de->y, buf+strlen(buf)-8); } void Display::drawIP(DispEntry *de) { diff --git a/libraries/SondeLib/Sonde.cpp b/libraries/SondeLib/Sonde.cpp index a324364..9dd315a 100644 --- a/libraries/SondeLib/Sonde.cpp +++ b/libraries/SondeLib/Sonde.cpp @@ -256,7 +256,7 @@ void Sonde::updateDisplayIP() { void Sonde::updateDisplayScanner() { disp.setLayout(0); disp.updateDisplay(); - disp.setLayout(2); + disp.setLayout(config.display); #if 0 char buf[16]; u8x8->setFont(u8x8_font_7x14_1x2_r);