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

Adjusted width of graph bars

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-10 15:59:40 +01:00
parent ffe5042062
commit 042c968111
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+15 -15
View File
@@ -1266,7 +1266,7 @@ void loop() {
tftPrint(-1, "70", 117, 144, GreyoutColor, BackgroundColor, 16);
tftPrint(-1, "100", 164, 144, GreyoutColor, BackgroundColor, 16);
tftPrint(0, "M", 7, 128, GreyoutColor, BackgroundColor, 16);
tft.fillRect(16, 133, 188, 6, GreyoutColor);
tft.fillRect(16, 133, 187, 6, GreyoutColor);
}
if (region == REGION_EU) tftPrint(-1, "PI:", 212, 193, GreyoutColor, BackgroundColor, 16);
if (region == REGION_US) {
@@ -3375,9 +3375,9 @@ void ShowSignalLevel() {
// Calculate segments for signal meter
if (band < BAND_GAP) {
DisplayedSignalSegments = constrain(map(SStatus / 10, 0, 70, 0, 100), 0, 93);
DisplayedSignalSegments = constrain(map(SStatus / 10, 0, 70, 0, 100), 0, 86);
} else {
DisplayedSignalSegments = constrain((SStatus + 200) / 10, 0, 93);
DisplayedSignalSegments = constrain((SStatus + 200) / 10, 0, 86);
}
// Extract RGB components from 16-bit colors
@@ -3389,8 +3389,8 @@ void ShowSignalLevel() {
uint8_t g2 = (BarSignificantColor >> 5) & 0x3F;
uint8_t b2 = BarSignificantColor & 0x1F;
int gradientStart = (93 * 25) / 100;
int gradientEnd = (93 * 60) / 100;
int gradientStart = (86 * 25) / 100; // Adjusted for 86 segments
int gradientEnd = (86 * 60) / 100; // Adjusted for 86 segments
// Draw solid color for first 25%
for (int i = 0; i < min(DisplayedSignalSegments, gradientStart); i++) {
@@ -3417,7 +3417,7 @@ void ShowSignalLevel() {
// Grey out unused segments
int greyStart = 16 + 2 * DisplayedSignalSegments;
int greyWidth = 2 * (94 - DisplayedSignalSegments);
int greyWidth = 2 * (87 - DisplayedSignalSegments); // Adjusted for 87 total segments
tft.fillRect(greyStart, 105, greyWidth, 6, GreyoutColor);
}
@@ -3581,8 +3581,8 @@ void ShowModLevel() {
MStatusold = 1;
}
// Map MStatus to segment count, ensuring it does not exceed 93
segments = constrain(map(MStatus, 0, 120, 0, 93), 0, 93);
// Map MStatus to segment count, ensuring it does not exceed 86
segments = constrain(map(MStatus, 0, 120, 0, 86), 0, 86);
// Smooth decrease of segments over time
if (segments < DisplayedSegments && (millis() - ModulationpreviousMillis >= 20)) {
@@ -3592,8 +3592,8 @@ void ShowModLevel() {
DisplayedSegments = segments;
}
// Ensure DisplayedSegments never exceeds 93
DisplayedSegments = constrain(DisplayedSegments, 0, 93);
// Ensure DisplayedSegments never exceeds 86
DisplayedSegments = constrain(DisplayedSegments, 0, 86);
// Peak Hold Logic
if (DisplayedSegments > peakholdold) {
@@ -3609,7 +3609,7 @@ void ShowModLevel() {
}
// Ensure peak hold indicator stays within bounds
peakholdold = constrain(peakholdold, 0, 93);
peakholdold = constrain(peakholdold, 0, 86);
// Extract RGB components from 16-bit colors
uint8_t r1 = (ModBarInsignificantColor >> 11) & 0x1F;
@@ -3620,8 +3620,8 @@ void ShowModLevel() {
uint8_t g2 = (ModBarSignificantColor >> 5) & 0x3F;
uint8_t b2 = ModBarSignificantColor & 0x1F;
int gradientStart = (93 * 25) / 100; // 25% of the bar
int gradientEnd = (93 * 60) / 100; // 60% of the bar
int gradientStart = (86 * 25) / 100; // Adjusted for 86 segments
int gradientEnd = (86 * 60) / 100; // Adjusted for 86 segments
// Draw solid color for first 25%
for (int i = 0; i < min(DisplayedSegments, gradientStart); i++) {
@@ -3652,7 +3652,7 @@ void ShowModLevel() {
// Grey out unused segments
int greyStart = 16 + 2 * DisplayedSegments;
int greyWidth = 2 * (93 - DisplayedSegments);
int greyWidth = 2 * (87 - DisplayedSegments); // Adjusted for 87 total segments
tft.fillRect(greyStart, 133, greyWidth, 6, GreyoutColor);
// Peak Hold Indicator
@@ -3661,7 +3661,7 @@ void ShowModLevel() {
// Erase peak hold indicator if it has decayed
if (millis() - peakholdmillis >= 1000) {
if (peakholdold <= DisplayedSegments || peakholdold >= 93) {
if (peakholdold <= DisplayedSegments || peakholdold >= 86) {
tft.fillRect(peakHoldPosition, 133, 2, 6, GreyoutColor);
}
}
src/gui.cpp
+13 -10
View File
@@ -2982,30 +2982,33 @@ void BuildDisplay() {
tft.drawLine(0, 30, 320, 30, FrameColor);
tft.drawLine(0, 100, 320, 100, FrameColor);
tft.drawLine(105, 30, 105, 0, FrameColor);
tft.drawLine(210, 100, 210, 217, FrameColor);
tft.drawLine(210, 180, 210, 217, FrameColor);
tft.drawLine(195, 100, 195, 180, FrameColor);
tft.drawLine(248, 30, 248, 0, FrameColor);
tft.drawLine(0, 160, 210, 160, FrameColor);
tft.drawLine(0, 160, 195, 160, FrameColor);
tft.drawLine(0, 180, 320, 180, FrameColor);
tft.drawLine(0, 217, 320, 217, FrameColor);
tft.drawLine(30, 30, 30, 0, FrameColor);
tft.drawLine(66, 30, 66, 0, FrameColor);
tft.drawLine(162, 30, 162, 0, FrameColor);
tft.drawLine(16, 114, 202, 114, ActiveColor);
tft.drawLine(16, 114, 189, 114, ActiveColor);
if (!showmodulation) tft.drawLine(16, 143, 202, 143, GreyoutColor); else tft.drawLine(16, 143, 202, 143, ActiveColor);
for (byte segments = 0; segments < 94; segments++) {
if (!showmodulation) tft.drawLine(16, 143, 189, 143, GreyoutColor); else tft.drawLine(16, 143, 189, 143, ActiveColor);
for (byte segments = 0; segments < 93; segments++) {
if (segments > 54) {
if (((segments - 53) % 10) == 0) {
tft.fillRect(16 + (2 * segments), 112, 2, 2, BarSignificantColor);
if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, BarSignificantColor);
tft.fillRect(22 + (2 * segments), 112, 2, 2, BarSignificantColor);
if (!showmodulation) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarSignificantColor);
}
} else {
if (((segments + 1) % 6) == 0) {
tft.fillRect(16 + (2 * segments), 112, 2, 2, BarInsignificantColor);
if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, BarInsignificantColor);
tft.fillRect(22 + (2 * segments), 112, 2, 2, BarInsignificantColor);
if (!showmodulation) tft.fillRect(22 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(22 + (2 * segments), 141, 2, 2, BarInsignificantColor);
}
}
}
if (usesquelch || autosquelch) tftPrint(-1, "SQ:", 200, 145, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "US:", 261, 145, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "MP:", 261, 163, ActiveColor, ActiveColorSmooth, 16);
@@ -3019,7 +3022,7 @@ void BuildDisplay() {
tftPrint(-1, "7", 96, 115, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "9", 120, 115, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "+10", 134, 115, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "+30", 174, 115, ActiveColor, ActiveColorSmooth, 16);
tftPrint(-1, "+30", 168, 115, ActiveColor, ActiveColorSmooth, 16);
if (!showmodulation) {
tftPrint(0, "M", 7, 128, GreyoutColor, BackgroundColor, 16);