Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.8.6 #136

Merged
merged 16 commits into from
Nov 10, 2023
Merged

2.8.6 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
678bb57
add Spanish support (partial) #125
solosky Oct 30, 2023
181cc50
using wqy bdf from u8g2
solosky Nov 5, 2023
72bb0ce
Merge branch 'spanish' into develop
solosky Nov 5, 2023
08517e2
update transalations
solosky Nov 5, 2023
2c4a42e
update spanlish transalation
solosky Nov 6, 2023
59c82a7
Merge branch 'main' into develop
solosky Nov 6, 2023
cf360f5
Zelda and Ganondorf https://github.com/N3evin/AmiiboAPI/pull/145
jumkey Aug 22, 2023
2114f00
Fix issue for Jikkyou Powerful Pro Baseball https://github.com/N3evin…
jumkey Nov 8, 2023
9de9ea9
Merge pull request #131 from jumkey/hotfix/amiidb
solosky Nov 8, 2023
46ad43d
amiidb update
James-Makoto Nov 9, 2023
6bb1506
update
James-Makoto Nov 9, 2023
c6b6255
update
James-Makoto Nov 9, 2023
34aabed
Merge pull request #133 from James-Makoto/pr
solosky Nov 9, 2023
f966c8d
rename nrf5
jumkey Nov 8, 2023
aa7de5e
fix
jumkey Nov 10, 2023
8988c2e
Merge pull request #134 from jumkey/patch-1
solosky Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ root@b10d54636088:/builds/pixl.js# git submodule update --init --recursive
root@b10d54636088:/builds/pixl.js# cd fw && make all
root@b10d54636088:/builds/pixl.js/fw# cd application && make full ota
```
构建出来的固件在 fw/_build/pixjs_all.hex，ota（无线跟新包）在fw/_build/pixjs_ota_vXXXX.zip
构建出来的固件在 fw/_build/pixjs_all.hex，ota（无线更新包）在fw/_build/pixjs_ota_vXXXX.zip

## 固件烧写

下载最新版本的固件zip包，使用JLink或者DAPLink烧写pixjs_all.hex即可。
烧写完毕后，后续固件更新可以使用OTA的方式更新。
也可以用OpenOCD烧录。
```
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf51 mass_erase" -c "program pixjs_all.hex verify" -c "program nrf52832_xxaa.hex verify" -c exit
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf5 mass_erase" -c "program pixjs_all.hex verify" -c "program nrf52832_xxaa.hex verify" -c exit
```

## OTA更新
Expand Down
5 changes: 3 additions & 2 deletions fw/application/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ SRC_FILES += \
$(PROJ_DIR)/i18n/en_US.c \
$(PROJ_DIR)/i18n/zh_Hans.c \
$(PROJ_DIR)/i18n/zh_TW.c \
$(PROJ_DIR)/i18n/es_CO.c \
$(PROJ_DIR)/i18n/language.c \
$(PROJ_DIR)/hal/hal_nfc_t2t.c \
$(PROJ_DIR)/amiidb/db_amiibo.c \
Expand Down Expand Up @@ -669,10 +670,10 @@ flash_openocd:
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit

flash_openocd_all:
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf51 mass_erase" -c "program $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex verify" -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf5 mass_erase" -c "program $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex verify" -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit

reset_openocd:
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -c "init" -c "reset" -c "exit"

erase_openocd:
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf51 mass_erase" -c "reset" -c exit
openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf5 mass_erase" -c "reset" -c exit
12 changes: 6 additions & 6 deletions fw/application/src/amiidb/db_amiibo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const db_amiibo_t amiibo_list[] = {
{0x00030000, 0x00020002, "Yoshi", "耀西"},
{0x06400100, 0x001e0002, "Olimar", "欧力玛"},
{0x06420000, 0x035f1102, "Pikmin", "皮克敏"},
{0x01880000, 0x02410502, "Mabel", "Mabel"},
{0x01880000, 0x02410502, "Mabel", "绢儿"},
{0x01940001, 0x00aa0502, "[AC] 103 - Kicks", "[AC] 103 - Kicks"},
{0x019c0001, 0x01730502, "[AC] 304 - Phineas", "[AC] 304 - Phineas"},
{0x01800000, 0x00080002, "Villager", "村民"},
Expand Down Expand Up @@ -209,10 +209,10 @@ const db_amiibo_t amiibo_list[] = {
{0x33800000, 0x03781402, "Solaire of Astora", "太阳骑士"},
{0x38000001, 0x03931702, "Pawapuro", "Pawapuro"},
{0x38010001, 0x03941702, "Ikari", "Ikari"},
{0x38020001, 0x03951702, "Daijobu", "Daijobu"},
{0x38020001, 0x03951702, "Yabe", "Yabe"},
{0x38030001, 0x03961702, "Hayakawa", "Hayakawa"},
{0x38040001, 0x03971702, "Yabe", "Yabe"},
{0x38050001, 0x03981702, "Ganda", "Ganda"},
{0x38040001, 0x03971702, "Ganda", "Ganda"},
{0x38050001, 0x03981702, "Daijobu", "Daijobu"},
{0x1d000001, 0x025c0d02, "Shadow Mewtwo", "Shadow Mewtwo"},
{0x1d010000, 0x03750d02, "Detective Pikachu", "名侦探皮卡丘"},
{0x000a0003, 0x03a0ff02, "Toad - Power Up Band", "奇诺比奥 - 能量手环"},
Expand Down Expand Up @@ -734,8 +734,8 @@ const db_amiibo_t amiibo_list[] = {
{0x018a0000, 0x02450502, "Reese", "Reese"},
{0x01840000, 0x024d0502, "Timmy & Tommy", "Timmy & Tommy"},
{0x01810000, 0x024b0502, "Summertime Isabelle", "Summertime Isabelle"},
{0x01000000, 0x041a0902, "Ganondorf - Tears of the Kingdom", "加侬多夫 - 王国之泪"},
{0x01000000, 0x04190902, "Zelda - Tears of the Kingdom", "塞尔达 - 王国之泪"},
{0x01020100, 0x041a0902, "Ganondorf - Tears of the Kingdom", "加侬多夫 - 王国之泪"},
{0x01010000, 0x04190902, "Zelda - Tears of the Kingdom", "塞尔达 - 王国之泪"},
{0x00000000, 0x02390602, "8-Bit Mario Modern Color", "像素马力欧 - 现代配色"},
{0x00000003, 0x039bff02, "Mario - Power Up Band", "马力欧 - 能量手环"},
{0x00000003, 0x0430ff02, "Golden - Power Up Band", "金色 - 能量手环"},
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/amiidb/db_game.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const db_game_t game_list[] = {
{23, 0, "Kirby's Return to Dream Land DELUXE", "星之卡比：重返梦幻岛豪华版", 1, 5},
{24, 0, "Kirby: Star Allies", "星之卡比：新星同盟", 1, 5},
{25, 0, "Little Nightmares Complete Edition", "小小梦魇完全版", 1, 1},
{26, 0, "Mario Kart 8 Deluxe", "马里奥赛车8豪华版", 60, 29},
{26, 0, "Mario Kart 8 Deluxe", "马里奥赛车8豪华版", 60, 31},
{27, 0, "Mario + Rabbids Kingdom Battle", "马里奥+疯兔:王国之战", 1, 4},
{28, 0, "Megabyte Punch", "兆字节重击", 1, 1},
{29, 0, "Mega Man 11", "洛克人11", 1, 1},
Expand Down
10 changes: 6 additions & 4 deletions fw/application/src/amiidb/db_link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const db_link_t link_list[] = {
{1, 0x01410000, 0x035c0902, "Dragon Bone Boko-related equipment/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"},
{1, 0x01050000, 0x03580902, "Rudania's Divine Helm Set/Paraglider Skin Material/Boulder Breaker/Diamond", "鲁达尼亚*神兽兵装/滑翔伞皮肤布料/劈石剑/钻石"},
{1, 0x01020100, 0x001b0002, "Twilight Sword/Rupee/Gem/Star Fragment Bomb", "黄昏剑/卢比/宝石/星星碎片炸药桶"},
{1, 0x01000000, 0x041a0902, "Gerudo-King Fabric", "格鲁德王滑翔伞布料"},
{1, 0x01400000, 0x03550902, "Guardian Weapons/Shields/Spears/Core/Treasure/Arrow", "守护者枪 盾 剑/古代兵装 核心/宝石 箭"},
{1, 0x01020100, 0x041a0902, "Gerudo-King Fabric", "沼气之枪/滑翔伞皮肤布料"},
{1, 0x01400000, 0x03550902, "Dragonbone Boko related gear/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"},
{1, 0x01000000, 0x00040002, "Twilight Dress Set/Traveler's Sword & Shield/Paraglider Skin Material/Fruit/Horse", "黄昏服套装/旅人剑&盾/滑翔伞皮肤布料/水果/马"},
{1, 0x01000000, 0x03530902, "Falcon Bow/Paraglider Skin Material/Fish & Meat/Knight's & Royal Bow/Various Arrows", "游隼弓/滑翔伞皮肤布料/鱼&肉/骑士&王族之弓/各种箭"},
{1, 0x01000000, 0x03990902, "Dream Weaver Dress Set/Paraglider Skin Material/Knight's & Royal Spear/Sword & Two-handed Sword/Fish", "织梦勇者服套装/滑翔伞皮肤布料/骑士&王族枪 剑 双手剑/鱼"},
Expand All @@ -27,7 +27,7 @@ const db_link_t link_list[] = {
{1, 0x01010000, 0x000e0002, "Twilight Bow/Paraglider Skin Material/Star Fragment & Gem/Grass/Fruit/Carrot", "黄昏弓/滑翔伞皮肤布料/星星碎片&宝石/草 果实 胡萝卜"},
{1, 0x01010000, 0x03560902, "Sunshield/Paraglider Skin Material/Star Fragment & Gem/Grass/Fruit/Carrot", "太阳盾/滑翔伞皮肤布料/星星碎片&宝石/草 果实 胡萝卜"},
{1, 0x01010300, 0x04140902, "Paraglider Skin Material/Star Fragment & Gem/Grass/Fruit/Carrot", "滑翔伞皮肤布料/星星碎片&宝石/草 果实 胡萝卜"},
{1, 0x01000000, 0x04190902, "Princess Zelda Fabric", "塞尔达公主滑翔伞布料"},
{1, 0x01010000, 0x04190902, "Princess Zelda Fabric", "塞尔达公主滑翔伞布料"},
{2, 0x01010300, 0x04140902, "", "随时随地传送"},
{3, 0x01020100, 0x001b0002, "", "暂无简介"},
{3, 0x01030000, 0x024f0902, "", "暂无简介"},
Expand All @@ -39,7 +39,7 @@ const db_link_t link_list[] = {
{4, 0x01410000, 0x035c0902, "Champion's Tunic Fabric/Paraglider Skin Material/Mushroom", "新式英杰服布料/滑翔伞皮肤布料/蘑菇"},
{4, 0x01050000, 0x03580902, "Rudania's Divine Helm/Boulder Breaker/Diamond", "鲁达尼亚*神兽兵装/劈石剑/钻石"},
{4, 0x01020100, 0x001b0002, "Twilight Sword/Rupee/Gem/Star Fragment Bomb Barrel", "黄昏剑/卢比/宝石/星星碎片炸药桶"},
{4, 0x01400000, 0x03550902, "Dragonbone Boko related gear/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"},
{4, 0x01400000, 0x03550902, "Guardian Weapons/Shields/Spears/Core/Treasure/Arrow", "守护者枪 盾 剑/古代兵装 核心/宝石 箭"},
{4, 0x01000000, 0x00040002, "Twilight Set/Traveler's Sword & Shield/Fruit/Horse", "黄昏服套装/旅人剑&盾/水果/马"},
{4, 0x01000000, 0x03530902, "Falcon Bow/Fish & Meat/Knight's and Royal Bow/Various Arrows", "游隼弓/鱼&肉/骑士&王族之弓/各种箭"},
{4, 0x01000000, 0x03990902, "Dreamweaver Set/Knight's and Royal Spear/Sword/and Claymore/Fish", "织梦勇者服套装/骑士&王族枪 剑 双手剑/鱼"},
Expand Down Expand Up @@ -253,6 +253,8 @@ const db_link_t link_list[] = {
{26, 0x06400100, 0x001e0002, "", "暂无简介"},
{26, 0x33400000, 0x00320002, "", "暂无简介"},
{26, 0x00020000, 0x03720102, "", "暂无简介"},
{26, 0x00020000, 0x00010002, "", "暂无简介"},
{26, 0x00130000, 0x037a0002, "", "暂无简介"},
{26, 0x06420000, 0x035f1102, "", "暂无简介"},
{26, 0x00040000, 0x02620102, "", "暂无简介"},
{26, 0x05c00000, 0x00060002, "", "暂无简介"},
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static void amiibo_scene_file_browser_reload_folders(app_amiibo_t *app) {
if (string_cmp_str(app->current_folder, "/") == 0) {
bool one_driver = (vfs_drive_enabled(VFS_DRIVE_INT) && !vfs_drive_enabled(VFS_DRIVE_EXT)) || (!vfs_drive_enabled(VFS_DRIVE_INT) && vfs_drive_enabled(VFS_DRIVE_EXT));
settings_data_t* p_settings = settings_get_data();
mui_list_view_add_item(app->p_list_view, (one_driver && p_settings->skip_driver_select) ? ICON_HOME : ICON_BACK, (one_driver && p_settings->skip_driver_select) ? getLangString(_L_MAIN_MENU) : "..", (void *)(one_driver && p_settings->skip_driver_select) ? -1 : FOLDER_LIST_PARENT);
mui_list_view_add_item(app->p_list_view, (one_driver && p_settings->skip_driver_select) ? ICON_HOME : ICON_BACK, (one_driver && p_settings->skip_driver_select) ? getLangString(_L_MAIN_MENU) : "..", (void *)((one_driver && p_settings->skip_driver_select) ? -1 : FOLDER_LIST_PARENT));
} else {
mui_list_view_add_item(app->p_list_view, ICON_BACK, "..", (void *)FOLDER_LIST_PARENT);
}
Expand Down
4 changes: 2 additions & 2 deletions fw/application/src/app/amiibo/scene/amiibo_scene_storage_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ void amiibo_scene_storage_list_on_enter(void *user_data) {
mui_list_view_add_item(app->p_list_view, ICON_HOME, getLangString(_L_MAIN_MENU), (void *)-1);

if (vfs_drive_enabled(VFS_DRIVE_INT)) {
mui_list_view_add_item(app->p_list_view, ICON_DRIVE, "[Internal Flash]", (void *)VFS_DRIVE_INT);
mui_list_view_add_item(app->p_list_view, ICON_DRIVE, "Internal Flash", (void *)VFS_DRIVE_INT);
}
if (vfs_drive_enabled(VFS_DRIVE_EXT)) {
mui_list_view_add_item(app->p_list_view, ICON_DRIVE, "[External Flash]", (void *)VFS_DRIVE_EXT);
mui_list_view_add_item(app->p_list_view, ICON_DRIVE, "External Flash", (void *)VFS_DRIVE_EXT);
}

mui_list_view_set_selected_cb(app->p_list_view, amiibo_scene_storage_list_on_selected);
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/amiibo/view/amiibo_detail_view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static void amiibo_detail_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canva

const db_amiibo_t *amd = get_amiibo_by_id(head, tail);
if (amd != NULL) {
const char *name = getLanguage() == LANGUAGE_EN_US ? amd->name_en : amd->name_cn;
const char *name =(getLanguage() == LANGUAGE_ZH_TW || getLanguage() == LANGUAGE_ZH_HANS) ? amd->name_cn : amd->name_en;
mui_element_autowrap_text(p_canvas, 0, y += 15, mui_canvas_get_width(p_canvas), 24, name);
if (strlen(ntag->notes) > 0) {
mui_element_autowrap_text(p_canvas, 0, y += 13, mui_canvas_get_width(p_canvas), 24, ntag->notes);
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/amiibolink/view/amiibolink_view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static void amiibolink_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas)

const db_amiibo_t *amd = get_amiibo_by_id(head, tail);
if (amd != NULL) {
const char *name = getLanguage() == LANGUAGE_EN_US ? amd->name_en : amd->name_cn;
const char *name =(getLanguage() == LANGUAGE_ZH_TW || getLanguage() == LANGUAGE_ZH_HANS) ? amd->name_cn : amd->name_en;
mui_element_autowrap_text(p_canvas, 5, y += 15, mui_canvas_get_width(p_canvas), 24, name);
if (strlen(ntag->notes) > 0) {
mui_element_autowrap_text(p_canvas, 5, y += 15, mui_canvas_get_width(p_canvas), 24, ntag->notes);
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/amiidb/app_amiidb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void app_amiidb_on_kill(mini_app_inst_t *p_app_inst) {
mui_toast_view_free(p_app_handle->p_toast_view);
mui_scene_dispatcher_free(p_app_handle->p_scene_dispatcher);

mui_view_dispatcher_detach(p_app_handle->p_view_dispatcher, MUI_LAYER_TOAST);
mui_view_dispatcher_detach(p_app_handle->p_view_dispatcher_toast, MUI_LAYER_TOAST);
mui_view_dispatcher_free(p_app_handle->p_view_dispatcher_toast);

string_clear(p_app_handle->cur_fav_dir);
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,6 @@ void amiidb_scene_amiibo_detail_on_enter(void *user_data) {

void amiidb_scene_amiibo_detail_on_exit(void *user_data) {
app_amiidb_t *app = (app_amiidb_t *)user_data;
app_timer_stop(&m_amiibo_gen_delay_timer);
app_timer_stop(m_amiibo_gen_delay_timer);
amiidb_fav_array_reset(app->fav_array);
}
2 changes: 1 addition & 1 deletion fw/application/src/app/amiidb/view/amiibo_view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static void amiibo_view_on_draw(mui_view_t *p_view, mui_canvas_t *p_canvas) {

const db_amiibo_t *amd = get_amiibo_by_id(head, tail);
if (amd != NULL) {
const char *name = getLanguage() == LANGUAGE_EN_US ? amd->name_en : amd->name_cn;
const char *name =(getLanguage() == LANGUAGE_ZH_TW || getLanguage() == LANGUAGE_ZH_HANS) ? amd->name_cn : amd->name_en;
mui_canvas_draw_utf8(p_canvas, 0, y += 13, name);
const db_link_t *link = get_link_by_id(p_amiibo_view->game_id, head, tail);
if (strlen(ntag->notes) > 0) {
Expand Down
4 changes: 2 additions & 2 deletions fw/application/src/app/settings/app_settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ static void app_settings_on_event(mini_app_inst_t *p_app_inst, mini_app_event_t

void app_settings_on_run(mini_app_inst_t *p_app_inst) {

app_settings_t *p_app_handle = malloc(sizeof(app_settings_t));
app_settings_t *p_app_handle = mui_mem_malloc(sizeof(app_settings_t));

p_app_inst->p_handle = p_app_handle;
p_app_handle->p_view_dispatcher = mui_view_dispatcher_create();
Expand Down Expand Up @@ -45,7 +45,7 @@ void app_settings_on_kill(mini_app_inst_t *p_app_inst) {
mui_list_view_free(p_app_handle->p_list_view);
mui_progress_bar_free(p_app_handle->p_progress_bar);

free(p_app_handle);
mui_mem_free(p_app_handle);

p_app_inst->p_handle = NULL;
}
Expand Down
15 changes: 11 additions & 4 deletions fw/application/src/app/settings/scene/settings_scene_language.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
#include "app_settings.h"
#include "i18n/language.h"
#include "mini_app_launcher.h"
#include "nrf_pwr_mgmt.h"
#include "settings.h"
#include "settings_scene.h"
#include "utils.h"
#include "version2.h"
#include "i18n/language.h"

enum settings_sleep_timeout_menu_t {
SETTINGS_LANGUAGE_ZH_HANS,
SETTINGS_LANGUAGE_EN_US,
SETTINGS_LANGUAGE_ZH_TW,
SETTINGS_LANGUAGE_ES_CO,
SETTINGS_LANGUAGE_KO_KR,
SETTINGS_LANGUAGE_MENU_EXIT,
};

static void settings_scene_language_list_view_on_selected(mui_list_view_event_t event,
mui_list_view_t *p_list_view, mui_list_item_t *p_item) {
static void settings_scene_language_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
mui_list_item_t *p_item) {
app_settings_t *app = p_list_view->user_data;
uint32_t selection = (uint32_t)p_item->user_data;
settings_data_t *p_settings = settings_get_data();
Expand All @@ -30,11 +31,16 @@ static void settings_scene_language_list_view_on_selected(mui_list_view_event_t
p_settings->language = LANGUAGE_EN_US;
setLanguage(p_settings->language);
break;

case SETTINGS_LANGUAGE_ZH_TW:
p_settings->language = LANGUAGE_ZH_TW;
setLanguage(p_settings->language);
break;

case SETTINGS_LANGUAGE_ES_CO:
p_settings->language = LANGUAGE_ES_CO;
setLanguage(p_settings->language);
break;
}
mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
}
Expand All @@ -45,6 +51,7 @@ void settings_scene_language_on_enter(void *user_data) {
mui_list_view_add_item(app->p_list_view, 0xe105, "简体中文", (void *)SETTINGS_LANGUAGE_ZH_HANS);
mui_list_view_add_item(app->p_list_view, 0xe105, "繁體中文(臺灣)", (void *)SETTINGS_LANGUAGE_ZH_TW);
mui_list_view_add_item(app->p_list_view, 0xe105, "English", (void *)SETTINGS_LANGUAGE_EN_US);
mui_list_view_add_item(app->p_list_view, 0xe105, getLangDesc(LANGUAGE_ES_CO), (void *)SETTINGS_LANGUAGE_ES_CO);
mui_list_view_add_item(app->p_list_view, 0xe069, getLangString(_L_BACK), (void *)SETTINGS_LANGUAGE_MENU_EXIT);

mui_list_view_set_selected_cb(app->p_list_view, settings_scene_language_list_view_on_selected);
Expand Down
4 changes: 2 additions & 2 deletions fw/application/src/i18n/en_US.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const char * lang_en_us[_L_COUNT] = {
[_L_RENAME] = "Rename",
[_L_OPEN_FOLDER_FAILED] = "Failed to open folder",
[_L_RENAME_FAILED] = "Failed to rename\nError code",
[_L_MAIN_RETURN] = ">>RETURN<<",
[_L_MAIN_RETURN] = "[RETURN]",
[_L_RANDOM_MODE_MANUAL] = "Randomize (Manual)",
[_L_RANDOM_MODE_AUTO] = "Randomize (Auto)",
[_L_SEQUENCE_MODE] = "Sequential mode",
Expand All @@ -76,7 +76,7 @@ const char * lang_en_us[_L_COUNT] = {
[_L_AUTO_RANDOM] = "Auto Random.",
[_L_COMPATIBLE_MODE] = "Compati. Mode",
[_L_TAG_DETAILS] = "Tag Details",
[_L_MAIN_MENU] = ">>Main Menu<<",
[_L_MAIN_MENU] = "[Main Menu]",
[_L_MODE_RANDOM] = "Rand. (Manual)",
[_L_MODE_CYCLE] = "Sequential",
[_L_MODE_NTAG] = "Read/Write",
Expand Down
Loading