m5/meshtastic-device-ui
0
0
Fork 0
mirror of https://github.com/m5stack/meshtastic-device-ui.git synced 2026-05-20 11:51:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

re-generate new font with proper Greek uni-code range. Added Greek to language menu.

Browse Source
This commit is contained in:
mverch67
2025-02-07 14:31:39 +01:00
parent 9c7786a7b4
commit 8c3fc35712
10 changed files with 18712 additions and 15879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generated/ui_320x240/fonts.h
+3 -3
View File
@@ -3,10 +3,10 @@
#include "lvgl.h"
extern const lv_font_t ui_font_montserrat_20;
extern const lv_font_t ui_font_montserrat_16;
extern const lv_font_t ui_font_montserrat_14;
extern const lv_font_t ui_font_montserrat_12;
extern const lv_font_t ui_font_montserrat_14;
extern const lv_font_t ui_font_montserrat_16;
extern const lv_font_t ui_font_montserrat_20;
#endif /*EEZ_LVGL_UI_FONTS_H*/
generated/ui_320x240/screens.c
+28 -17
View File
@@ -140,6 +140,8 @@ void create_screen_boot_screen() {
}
}
}
tick_screen_boot_screen();
}
void tick_screen_boot_screen() {
@@ -634,7 +636,7 @@ void create_screen_main_screen() {
lv_obj_set_pos(obj, LV_PCT(12), LV_PCT(10));
lv_obj_set_size(obj, LV_PCT(88), LV_PCT(90));
lv_obj_add_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN|LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN_HOR|LV_OBJ_FLAG_SCROLL_CHAIN_VER);
lv_obj_clear_flag(obj, LV_OBJ_FLAG_GESTURE_BUBBLE|LV_OBJ_FLAG_SCROLL_CHAIN_HOR|LV_OBJ_FLAG_SCROLL_CHAIN_VER);
lv_obj_set_scrollbar_mode(obj, LV_SCROLLBAR_MODE_AUTO);
lv_obj_set_scroll_dir(obj, LV_DIR_VER);
add_style_panel_style(obj);
@@ -3752,7 +3754,7 @@ void create_screen_main_screen() {
objects.settings_language_dropdown = obj;
lv_obj_set_pos(obj, 0, 0);
lv_obj_set_size(obj, 150, 30);
lv_dropdown_set_options(obj, "English\nDeutsch\nEspañol\nFrançais\nItaliano\nNederlands\nNorsk\nPolski\nPortuguês\nРусский\nSlovenščina\nSrpski\nSuomalainen\nSvenska\nTürkçe");
lv_dropdown_set_options(obj, "English\nDeutsch\nελληνικά\nEspañol\nFrançais\nItaliano\nNederlands\nNorsk\nPolski\nPortuguês\nРусский\nSlovenščina\nSrpski\nSuomalainen\nSvenska\nTürkçe");
add_style_drop_down_style(obj);
lv_obj_set_style_align(obj, LV_ALIGN_TOP_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_border_color(obj, lv_color_hex(0xffe0e0e0), LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -5763,6 +5765,8 @@ void create_screen_main_screen() {
lv_obj_set_style_max_width(obj, 600, LV_PART_MAIN | LV_STATE_DEFAULT);
}
}
tick_screen_main_screen();
}
void tick_screen_main_screen() {
@@ -5808,6 +5812,8 @@ void create_screen_blank_screen() {
lv_obj_set_style_radius(obj, 0, LV_PART_MAIN | LV_STATE_PRESSED);
}
}
tick_screen_blank_screen();
}
void tick_screen_blank_screen() {
@@ -5885,6 +5891,8 @@ void create_screen_lock_screen() {
lv_obj_set_style_text_color(obj, lv_color_hex(0xffe0e0e0), LV_PART_MAIN | LV_STATE_DEFAULT);
}
}
tick_screen_lock_screen();
}
void tick_screen_lock_screen() {
@@ -5897,6 +5905,8 @@ void create_screen_calibration_screen() {
lv_obj_set_size(obj, 320, 240);
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_set_style_bg_color(obj, lv_color_hex(0xff67ea94), LV_PART_MAIN | LV_STATE_DEFAULT);
tick_screen_calibration_screen();
}
void tick_screen_calibration_screen() {
@@ -5980,6 +5990,22 @@ void tick_user_widget_ok_cancel_widget(int startWidgetIndex) {
}
typedef void (*tick_screen_func_t)();
tick_screen_func_t tick_screen_funcs[] = {
tick_screen_boot_screen,
tick_screen_main_screen,
tick_screen_blank_screen,
tick_screen_lock_screen,
tick_screen_calibration_screen,
};
void tick_screen(int screen_index) {
tick_screen_funcs[screen_index]();
}
void tick_screen_by_id(enum ScreensEnum screenId) {
tick_screen_funcs[screenId - 1]();
}
void create_screens() {
lv_disp_t *dispp = lv_disp_get_default();
lv_theme_t *theme = lv_theme_default_init(dispp, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), false, LV_FONT_DEFAULT);
@@ -5991,18 +6017,3 @@ void create_screens() {
create_screen_lock_screen();
create_screen_calibration_screen();
}
typedef void (*tick_screen_func_t)();
tick_screen_func_t tick_screen_funcs[] = {
tick_screen_boot_screen,
tick_screen_main_screen,
tick_screen_blank_screen,
tick_screen_lock_screen,
tick_screen_calibration_screen,
0,
};
void tick_screen(int screen_index) {
tick_screen_funcs[screen_index]();
}
generated/ui_320x240/screens.h
+3 -1
View File
@@ -538,8 +538,10 @@ void tick_screen_calibration_screen();
void create_user_widget_ok_cancel_widget(lv_obj_t *parent_obj, int startWidgetIndex);
void tick_user_widget_ok_cancel_widget(int startWidgetIndex);
void create_screens();
void tick_screen_by_id(enum ScreensEnum screenId);
void tick_screen(int screen_index);
void create_screens();
#ifdef __cplusplus
generated/ui_320x240/styles.c
+1
View File
@@ -9,6 +9,7 @@ lv_style_t style_btn_pressed;
#if 1 // see Themes.cpp
#include "ui.h"
#include "screens.h"
//
generated/ui_320x240/ui_font_montserrat_12.c
+3506 -2978
View File
File diff suppressed because it is too large Load Diff
generated/ui_320x240/ui_font_montserrat_14.c
+4142 -3541
View File
File diff suppressed because it is too large Load Diff
generated/ui_320x240/ui_font_montserrat_16.c
+4887 -4152
View File
File diff suppressed because it is too large Load Diff
generated/ui_320x240/ui_font_montserrat_20.c
+6105 -5151
View File
File diff suppressed because it is too large Load Diff
locale/lv_i18n.c
+1 -1
View File
@@ -2641,4 +2641,4 @@ const char *lv_i18n_get_current_locale(void)
if (!current_lang)
return NULL;
return current_lang->locale_name;
}
}
source/graphics/TFT/TFTView_320x240.cpp
+36 -35
View File
@@ -2503,34 +2503,35 @@ uint32_t TFTView_320x240::language2val(meshtastic_Language lang)
case meshtastic_Language_GERMAN:
return 1;
case meshtastic_Language_ITALIAN:
return 4;
return 5;
case meshtastic_Language_PORTUGUESE:
return 8;
return 9;
case meshtastic_Language_SPANISH:
return 2;
case meshtastic_Language_SWEDISH:
return 13;
case meshtastic_Language_FINNISH:
return 12;
case meshtastic_Language_POLISH:
return 7;
case meshtastic_Language_TURKISH:
return 14;
case meshtastic_Language_FINNISH:
return 13;
case meshtastic_Language_POLISH:
return 8;
case meshtastic_Language_TURKISH:
return 15;
case meshtastic_Language_SERBIAN:
return 11;
return 12;
case meshtastic_Language_RUSSIAN:
return 9;
case meshtastic_Language_DUTCH:
return 5;
case meshtastic_Language_NORWEGIAN:
return 6;
case meshtastic_Language_SLOVENIAN:
return 10;
case meshtastic_Language_DUTCH:
return 6;
case meshtastic_Language_GREEK:
return 4;
case meshtastic_Language_NORWEGIAN:
return 7;
case meshtastic_Language_SLOVENIAN:
return 11;
case meshtastic_Language_SIMPLIFIED_CHINESE:
return 16;
case meshtastic_Language_TRADITIONAL_CHINESE:
return 17;
case meshtastic_Language_GREEK:
default:
ILOG_WARN("unknown language uiconfig: %d", lang);
}
@@ -2549,31 +2550,31 @@ meshtastic_Language TFTView_320x240::val2language(uint32_t val)
return meshtastic_Language_FRENCH;
case 1:
return meshtastic_Language_GERMAN;
case 4:
case 5:
return meshtastic_Language_ITALIAN;
case 8:
case 9:
return meshtastic_Language_PORTUGUESE;
case 2:
return meshtastic_Language_SPANISH;
case 13:
return meshtastic_Language_SWEDISH;
case 12:
return meshtastic_Language_FINNISH;
case 7:
return meshtastic_Language_POLISH;
case 14:
return meshtastic_Language_SWEDISH;
case 13:
return meshtastic_Language_FINNISH;
case 8:
return meshtastic_Language_POLISH;
case 15:
return meshtastic_Language_TURKISH;
case 11:
case 12:
return meshtastic_Language_SERBIAN;
case 9:
return meshtastic_Language_RUSSIAN;
case 5:
return meshtastic_Language_DUTCH;
// case 4:
// return meshtastic_Language_GREEK;
case 6:
return meshtastic_Language_NORWEGIAN;
case 10:
return meshtastic_Language_RUSSIAN;
case 6:
return meshtastic_Language_DUTCH;
case 4:
return meshtastic_Language_GREEK;
case 7:
return meshtastic_Language_NORWEGIAN;
case 11:
return meshtastic_Language_SLOVENIAN;
case 16:
return meshtastic_Language_SIMPLIFIED_CHINESE;
@@ -2644,12 +2645,12 @@ void TFTView_320x240::setLocale(meshtastic_Language lang)
locale = "ru_RU.UTF-8";
break;
case meshtastic_Language_GREEK:
lv_i18n_set_locale("gr");
lv_i18n_set_locale("el");
locale = "el_GR.UTF-8";
break;
case meshtastic_Language_NORWEGIAN:
lv_i18n_set_locale("no");
locale = "el_GR.UTF-8";
locale = "no_NO.UTF-8";
break;
case meshtastic_Language_SLOVENIAN:
lv_i18n_set_locale("sl");