kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

finalizing new skin

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-03-30 19:09:52 +01:00
parent 48d3085ead
commit 0e1424e5da
6 changed files with 1163 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics.h
+852 -263
View File
File diff suppressed because it is too large Load Diff
src/gui.cpp
+47 -19
View File
@@ -419,16 +419,20 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
break;
case 13: // New skin theme
PrimaryColor = 0x053f;
PrimaryColorSmooth = 0x00e5;
SecondaryColor = Skyblue;
SecondaryColorSmooth = SkyblueSmooth;
FrameColor = Blue;
PrimaryColor = 0x3d7d;
PrimaryColorSmooth = 0x08e5;
SecondaryColor = 0x1a74;
SecondaryColorSmooth = 0x08c6;
FrameColor = 0x8c71;
GreyoutColor = Darkgrey;
BackgroundColor = Black;
BackgroundColor1 = 0x0004;
BackgroundColor2 = 0x0044;
BackgroundColor3 = 0x00a2;
BackgroundColor4 = 0x00c6;
ActiveColor = White;
ActiveColorSmooth = WhiteSmooth;
FreqColor = 0x0734;
FreqColor = 0x1ff7;
FreqColorSmooth = 0x0082;
SignificantColor = Red;
SignificantColorSmooth = RedSmooth;
@@ -436,18 +440,16 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
InsignificantColorSmooth = GreenSmooth;
StereoColor = Red;
StereoColorSmooth = RedSmooth;
RDSColor = Yellow;
RDSColorSmooth = YellowSmooth;
RDSDropoutColor = Teal;
RDSDropoutColorSmooth = TealSmooth;
RDSColor = 0x2e65;
RDSColorSmooth = 0x09a1;
RDSDropoutColor = 0xa555;
RDSDropoutColorSmooth = 0x18e4;
BarSignificantColor = Red;
BarInsignificantColor = Green;
ModBarSignificantColor = Red;
ModBarInsignificantColor = Green;
BarInsignificantColor = 0x3bfd;
BWAutoColor = Teal;
BWAutoColorSmooth = TealSmooth;
BatteryValueColor = Teal;
BatteryValueColorSmooth = Black;
BatteryValueColor = White;
BatteryValueColorSmooth = WhiteSmooth;
break;
}
}
@@ -1486,6 +1488,8 @@ void BuildAdvancedRDS() {
}
void BuildDisplay() {
OneBigLineSprite.unloadFont();
FullLineSprite.unloadFont();
afscreen = false;
advancedRDS = false;
int bandColor;
@@ -1592,7 +1596,6 @@ void BuildDisplay() {
case 1:
tft.pushImage (0, 0, 320, 240, skin1_mainbackground);
tft.pushImage (177, 3, 23, 23, skin1_clock);
if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor;
switch (band) {
@@ -1608,11 +1611,31 @@ void BuildDisplay() {
tft.pushImage (292, 48, 25, 16, skin1_eqoff);
}
tft.pushImage (136, 3, 36, 23, skin1_rdsoff);
tft.pushImage (288, 151, 27, 16, skin1_rtplusoff);
tft.pushImage (210, 151, 17, 16, skin1_taoff);
tft.pushImage (230, 151, 21, 16, skin1_tpoff);
tft.pushImage (254, 151, 30, 16, skin1_eonoff);
tft.pushImage (212, 167, 18, 17, skin1_speechoff);
tft.pushImage (232, 167, 19, 17, skin1_musicoff);
for (byte segments = 0; segments < 11; segments++) {
if (segments > 6) {
tft.fillRect(180 + segments * 13, 220, 4, 4, BarSignificantColor);
tft.fillRect(20 + segments * 13, 220, 4, 4, BarSignificantColor);
} else {
tft.fillRect(180 + segments * 13, 220, 4, 4, BarInsignificantColor);
tft.fillRect(20 + segments * 13, 220, 4, 4, BarInsignificantColor);
}
}
tft.drawLine(178, 219, 313, 219, FrameColor);
tft.drawLine(18, 219, 153, 219, FrameColor);
tftPrint(-1, "S", 6, 214, PrimaryColor, PrimaryColorSmooth, 16);
tftPrint(-1, "M", 162, 214, PrimaryColor, PrimaryColorSmooth, 16);
tftPrint(-1, "PI:", 8, 104, ActiveColor, ActiveColorSmooth, 16);
if (usesquelch) tftPrint(1, "SQ:", 268, 168, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, unitString[unit], 310, 102, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, "dB", 310, 128, ActiveColor, ActiveColorSmooth, 16);
if (usesquelch) tftPrint(1, "SQ:", 276, 168, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, unitString[unit], 312, 108, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, "dB", 312, 128, ActiveColor, ActiveColorSmooth, 16);
tftPrint(1, "C/N", 266, 128, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "kHz", 170, 99, ActiveColor, ActiveColorSmooth, 28);
if (band < BAND_GAP) tftPrint(-1, "MHz", 262, 66, ActiveColor, ActiveColorSmooth, 28); else tftPrint(-1, "kHz", 262, 66, ActiveColor, ActiveColorSmooth, 28);
@@ -1638,6 +1661,11 @@ void BuildDisplay() {
batteryold = 6;
batteryVold = 0;
vPerold = 0;
hasrtplusold = false;
TAold = false;
TPold = false;
haseonold = false;
MSold = 0;
rds_clockold = "";
strcpy(programTypePrevious, "");
PIold = " ";
src/gui.h
+4 -1
View File
@@ -123,7 +123,10 @@ extern int ActiveColor;
extern int ActiveColorSmooth;
extern int AMLevelOffset;
extern int BackgroundColor;
extern int BackgroundColorSmooth;
extern int BackgroundColor1;
extern int BackgroundColor2;
extern int BackgroundColor3;
extern int BackgroundColor4;
extern int BarInsignificantColor;
extern int BarSignificantColor;
extern int BatteryValueColor;
src/rds.cpp
+81 -126
View File
@@ -300,13 +300,7 @@ void readRds() {
if (advancedRDS) {
tftPrint(0, PIold, 275, 75, RDSDropoutColor, RDSDropoutColorSmooth, 28);
} else {
if (CurrentSkin == 1) PISprite.pushImage (-26, -98, 320, 240, skin1_mainbackground);
if (CurrentSkin == 1) PISprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); else tftPrint(0, PIold, 275, 187, RDSDropoutColor, RDSDropoutColorSmooth, 28);
if (CurrentSkin == 1) {
PISprite.drawString(radio.rds.picode, 4, 1);
PISprite.pushSprite(26, 98);
}
if (CurrentSkin == 1) tftPrint(-1, PIold, 30, 99, RDSDropoutColor, RDSDropoutColorSmooth, 28); else tftPrint(0, PIold, 275, 187, RDSDropoutColor, RDSDropoutColorSmooth, 28);
}
}
@@ -331,14 +325,7 @@ void readRds() {
if (advancedRDS) {
tftPrint(-1, PTYold, 36, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16);
} else {
if (CurrentSkin == 1) {
PTYSprite.pushImage (-40, -130, 320, 240, skin1_mainbackground);
PTYSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
PTYSprite.drawString(radio.rds.stationType, 65, 0);
PTYSprite.pushSprite(40, 130);
} else {
tftPrint(-1, PTYold, 36, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
}
if (CurrentSkin == 1) tftPrint(0, PTYold, 105, 130, RDSDropoutColor, RDSDropoutColorSmooth, 16); else tftPrint(-1, PTYold, 36, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
}
if (advancedRDS) {
tft.fillCircle(86, 41, 5, SignificantColor);
@@ -346,36 +333,12 @@ void readRds() {
tft.fillCircle(162, 41, 5, SignificantColor);
tft.fillCircle(200, 41, 5, SignificantColor);
}
/*
if (advancedRDS && radio.rds.stationText.length() < 20) {
xPos = 0;
RDSSprite.fillSprite(BackgroundColor);
RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RDSSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos, 2);
RDSSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos + RadiotextWidth, 2);
RDSSprite.pushSprite(36, 220);
} else if (!advancedRDS && radio.rds.stationText.length() < 29) {
xPos = 0;
if (CurrentSkin == 1) RadiotextSprite.pushImage (-25, -188, 320, 240, skin1_mainbackground); else RadiotextSprite.fillSprite(BackgroundColor);
RadiotextSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RadiotextSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos, 2);
RadiotextSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos + RadiotextWidth, 2);
if (CurrentSkin == 1) RadiotextSprite.pushSprite(25, 188); else RadiotextSprite.pushSprite(36, 220);
}
*/
if (radio.rds.hasCT) {
if (advancedRDS) {
tftPrint(1, rds_clock, 205, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16);
} else {
if (CurrentSkin == 1) {
CTBWSignalSprite.pushImage (-202, 0, 320, 240, skin1_mainbackground);
CTBWSignalSprite.setTextDatum(TL_DATUM);
CTBWSignalSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
CTBWSignalSprite.drawString(rds_clock, 0, 8);
CTBWSignalSprite.pushSprite(202, 0);
} else {
tftPrint(1, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
}
if (CurrentSkin == 1) tftPrint(-1, rds_clock, 202, 8, RDSDropoutColor, RDSDropoutColorSmooth, 16); else tftPrint(1, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
}
}
dropout = true;
@@ -386,14 +349,7 @@ void readRds() {
if (advancedRDS) {
tftPrint(0, PIold, 275, 75, RDSColor, RDSColorSmooth, 28);
} else {
if (CurrentSkin == 1) PISprite.pushImage (-26, -98, 320, 240, skin1_mainbackground);
if (CurrentSkin == 1) PISprite.setTextColor(RDSColor, RDSColor, false); else tftPrint(0, PIold, 275, 187, RDSColor, RDSColor, 28);
if (CurrentSkin == 1) {
PISprite.drawString(radio.rds.picode, 4, 1);
PISprite.pushSprite(26, 98);
}
if (CurrentSkin == 1) tftPrint(-1, PIold, 30, 99, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, PIold, 275, 187, RDSColor, RDSColor, 28);
}
}
@@ -407,7 +363,7 @@ void readRds() {
} else {
if (CurrentSkin == 1) {
PSSprite.pushImage (-8, -154, 320, 240, skin1_mainbackground);
PSSprite.setTextColor(RDSColor, RDSColorSmooth, false);
PSSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
PSSprite.drawString(PSold, 84, 1);
PSSprite.pushSprite(8, 154);
} else {
@@ -417,14 +373,7 @@ void readRds() {
if (advancedRDS) {
tftPrint(-1, PTYold, 36, 109, RDSColor, RDSColorSmooth, 16);
} else {
if (CurrentSkin == 1) {
PTYSprite.pushImage (-40, -130, 320, 240, skin1_mainbackground);
PTYSprite.setTextColor(RDSColor, RDSColorSmooth, false);
PTYSprite.drawString(radio.rds.stationType, 65, 0);
PTYSprite.pushSprite(40, 130);
} else {
tftPrint(-1, PTYold, 36, 163, RDSColor, RDSColorSmooth, 16);
}
if (CurrentSkin == 1) tftPrint(0, PTYold, 105, 130, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, PTYold, 36, 163, RDSColor, RDSColorSmooth, 16);
}
if (!advancedRDS) {
if (CurrentSkin != 1) {
@@ -456,20 +405,53 @@ void readRds() {
if (advancedRDS) {
tftPrint(1, rds_clock, 205, 109, RDSColor, RDSColorSmooth, 16);
} else {
if (CurrentSkin == 1) {
CTBWSignalSprite.pushImage (-202, 0, 320, 240, skin1_mainbackground);
CTBWSignalSprite.setTextDatum(TL_DATUM);
CTBWSignalSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
CTBWSignalSprite.drawString(rds_clock, 0, 8);
CTBWSignalSprite.pushSprite(202, 0);
} else {
tftPrint(1, rds_clock, 205, 163, RDSColor, RDSColorSmooth, 16);
}
if (CurrentSkin == 1) tftPrint(-1, rds_clock, 202, 8, RDSColor, RDSColorSmooth, 16); else tftPrint(1, rds_clock, 205, 163, RDSColor, RDSColorSmooth, 16);
}
}
dropout = false;
}
}
if (CurrentSkin == 1 && !advancedRDS) {
if (hasrtplusold != radio.rds.hasRDSplus) {
if (radio.rds.hasRDSplus) tft.pushImage (288, 151, 27, 16, skin1_rtpluson); else tft.pushImage (288, 151, 27, 16, skin1_rtplusoff);
hasrtplusold = radio.rds.hasRDSplus;
}
if (TAold != radio.rds.hasTA) {
if (radio.rds.hasTA) tft.pushImage (210, 151, 17, 16, skin1_taon); else tft.pushImage (210, 151, 17, 16, skin1_taoff);
TAold = radio.rds.hasTA;
}
if (TPold != radio.rds.hasTP) {
if (radio.rds.hasTP) tft.pushImage (230, 151, 21, 16, skin1_tpon); else tft.pushImage (230, 151, 21, 16, skin1_tpoff);
TPold = radio.rds.hasTP;
}
if (haseonold != radio.rds.hasEON) {
if (radio.rds.hasEON) tft.pushImage (254, 151, 30, 16, skin1_eonon); else tft.pushImage (254, 151, 30, 16, skin1_eonoff);
haseonold = radio.rds.hasEON;
}
if (MSold != radio.rds.MS) {
switch (radio.rds.MS) {
case 0:
tft.pushImage (212, 167, 18, 17, skin1_speechoff);
tft.pushImage (232, 167, 19, 17, skin1_musicoff);
break;
case 1:
tft.pushImage (212, 167, 18, 17, skin1_speechoff);
tft.pushImage (232, 167, 19, 17, skin1_musicon);
break;
case 2:
tft.pushImage (212, 167, 18, 17, skin1_speechon);
tft.pushImage (232, 167, 19, 17, skin1_musicoff);
break;
}
MSold = radio.rds.MS;
}
}
}
if ((RDSstatus && RDSSPYUSB) || (RDSstatus && RDSSPYTCP)) {
@@ -632,46 +614,40 @@ void showPI() {
if (advancedRDS) {
if (region == REGION_EU) {
if (!RDSstatus) {
tftReplace(0, PIold, radio.rds.picode, 275, 75, RDSDropoutColor, RDSDropoutColorSmooth, 28);
tftReplace(0, PIold, radio.rds.picode, 275, 75, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 28);
} else {
tftReplace(0, PIold, radio.rds.picode, 275, 75, RDSColor, RDSColorSmooth, 28);
tftReplace(0, PIold, radio.rds.picode, 275, 75, RDSColor, RDSColorSmooth, BackgroundColor, 28);
}
}
if (region == REGION_US) {
if (!RDSstatus) {
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 72, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, RDSDropoutColor, RDSDropoutColorSmooth, 16);
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 72, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
} else {
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 72, RDSColor, RDSColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, RDSColor, RDSColorSmooth, 16);
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 72, RDSColor, RDSColorSmooth, BackgroundColor, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 89, RDSColor, RDSColorSmooth, BackgroundColor, 16);
}
tftReplace(1, stationStateold, radio.rds.stationState, 318, 89, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(1, stationStateold, radio.rds.stationState, 318, 89, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
}
} else if (afscreen) {
tftReplace(-1, PIold, radio.rds.picode, 30, 201, BWAutoColor, BWAutoColorSmooth, 16);
tftReplace(-1, PIold, radio.rds.picode, 30, 201, BWAutoColor, BWAutoColorSmooth, BackgroundColor, 16);
} else {
if (region == REGION_EU) {
if (CurrentSkin == 1) PISprite.pushImage (-26, -98, 320, 240, skin1_mainbackground);
if (!RDSstatus) {
if (CurrentSkin == 1) PISprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); else tftReplace(0, PIold, radio.rds.picode, 275, 187, RDSDropoutColor, RDSDropoutColorSmooth, 28);
if (CurrentSkin == 1) tftReplace(-1, PIold, radio.rds.picode, 30, 99, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor2, 28); else tftReplace(0, PIold, radio.rds.picode, 275, 187, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 28);
} else {
if (CurrentSkin == 1) PISprite.setTextColor(RDSColor, RDSColorSmooth, false); else tftReplace(0, PIold, radio.rds.picode, 275, 187, RDSColor, RDSColorSmooth, 28);
}
if (CurrentSkin == 1) {
PISprite.drawString(radio.rds.picode, 4, 1);
PISprite.pushSprite(26, 98);
if (CurrentSkin == 1) tftReplace(-1, PIold, radio.rds.picode, 30, 99, PrimaryColor, PrimaryColorSmooth, BackgroundColor2, 28); else tftReplace(0, PIold, radio.rds.picode, 275, 187, RDSColor, RDSColorSmooth, BackgroundColor, 28);
}
}
if (region == REGION_US) {
if (!RDSstatus) {
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 184, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, RDSDropoutColor, RDSDropoutColorSmooth, 16);
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 184, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
} else {
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 184, RDSColor, RDSColorSmooth, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, RDSColor, RDSColorSmooth, 16);
if (String(radio.rds.picode) != PIold) tftReplace(-1, PIold, radio.rds.picode, 240, 184, RDSColor, RDSColorSmooth, BackgroundColor, 16);
tftReplace(-1, stationIDold, radio.rds.stationID, 240, 201, RDSColor, RDSColorSmooth, BackgroundColor, 16);
}
tftReplace(1, stationStateold, radio.rds.stationState, 318, 201, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(1, stationStateold, radio.rds.stationState, 318, 201, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
}
}
PIold = radio.rds.picode;
@@ -691,20 +667,15 @@ void showPTY() {
if (!screenmute) {
if (advancedRDS) {
if (!RDSstatus) {
tftReplace(-1, PTYold, radio.rds.stationType, 36, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(-1, PTYold, radio.rds.stationType, 36, 109, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
} else {
tftReplace(-1, PTYold, radio.rds.stationType, 36, 109, RDSColor, RDSColorSmooth, 16);
tftReplace(-1, PTYold, radio.rds.stationType, 36, 109, RDSColor, RDSColorSmooth, BackgroundColor, 16);
}
} else {
if (CurrentSkin == 1) PTYSprite.pushImage (-40, -130, 320, 240, skin1_mainbackground);
if (!RDSstatus) {
if (CurrentSkin == 1) PTYSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); else tftReplace(-1, PTYold, radio.rds.stationType, 36, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
if (CurrentSkin == 1) tftReplace(0, PTYold, radio.rds.stationType, 105, 130, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor4, 16); else tftReplace(-1, PTYold, radio.rds.stationType, 36, 163, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
} else {
if (CurrentSkin == 1) PTYSprite.setTextColor(RDSColor, RDSColorSmooth, false); else tftReplace(-1, PTYold, radio.rds.stationType, 36, 163, RDSColor, RDSColorSmooth, 16);
}
if (CurrentSkin == 1) {
PTYSprite.drawString(radio.rds.stationType, 65, 0);
PTYSprite.pushSprite(40, 130);
if (CurrentSkin == 1) tftReplace(0, PTYold, radio.rds.stationType, 105, 130, PrimaryColor, PrimaryColorSmooth, BackgroundColor4, 16); else tftReplace(-1, PTYold, radio.rds.stationType, 36, 163, RDSColor, RDSColorSmooth, BackgroundColor, 16);
}
}
}
@@ -724,12 +695,12 @@ void showPS() {
if (!screenmute) {
if (advancedRDS) {
if (!RDSstatus) {
tftReplace(-1, PSold, radio.rds.stationName, 36, 75, RDSDropoutColor, RDSDropoutColorSmooth, 28);
tftReplace(-1, PSold, radio.rds.stationName, 36, 75, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 28);
} else {
tftReplace(-1, PSold, radio.rds.stationName, 36, 75, RDSColor, RDSColorSmooth, 28);
tftReplace(-1, PSold, radio.rds.stationName, 36, 75, RDSColor, RDSColorSmooth, BackgroundColor, 28);
}
} else if (afscreen) {
tftReplace(0, PSold, radio.rds.stationName, 160, 201, BWAutoColor, BWAutoColorSmooth, 16);
tftReplace(0, PSold, radio.rds.stationName, 160, 201, BWAutoColor, BWAutoColorSmooth, BackgroundColor, 16);
} else {
if (!RDSstatus) {
if (CurrentSkin == 1) {
@@ -738,16 +709,16 @@ void showPS() {
PSSprite.drawString(radio.rds.stationName, 84, 1);
PSSprite.pushSprite(8, 154);
} else {
tftReplace(-1, PSold, radio.rds.stationName, 36, 187, RDSDropoutColor, RDSDropoutColorSmooth, 28);
tftReplace(-1, PSold, radio.rds.stationName, 36, 187, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 28);
}
} else {
if (CurrentSkin == 1) {
PSSprite.pushImage (-8, -154, 320, 240, skin1_mainbackground);
PSSprite.setTextColor(RDSColor, RDSColorSmooth, false);
PSSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
PSSprite.drawString(radio.rds.stationName, 84, 1);
PSSprite.pushSprite(8, 154);
} else {
tftReplace(-1, PSold, radio.rds.stationName, 36, 187, RDSColor, RDSColorSmooth, 28);
tftReplace(-1, PSold, radio.rds.stationName, 36, 187, RDSColor, RDSColorSmooth, BackgroundColor, 28);
}
}
}
@@ -785,32 +756,16 @@ void showCT() {
rtcset = true;
rtc.setTime(0, radio.rds.minute, radio.rds.hour, radio.rds.day, radio.rds.month, radio.rds.year);
if (advancedRDS) {
tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSColor, RDSColorSmooth, 16);
tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSColor, RDSColorSmooth, BackgroundColor, 16);
} else {
if (CurrentSkin == 1) {
CTBWSignalSprite.pushImage (-202, 0, 320, 240, skin1_mainbackground);
CTBWSignalSprite.setTextDatum(TL_DATUM);
CTBWSignalSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
CTBWSignalSprite.drawString(rds_clock, 0, 8);
CTBWSignalSprite.pushSprite(202, 0);
} else {
tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSColor, RDSColorSmooth, 16);
}
if (CurrentSkin == 1) tftReplace(-1, rds_clockold, rds_clock, 202, 8, ActiveColor, ActiveColorSmooth, BackgroundColor1, 16); else tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSColor, RDSColorSmooth, BackgroundColor, 16);
}
} else {
if (rtcset) {
if (advancedRDS) {
tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16);
tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
} else {
if (CurrentSkin == 1) {
CTBWSignalSprite.pushImage (-202, 0, 320, 240, skin1_mainbackground);
CTBWSignalSprite.setTextDatum(TL_DATUM);
CTBWSignalSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
CTBWSignalSprite.drawString(rds_clock, 0, 8);
CTBWSignalSprite.pushSprite(202, 0);
} else {
tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16);
}
if (CurrentSkin == 1) tftReplace(-1, rds_clockold, rds_clock, 202, 8, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor1, 16); else tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
}
} else {
if (advancedRDS) {
@@ -818,8 +773,8 @@ void showCT() {
tftPrint(1, rds_clock, 205, 109, BackgroundColor, BackgroundColor, 16);
} else {
if (CurrentSkin == 1) {
CTBWSignalSprite.pushImage (-202, 0, 320, 240, skin1_mainbackground);
CTBWSignalSprite.pushSprite(202, 0);
tftPrint(-1, rds_clockold, 202, 8, BackgroundColor1, BackgroundColor1, 16);
tftPrint(-1, rds_clock, 202, 8, BackgroundColor1, BackgroundColor1, 16);
} else {
tftPrint(1, rds_clockold, 205, 163, BackgroundColor, BackgroundColor, 16);
tftPrint(1, rds_clock, 205, 163, BackgroundColor, BackgroundColor, 16);
@@ -1045,7 +1000,7 @@ void ShowAFEON() {
if (radio.eon[i + y].tp) tft.fillCircle(276, 54 + (15 * i), 4, InsignificantColor); else tft.fillCircle(276, 54 + (15 * i), 4, BackgroundColor);
if (radio.eon[i + y].pty != eonptyold[i + y]) {
tftReplace(0, String(eonptyold[i + y]), (radio.eon[i + y].pty < 32 ? String(radio.eon[i + y].pty) : " "), 304, 48 + (15 * i), RDSColor, RDSColorSmooth, 16);
tftReplace(0, String(eonptyold[i + y]), (radio.eon[i + y].pty < 32 ? String(radio.eon[i + y].pty) : " "), 304, 48 + (15 * i), RDSColor, RDSColorSmooth, BackgroundColor, 16);
eonptyold[i + y] = radio.eon[i + y].pty;
}
src/rds.h
+4 -4
View File
@@ -59,6 +59,9 @@ extern char programTypePrevious[18];
extern int ActiveColor;
extern int ActiveColorSmooth;
extern int BackgroundColor;
extern int BackgroundColor1;
extern int BackgroundColor2;
extern int BackgroundColor4;
extern int BarSignificantColor;
extern int BarInsignificantColor;
extern int BWAutoColor;
@@ -123,9 +126,6 @@ extern WiFiUDP Udp;
extern TFT_eSprite RadiotextSprite;
extern TFT_eSprite RDSSprite;
extern TFT_eSprite PSSprite;
extern TFT_eSprite PISprite;
extern TFT_eSprite PTYSprite;
extern TFT_eSprite CTBWSignalSprite;
void ShowAdvancedRDS();
void readRds();
@@ -142,5 +142,5 @@ void ShowErrors();
extern void ShowRDSLogo(bool RDSstatus);
extern void DataPrint(String string);
extern void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
extern void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
extern void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, int background, uint8_t fontsize);
#endif