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

Added seperate colorset for modulation meter

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-12-30 20:22:00 +01:00
parent aebbfbabfd
commit 8ec0123fee
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
TEF6686_ESP32.ino
View File

@@ -217,6 +217,8 @@ int GreyoutColor;
int InsignificantColor;
int InsignificantColorSmooth;
int menuoption = ITEM1;
int ModBarInsignificantColor;
int ModBarSignificantColor;
int MStatusold;
int offsetupdatetimer;
int OStatusold;
@@ -822,7 +824,7 @@ void loop() {
if (segments > 54) {
if (((segments - 53) % 10) == 0) tft.fillRect(16 + (2 * segments), 141, 2, 2, BarSignificantColor);
} else {
if (((segments + 1) % 6) == 0) tft.fillRect(16 + (2 * segments), 141, 2, 2, BarInsignificantColor);
if (((segments + 1) % 6) == 0) tft.fillRect(16 + (2 * segments), 141, 2, 2, ModBarInsignificantColor);
}
}
}
@@ -2756,12 +2758,12 @@ void ShowModLevel() {
peakholdmillis = millis();
}
tft.fillRect(16, 133, 2 * constrain(segments, 0, 54), 6, BarInsignificantColor);
tft.fillRect(16 + 2 * 54, 133, 2 * (constrain(segments, 54, 94) - 54), 6, BarSignificantColor);
tft.fillRect(16, 133, 2 * constrain(segments, 0, 54), 6, ModBarInsignificantColor);
tft.fillRect(16 + 2 * 54, 133, 2 * (constrain(segments, 54, 94) - 54), 6, ModBarSignificantColor);
tft.fillRect(16 + 2 * constrain(segments, 0, 94), 133, 2 * (94 - constrain(segments, 0, 94)), 6, GreyoutColor);
int peakHoldPosition = 16 + 2 * constrain(peakholdold, 0, 94);
tft.fillRect(peakHoldPosition, 133, 2, 6, (MStatus > 80) ? BarSignificantColor : PrimaryColor);
tft.fillRect(peakHoldPosition, 133, 2, 6, (MStatus > 80) ? ModBarSignificantColor : PrimaryColor);
if (millis() - peakholdmillis >= 1000) {
tft.fillRect(peakHoldPosition, 133, 2, 6, GreyoutColor);

24
src/gui.cpp
View File

@@ -33,6 +33,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x2120;
BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144;
BatteryValueColor = 0x07F7;
@@ -60,6 +62,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x0105;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x0F3F;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = 0x0F3F;
BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144;
BatteryValueColor = 0x07F7;
@@ -87,6 +91,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = TFT_BLACK;
BarSignificantColor = TFT_YELLOW;
BarInsignificantColor = 0xF8C3;
ModBarSignificantColor = TFT_YELLOW;
ModBarInsignificantColor = 0xF8C3;
BWAutoColor = 0xFBEF;
BWAutoColorSmooth = 0x4124;
BatteryValueColor = 0xFA8D;
@@ -114,6 +120,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = TFT_BLACK;
BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x7BCF;
BWAutoColorSmooth = 0x1082;
BatteryValueColor = TFT_WHITE;
@@ -141,6 +149,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = TFT_WHITE;
BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_ORANGE;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_ORANGE;
BWAutoColor = 0xF980;
BWAutoColorSmooth = 0x3080;
BatteryValueColor = 0xF980;
@@ -168,6 +178,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x0200;
BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F6;
BWAutoColorSmooth = 0x0184;
BatteryValueColor = 0x07F6;
@@ -195,6 +207,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x3008;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0xF3D5;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = 0xF3D5;
BWAutoColor = 0xF00A;
BWAutoColorSmooth = 0x2802;
BatteryValueColor = 0xF00A;
@@ -222,6 +236,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0xDFFC;
BarSignificantColor = TFT_BLACK;
BarInsignificantColor = TFT_GREEN;
ModBarSignificantColor = TFT_BLACK;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x7BCF;
BWAutoColorSmooth = TFT_WHITE;
BatteryValueColor = TFT_BLACK;
@@ -249,6 +265,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x3080;
BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0xED20;
BWAutoColorSmooth = 0x3940;
BatteryValueColor = 0xED20;
@@ -276,6 +294,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x0006;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x01FF;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = 0x01FF;
BWAutoColor = 0x051F;
BWAutoColorSmooth = 0x0106;
BatteryValueColor = 0x051F;
@@ -303,6 +323,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x2007;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x881F;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = 0x881F;
BWAutoColor = 0xD01F;
BWAutoColorSmooth = 0x400A;
BatteryValueColor = 0xD01F;
@@ -331,6 +353,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x2120;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x01FF;
ModBarSignificantColor = TFT_RED;
ModBarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144;
BatteryValueColor = 0x07F7;

2
src/gui.h
View File

@@ -135,6 +135,8 @@ extern int GreyoutColor;
extern int InsignificantColor;
extern int InsignificantColorSmooth;
extern int menuoption;
extern int ModBarInsignificantColor;
extern int ModBarSignificantColor;
extern int PrimaryColor;
extern int PrimaryColorSmooth;
extern int RDSColor;