From 391135ba9d8ca8970528483033f16d2304a55ece Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sat, 23 Oct 2021 23:27:56 +0200 Subject: [PATCH] update screens5.txt --- RX_FSK/data/qrg.txt | 6 - RX_FSK/data/screens5.txt | 279 ++++++++++++++++++++------------------- RX_FSK/src/Display.cpp | 2 +- RX_FSK/version.h | 2 +- 4 files changed, 143 insertions(+), 146 deletions(-) diff --git a/RX_FSK/data/qrg.txt b/RX_FSK/data/qrg.txt index 43f2bb2..6b3cc96 100644 --- a/RX_FSK/data/qrg.txt +++ b/RX_FSK/data/qrg.txt @@ -14,10 +14,4 @@ 405.900 4 + Bergen_2 405.100 4 + Meppen_2 405.300 4 - Essen -403.330 9 - TrUebPl -403.450 9 - TrUebPl -403.470 9 - TrUebPl -403.850 9 - TrUebPl -403.870 9 - TrUebPl -403.890 9 - TrUebPl # end diff --git a/RX_FSK/data/screens5.txt b/RX_FSK/data/screens5.txt index 857b5cc..7c00546 100644 --- a/RX_FSK/data/screens5.txt +++ b/RX_FSK/data/screens5.txt @@ -111,217 +111,220 @@ ########### @ScannerTFT-D timer=-1,0,0 -key1action=D,#,F,W -key2action=#,#,#,# +key1action=F,#,#,W +key2action=>,#,#,# timeaction=#,D,+ scale=11,10 fonts=0,2 -color=B0B0B0 -0,0=Xsuche.. -color=6C757D -3,0=xStartort -color=B0B0B0 -4,0=S -color=6C757D -3,15=xFreq. Platz -color=B0B0B0 -4,15,23=S# -color=6C757D -6,0=xTyp -color=B0B0B0 -7,0,5=T -color=6C757D -6,15=xFrequenz -color=B0B0B0 -7,15=F -color=6C757D -28,0=Scanner +color=FFFFFF +0,0.3=XSuche... +color=79CDCD +3,0.3=xFreq. Platz +color=FFFFFF +4,0.3,3=S# +color=79CDCD,0 +6,0.3=xStartort +color=FFFFFF +7,0.3,20=S +color=79CDCD,0 +9,0.3=xTyp +color=FFFFFF +10,0.33,5=T +color=79CDCD +9,15=xFrequenz +color=FFFFFF +10,15=F +color=79CDCD +28,0.3=xScanner 28,9=n 28,21=bVV + ############ @MainTFT-D timer=-1,-1,-1 -key1action=>,0,F,W +key1action=0,#,F,W key2action=+,#,#,# timeaction=#,#,0 scale=11,10 fonts=0,2 -color=6C757D -0,0=xSerial -0,6=t -color=B0B0B0 -1,0=Is -color=6C757D +color=79CDCD +0,0.3=xSerial +0,6,10=t +color=FFFFFF +1,0.3=Is +color=79CDCD 0,14=xFreq. 0,17.5=s -color=B0B0B0 +color=FFFFFF 1,14=F -color=6C757D -3,0=xLatitude -color=B0B0B0 -4,0,10=L -color=6C757D +color=79CDCD +3,0.3=xLatitude +color=FFFFFF +4,0.3,10=L +color=79CDCD 3,14=xLongitude -color=B0B0B0 +color=FFFFFF 4,14,23=O -color=6C757D -6,0=xHoriz. Geschw. -color=B0B0B0 -7,0,10=Hkkm/h -color=6C757D +color=79CDCD +6,0.3=xHoriz. Geschw. +color=FFFFFF +7,0.3,10=Hkkm/h +color=79CDCD 6,14=xVert. Geschw. -color=B0B0B0 -7,13.5,23=Vm/s -color=6C757D +color=FFFFFF +7,14,23=Vm/s +color=79CDCD 9.5,14=xHoehe Sonde color=ffff00 -10.5,13.5,23=A +10.7,14,23=A color=ffff00,000033 9,1=g0CCS,45,ffff00,000044,4,55ff55,4,eeaa00 color=bbbbbb,000000 -color=6C757D +color=79CDCD 12.5,14=xHoehe RX color=ffff00 -13.5,14=GH -color=6C757D -15.5,14=xEntfernung +13.5,14,23=GH +color=79CDCD +15.5,14=xTimer color=ffff00 -16.5,14,23=GD -color=6C757D -19,0=xTimer -color=B0B0B0 -20,0,10=Kc4 -color=6C757D +16.5,14,23=Kc4 +fonts=0,8 +color=FFFFFF +18.7,0,-12.3=GD +fonts=0,2 +color=79CDCD 19,14=xRSSI -color=B0B0B0 +color=FFFFFF 20,14,23=R -color=6C757D -22,0=xLufttemperatur -color=B0B0B0 -23,0,10=Mt°C -color=6C757D +color=79CDCD +22,0.3=xLufttemperatur +color=FFFFFF +23,0.3,10=Mt°C +color=79CDCD 22,14=xLuftfeuchtigkeit -color=B0B0B0 +color=FFFFFF 23,14,23=Mh%rH -color=6C757D -25,0=xLuftdruck -color=B0B0B0 -26,0,10=MphPa -color=6C757D +color=79CDCD +25,0.3=xLuftdruck +color=FFFFFF +26,0.3,10=MphPa +color=79CDCD 25,14=xZellenspannung -color=B0B0B0 +color=FFFFFF 26,14,23=MbV -color=6C757D -28,0=Q +color=FFFFFF +28,0.3=Q +color=79CDCD 28,13=c 28,21=bVV ########### @ScannerTFT-E timer=-1,0,0 -key1action=D,#,F,W -key2action=#,#,#,# +key1action=F,#,#,W +key2action=>,#,#,# timeaction=#,D,+ scale=11,10 fonts=0,2 -color=B0B0B0 -0,0=XScan... -color=6C757D -3,0=xLaunchsize -color=B0B0B0 -4,0=S -color=6C757D -3,15=xFreq.index -color=B0B0B0 -4,15,23=S# -color=6C757D -6,0=xType -color=B0B0B0 -7,0,5=T -color=6C757D +color=FFFFFF +0,0.3=XScan... +color=79CDCD +3,0.3=xFreq. index +color=FFFFFF +4,0.3,3=S# +color=79CDCD,0 +6,0.3=xLaunchsize +color=FFFFFF +7,0.3,20=S +color=79CDCD,0 +9,0.3=xType +color=FFFFFF +10,0.33,5=T +color=79CDCD 6,15=xFrequency -color=B0B0B0 +color=FFFFFF 7,15=F -color=6C757D -28,0=Scanner +color=79CDCD +28,0.3=xScanner 28,9=n 28,21=bVV ############ @MainTFT timer=-1,-1,-1 -key1action=>,0,F,W +key1action=0,#,F,W key2action=+,#,#,# timeaction=#,#,0 scale=11,10 fonts=0,2 -color=6C757D -0,0=xSerial -0,6=t -color=B0B0B0 -1,0=Is -color=6C757D +color=79CDCD +0,0.3=xSerial +0,6,10=t +color=FFFFFF +1,0.3=Is +color=79CDCD 0,14=xFreq. 0,17.5=s -color=B0B0B0 +color=FFFFFF 1,14=F -color=6C757D -3,0=xLatitude -color=B0B0B0 -4,0,10=L -color=6C757D +color=79CDCD +3,0.3=xLatitude +color=FFFFFF +4,0.3,10=L +color=79CDCD 3,14=xLongitude -color=B0B0B0 +color=FFFFFF 4,14,23=O -color=6C757D -6,0=xHor.Velocity -color=B0B0B0 -7,0,10=Hkkm/h -color=6C757D +color=79CDCD +6,0.3=xHor.Velocity +color=FFFFFF +7,0.3,10=Hkkm/h +color=79CDCD 6,14=xVert.Velocity -color=B0B0B0 -7,13.5,23=Vm/s -color=6C757D +color=FFFFFF +7,14,23=Vm/s +color=79CDCD 9.5,14=xAltitude color=ffff00 -10.5,13.5,23=A +10.7,14,23=A color=ffff00,000033 9,1=g0CCS,45,ffff00,000044,4,55ff55,4,eeaa00 color=bbbbbb,000000 -color=6C757D +color=79CDCD 12.5,14=xRX Altitude color=ffff00 -13.5,14=GH -color=6C757D -15.5,14=xDistance +13.5,14,23=GH +color=79CDCD +15.5,14=xTimer color=ffff00 -16.5,14,23=GD -color=6C757D -19,0=xTimer -color=B0B0B0 -20,0,10=Kc4 -color=6C757D +16.5,14,23=Kc4 +fonts=0,8 +color=FFFFFF +18.7,0,-12.3=GD +fonts=0,2 +color=79CDCD 19,14=xRSSI -color=B0B0B0 +color=FFFFFF 20,14,23=R -color=6C757D -22,0=xTemperature -color=B0B0B0 -23,0,10=Mt°C -color=6C757D +color=79CDCD +22,0.3=xTemperature +color=FFFFFF +23,0.3,10=Mt°C +color=79CDCD 22,14=xHumidity -color=B0B0B0 +color=FFFFFF 23,14,23=Mh%rH -color=6C757D -25,0=xPressure -color=B0B0B0 -26,0,10=MphPa -color=6C757D +color=79CDCD +25,0.3=xPressure +color=FFFFFF +26,0.3,10=MphPa +color=79CDCD 25,14=xSonde Battery -color=B0B0B0 +color=FFFFFF 26,14,23=MbV -color=6C757D -28,0=Q +color=FFFFFF +28,0.3=Q +color=79CDCD 28,13=c 28,21=bVV diff --git a/RX_FSK/src/Display.cpp b/RX_FSK/src/Display.cpp index 7c708b9..056c440 100644 --- a/RX_FSK/src/Display.cpp +++ b/RX_FSK/src/Display.cpp @@ -1344,7 +1344,7 @@ void Display::drawSite(DispEntry *de) { case '#': // currentSonde is index in array starting with 0; // but we draw "1" for the first entry and so on... - snprintf(buf, 3, "%2d", sonde.currentSonde+1); + snprintf(buf, 3, "%d ", sonde.currentSonde+1); buf[2]=0; break; case 't': diff --git a/RX_FSK/version.h b/RX_FSK/version.h index c228b24..92b41a9 100644 --- a/RX_FSK/version.h +++ b/RX_FSK/version.h @@ -1,4 +1,4 @@ const char *version_name = "rdzTTGOsonde"; -const char *version_id = "devel20211016"; +const char *version_id = "devel20211023"; const int SPIFFS_MAJOR=2; const int SPIFFS_MINOR=16;