Skip to content

Commit 877a835

Browse files
soloskysolosky
committed
Add about information
1 parent ba32281 commit 877a835

File tree

20 files changed

+1362
-1289
lines changed

20 files changed

+1362
-1289
lines changed

‎fw/application/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ SRC_FILES += \
293293
$(PROJ_DIR)/app/settings/scene/settings_scene_oled_contrast.c \
294294
$(PROJ_DIR)/app/settings/scene/settings_scene_language.c \
295295
$(PROJ_DIR)/app/settings/scene/settings_scene_storage.c \
296+
$(PROJ_DIR)/app/settings/scene/settings_scene_about.c \
296297
$(PROJ_DIR)/i18n/en_US.c \
297298
$(PROJ_DIR)/i18n/zh_Hans.c \
298299
$(PROJ_DIR)/i18n/zh_TW.c \
@@ -729,6 +730,7 @@ full: settingsgen
729730
gen:
730731
python3 ../scripts/amiibo_db_gen.py
731732
python3 ../scripts/i18n_gen.py
733+
python3 ../scripts/font_data_gen.py
732734
python3 ../scripts/resource_gen.py
733735

734736
flash_ocd: default

‎fw/application/src/app/settings/scene/settings_scene_about.c‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#include "app_settings.h"
2+
#include "i18n/language.h"
3+
#include "mini_app_launcher.h"
4+
#include "nrf_pwr_mgmt.h"
5+
#include "settings.h"
6+
#include "settings_scene.h"
7+
#include "utils2.h"
8+
#include "version2.h"
9+
#include "mui_icons.h"
10+
11+
12+
static void settings_scene_about_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
13+
mui_list_item_t *p_item) {
14+
app_settings_t *app = p_list_view->user_data;
15+
if(p_item->icon == ICON_BACK){
16+
mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
17+
}
18+
}
19+
20+
void settings_scene_about_on_enter(void *user_data) {
21+
22+
app_settings_t *app = user_data;
23+
24+
mui_list_view_add_item(app->p_list_view, ICON_FILE, _T(APP_SET_ABOUT_OPEN_SOURCE_PROJECT), NULL_USER_DATA);
25+
mui_list_view_add_item(app->p_list_view, ICON_FILE, _T(APP_SET_ABOUT_LGPL_LICENSE), NULL_USER_DATA);
26+
mui_list_view_add_item(app->p_list_view, ICON_FILE, "github.com/solosky/pixl.js", NULL_USER_DATA);
27+
mui_list_view_add_item(app->p_list_view, ICON_BACK, getLangString(_L_BACK), NULL_USER_DATA);
28+
29+
mui_list_view_set_selected_cb(app->p_list_view, settings_scene_about_list_view_on_selected);
30+
mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MAIN);
31+
}
32+
33+
void settings_scene_about_on_exit(void *user_data) {
34+
app_settings_t *app = user_data;
35+
mui_list_view_clear_items(app->p_list_view);
36+
mui_list_view_set_selected_cb(app->p_list_view, NULL);
37+
}

‎fw/application/src/app/settings/scene/settings_scene_config.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ ADD_SCENE(settings, lcd_backlight, LCD_BACKLIGHT)
88
ADD_SCENE(settings, oled_contrast, OLED_CONTRAST)
99
#endif
1010
ADD_SCENE(settings, language, LANGUAGE)
11-
ADD_SCENE(settings, storage, STORAGE)
11+
ADD_SCENE(settings, storage, STORAGE)
12+
ADD_SCENE(settings, about, ABOUT)

‎fw/application/src/app/settings/scene/settings_scene_main.c‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ enum settings_main_menu_t {
2222
SETTINGS_MAIN_MENU_DFU,
2323
SETTINGS_MAIN_MENU_REBOOT,
2424
SETTINGS_MAIN_MENU_RESET_DEFAULT,
25+
SETTINGS_MAIN_MENU_ABOUT,
2526
SETTINGS_MAIN_MENU_EXIT
2627
};
2728

