From 739b8d67588f1d4106b4390529562422dc88dbfc Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 22 Oct 2019 10:36:52 +0200 Subject: [PATCH] Fonts refactoring (no more font list in libopenui) --- radio/src/gui/colorlcd/lcd.h | 1 - radio/src/targets/horus/libopenui_config.h | 2 -- radio/src/targets/nv14/libopenui_config.h | 2 -- 3 files changed, 5 deletions(-) diff --git a/radio/src/gui/colorlcd/lcd.h b/radio/src/gui/colorlcd/lcd.h index 74ca0295e..a87eb77ce 100644 --- a/radio/src/gui/colorlcd/lcd.h +++ b/radio/src/gui/colorlcd/lcd.h @@ -55,7 +55,6 @@ /* telemetry flags */ #define NO_UNIT 0x40 -#define TIMEBLINK 0x1000 #define TIMEHOUR 0x2000 #define EXPANDED 0x2000 #define VERTICAL 0x4000 diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index 287f579ab..57696d8cb 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -143,8 +143,6 @@ enum FontIndex FONTS_COUNT }; -#define FONT(xx) (FONT_ ## xx ## _INDEX << 8) - constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 120; constexpr coord_t INPUT_EDIT_CURVE_WIDTH = 158; constexpr coord_t INPUT_EDIT_CURVE_HEIGHT = LCD_H - MENU_HEADER_HEIGHT; diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index 026722503..1a08b0d5f 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -141,8 +141,6 @@ enum FontIndex FONTS_COUNT }; -#define FONT(xx) (FONT_ ## xx ## _INDEX << 8) - constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 80; constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W; constexpr coord_t INPUT_EDIT_CURVE_HEIGHT = 158;