diff --git a/RX_FSK/data/screens1.txt b/RX_FSK/data/screens1.txt index 0c425d8..47b9321 100644 --- a/RX_FSK/data/screens1.txt +++ b/RX_FSK/data/screens1.txt @@ -109,7 +109,7 @@ @Scanner timer=-1,0,0 key1action=D,#,F,W -key2action=#,#,#,# +key2action=D,#,#,# timeaction=#,D,+ 0,0=XScan 0,5=S#: diff --git a/RX_FSK/data/screens2.txt b/RX_FSK/data/screens2.txt index 735720f..f4e82ea 100644 --- a/RX_FSK/data/screens2.txt +++ b/RX_FSK/data/screens2.txt @@ -103,7 +103,7 @@ @ScannerTFT timer=-1,0,0 key1action=D,#,F,W -key2action=#,#,#,# +key2action=D,#,#,# timeaction=#,D,+ fonts=5,6 0,0=XScan @@ -200,7 +200,7 @@ timeaction=#,#,# @Scan.TFT.Bazjo timer=-1,0,0 key1action=D,#,F,W -key2action=#,#,#,# +key2action=D,#,#,# timeaction=#,D,+ scale=11,10 fonts=0,2 @@ -337,7 +337,7 @@ color=99001F @Scanner.Puspis timer=-1,0,4 key1action=D,#,F,W -key2action=#,#,#,# +key2action=D,#,#,# timeaction=#,D,+ scale=13,10 fonts=0,1 diff --git a/libraries/SondeLib/Display.cpp b/libraries/SondeLib/Display.cpp index 57ee8ca..eb02bfc 100644 --- a/libraries/SondeLib/Display.cpp +++ b/libraries/SondeLib/Display.cpp @@ -500,7 +500,7 @@ void ILI9225Display::drawString(uint8_t x, uint8_t y, const char *s, int16_t wid if(1||width==WIDTH_AUTO || alignright) { #ifdef ALT9225 tft->getTextBounds(s, x, y + gfxoffsets[findex-3].yofs, &x1, &y1, (uint16_t *)&w, (uint16_t *)&h); - w += x1 - x; + w += x1 - x + 1; #else tft->getGFXTextExtent(s, x, y + gfxoffsets[findex-3].yofs, &w, &h); #endif