@@ -128,9 +129,11 @@ static void settings_scene_main_list_view_on_selected(mui_list_view_event_t even
128129
mui_msg_box_set_event_cb(app->p_msg_box, settings_scene_main_msg_box_reset_settings_cb);
129130

130131
mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MSG_BOX);
131-
}
132+
} break;
132133

133-
break;
134+
case SETTINGS_MAIN_MENU_ABOUT: {
135+
mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, SETTINGS_SCENE_ABOUT);
136+
} break;
134137
}
135138
}
136139

@@ -207,6 +210,8 @@ static void settings_scene_main_reload(void *user_data) {
207210
mui_list_view_add_item(app->p_list_view, 0xe1ce, _T(APP_SET_RESET_DEFAULT),
208211
(void *)SETTINGS_MAIN_MENU_RESET_DEFAULT);
209212

213+
mui_list_view_add_item(app->p_list_view, 0xe1cf, _T(APP_SET_ABOUT), (void *)SETTINGS_MAIN_MENU_ABOUT);
214+
210215
mui_list_view_add_item(app->p_list_view, 0xe069, _T(BACK_TO_MAIN_MENU), (void *)SETTINGS_MAIN_MENU_EXIT);
211216

212217
mui_list_view_set_focus(app->p_list_view, foucs_index);

‎fw/application/src/i18n/de_DE.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_de_DE[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Standardeinstellungen",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Einstellungen zurückgesetzt!",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Auf Standardeinstellungen zurücksetzen?",
34+
[_L_APP_SET_ABOUT] = "",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
3437
[_L_15S] = "15 Sekunden",
3538
[_L_30S] = "30 Sekunden",
3639
[_L_45S] = "45 Sekunden",

‎fw/application/src/i18n/en_US.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_en_US[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Reset Default Setting",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Reset Success!",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Confirm Reset Settings?",
34+
[_L_APP_SET_ABOUT] = "About Device",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "Open Source Project",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "LGPL2.0 License",
3437
[_L_15S] = "15 Seconds",
3538
[_L_30S] = "30 Seconds",
3639
[_L_45S] = "45 Seconds",

‎fw/application/src/i18n/es_ES.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_es_ES[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Restablecer config.",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "¡Configuración Restablecida!",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "¿Confirma Restablecer\nConfig.?",
34+
[_L_APP_SET_ABOUT] = "",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
3437
[_L_15S] = "15 segundos",
3538
[_L_30S] = "30 segundos",
3639
[_L_45S] = "45 segundos",

‎fw/application/src/i18n/fr_FR.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_fr_FR[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Rétablir les Paramètres par Défaut",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Réinitialiser les Paramètres Par Défaut",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
34+
[_L_APP_SET_ABOUT] = "",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
3437
[_L_15S] = "15 sec.",
3538
[_L_30S] = "30 sec.",
3639
[_L_45S] = "45 sec.",

‎fw/application/src/i18n/hu_HU.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_hu_HU[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Alapért. Beállítás Visszaállítása",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Alapért. Beállítások Visszaállítása",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
34+
[_L_APP_SET_ABOUT] = "",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
3437
[_L_15S] = "15 sec.",
3538
[_L_30S] = "30 sec.",
3639
[_L_45S] = "45 sec.",

‎fw/application/src/i18n/it_IT.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ const char * const lang_it_IT[_L_COUNT] = {
3131
[_L_APP_SET_RESET_DEFAULT] = "Ripristina impostazioni predefinite",
3232
[_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Ripristino riuscito!",
3333
[_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Conferma il ripristino delle impostazioni?",
34+
[_L_APP_SET_ABOUT] = "",
35+
[_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
36+
[_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
3437
[_L_15S] = "15 secondi",
3538
[_L_30S] = "30 secondi",
3639
[_L_45S] = "45 secondi",

0 commit comments

Comments
 (0)