ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix my tupo on frequency string

Browse source
This commit is contained in:
ВшЫдщкв 2020-01-26 09:09:11 +03:00
parent 5a4d02208f
commit d3f4ef5dc1
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
plot.c
View file

@ -1841,31 +1841,29 @@ frequency_string_short(char *b, size_t len, int32_t freq, char prefix)
void void
draw_frequencies(void) draw_frequencies(void)
{ {
char buf1[24];buf1[0]=' '; char buf1[24];buf1[0]=' ';
char buf2[24]; char buf2[24];buf2[0]=0;
if ((domain_mode & DOMAIN_MODE) == DOMAIN_FREQ) { if ((domain_mode & DOMAIN_MODE) == DOMAIN_FREQ) {
if (frequency0 < frequency1) { if (frequency0 < frequency1) {
frequency_string(buf1+1, sizeof(buf1)-1, frequency0, "START "); frequency_string(buf1+1, sizeof(buf1)-1, frequency0, "START ");
frequency_string(buf2, sizeof buf2, frequency1, "STOP "); frequency_string(buf2, sizeof buf2, frequency1, "STOP ");
} else if (frequency0 > frequency1) { } else if (frequency0 > frequency1) {
frequency_string(buf1+1, sizeof(buf1)-1, frequency0/2 + frequency1/2, "CENTER "); frequency_string(buf1+1, sizeof(buf1)-1, frequency0/2 + frequency1/2, "CENTER ");
frequency_string(buf2, sizeof buf2, frequency0 - frequency1, "SPAN "); frequency_string(buf2, sizeof buf2, frequency0 - frequency1, "SPAN ");
} else { } else {
frequency_string(buf1+1, sizeof(buf1)-1, frequency0, "CW "); frequency_string(buf1+1, sizeof(buf1)-1, frequency0, "CW ");
} }
} else {
} else { chsnprintf(buf1+1, sizeof(buf1)-1, "START 0s");
chsnprintf(buf1+1, sizeof(buf1)-1, "START 0s"); chsnprintf(buf2, sizeof buf2, "%s%dns (%.2fm)", "STOP ", (uint16_t)(time_of_index(POINTS_COUNT-1) * 1e9), distance_of_index(POINTS_COUNT-1));
chsnprintf(buf2, sizeof buf2, "%s%dns (%.2fm)", "STOP ", (uint16_t)(time_of_index(POINTS_COUNT-1) * 1e9), distance_of_index(POINTS_COUNT-1)); }
} setForegroundColor(DEFAULT_FG_COLOR);
setForegroundColor(DEFAULT_FG_COLOR); setBackgroundColor(DEFAULT_BG_COLOR);
setBackgroundColor(DEFAULT_BG_COLOR); ili9341_fill(0, 232, 320, 8, DEFAULT_BG_COLOR);
ili9341_fill(0, 232, 320, 8, DEFAULT_BG_COLOR); if (uistat.lever_mode == LM_SPAN || uistat.lever_mode == LM_CENTER)
if (uistat.lever_mode == LM_SPAN || uistat.lever_mode == LM_CENTER) buf1[0] = S_SARROW[0];
buf1[0] = S_SARROW[0]; ili9341_drawstring(buf1, OFFSETX, 232);
ili9341_drawstring(buf1, OFFSETX, 232); ili9341_drawstring(buf2, 205, 232);
ili9341_drawstring(buf2, 205, 232);
} }
void void