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

PortaPack: Consolidate color palette.

Browse Source
This commit is contained in:
Jared Boone
2018-12-31 14:07:39 -08:00
parent 53b1250061
commit c09f76a92c
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/common/ui_portapack.c
View File

@ -262,6 +262,9 @@ static ui_color_t portapack_color_rgb(
return result; return result;
} }
static const ui_color_t color_background = { 0x001f };
static const ui_color_t color_foreground = { 0xffff };
#define ARRAY_SIZEOF(x) (sizeof(x) / sizeof(x[0])) #define ARRAY_SIZEOF(x) (sizeof(x) / sizeof(x[0]))
static void portapack_sleep_milliseconds(const uint32_t milliseconds) { static void portapack_sleep_milliseconds(const uint32_t milliseconds) {
@ -787,9 +790,6 @@ static ui_point_t portapack_lcd_draw_int(const ui_point_t point, uint64_t value,
}; };
ui_point_t point_next = point_done; ui_point_t point_next = point_done;
const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff);
const ui_color_t color_foreground = portapack_color_rgb(0xff, 0xff, 0xff);
for(size_t i=0; i<field_width; i++) { for(size_t i=0; i<field_width; i++) {
const char c = ((i == 0) || (value != 0)) ? ('0' + value % 10) : ' '; const char c = ((i == 0) || (value != 0)) ? ('0' + value % 10) : ' ';
value /= 10; value /= 10;
@ -803,9 +803,6 @@ static ui_point_t portapack_lcd_draw_int(const ui_point_t point, uint64_t value,
} }
static ui_point_t portapack_lcd_draw_string(ui_point_t point, const char* s) { static ui_point_t portapack_lcd_draw_string(ui_point_t point, const char* s) {
const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff);
const ui_color_t color_foreground = portapack_color_rgb(0xff, 0xff, 0xff);
while(*s) { while(*s) {
const char c = *(s++); const char c = *(s++);
const ui_bitmap_t glyph = portapack_font_glyph(&font_fixed_8x16, c); const ui_bitmap_t glyph = portapack_font_glyph(&font_fixed_8x16, c);
@ -818,7 +815,6 @@ static ui_point_t portapack_lcd_draw_string(ui_point_t point, const char* s) {
static void portapack_lcd_clear() { static void portapack_lcd_clear() {
const ui_rect_t rect_screen = { { 0, 0 }, { 240, 320 } }; const ui_rect_t rect_screen = { { 0, 0 }, { 240, 320 } };
const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff);
portapack_lcd_fill_rectangle(rect_screen, color_background); portapack_lcd_fill_rectangle(rect_screen, color_background);
} }
@ -863,9 +859,6 @@ static void portapack_draw_radio_path(
const draw_list_t* const draw_list, const draw_list_t* const draw_list,
const size_t count const size_t count
) { ) {
const ui_color_t color_background = portapack_color_rgb(0x00, 0x00, 0xff);
const ui_color_t color_foreground = portapack_color_rgb(0xff, 0xff, 0xff);
for( size_t i=0; i<count; i++ ) { for( size_t i=0; i<count; i++ ) {
portapack_draw_bitmap(draw_list[i].point, *draw_list[i].bitmap, color_foreground, color_background); portapack_draw_bitmap(draw_list[i].point, *draw_list[i].bitmap, color_foreground, color_background);
} }
@ -888,9 +881,6 @@ 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 - 20, 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_foreground = portapack_color_rgb(0xff, 0xff, 0xff);
uint64_t value = frequency; uint64_t value = frequency;
for(int i=0; i<10; i++) { for(int i=0; i<10; i++) {
const char c = '0' + value % 10; const char c = '0' + value % 10;