Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PortaPack: Clean up tuning frequency rendering, add spaces per 3-digit group for readability.

Browse Source
This commit is contained in:
Jared Boone
2018-12-31 10:36:17 -08:00
parent f60b2479fb
commit 494f203f8d
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firmware/common/ui_portapack.c
View File

@ -876,35 +876,31 @@ static void portapack_ui_init() {
} }
static void portapack_ui_set_frequency(uint64_t frequency) { static void portapack_ui_set_frequency(uint64_t frequency) {
ui_point_t point = { 240 - 24, 16 }; ui_point_t point = { 240 - 20, 16 };
const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff); const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff);
const ui_color_t color_foreground = portapack_color_rgb(0xff, 0xff, 0xff); const ui_color_t color_foreground = portapack_color_rgb(0xff, 0xff, 0xff);
uint64_t value = frequency; uint64_t value = frequency;
for(int i=0; i<6; i++) { for(int i=0; i<10; i++) {
const char c = '0' + value % 10; const char c = '0' + value % 10;
value /= 10;
const ui_bitmap_t glyph = portapack_font_glyph(&font_fixed_16x14, c); const ui_font_t* const font = (i > 5) ? &font_fixed_24x19 : &font_fixed_16x14;
const ui_bitmap_t glyph = portapack_font_glyph(font, c);
point.x -= glyph.size.width; point.x -= glyph.size.width;
portapack_draw_bitmap(point, glyph, color_foreground, color_background); if( (i==3) || (i==6) || (i==9) ) {
} point.x -= 4;
}
for(int i=0; i<4; i++) { if( (i>=6) && (value == 0) ) {
if( (i>0) && (value == 0) ) { /* Blank out leading zeros. */
const ui_bitmap_t glyph = portapack_font_glyph(&font_fixed_24x19, '0');
point.x -= glyph.size.width;
const ui_rect_t rect = { point, glyph.size }; const ui_rect_t rect = { point, glyph.size };
portapack_lcd_fill_rectangle(rect, color_background); portapack_lcd_fill_rectangle(rect, color_background);
} else { } else {
const char c = '0' + value % 10;
value /= 10;
const ui_bitmap_t glyph = portapack_font_glyph(&font_fixed_24x19, c);
point.x -= glyph.size.width;
portapack_draw_bitmap(point, glyph, color_foreground, color_background); portapack_draw_bitmap(point, glyph, color_foreground, color_background);
} }
value /= 10;
} }
} }