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.10.1 #216

Merged
merged 6 commits into from
Feb 25, 2024
Merged

2.10.1 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
360d6b8
fix wrong data length when save card data
solosky Feb 4, 2024
a6bd2bf
Merge remote-tracking branch 'github/main' into develop
solosky Feb 4, 2024
6841b26
amiibo_db update
James-Makoto Feb 16, 2024
93c2aa2
Merge pull request #214 from James-Makoto/develop
solosky Feb 17, 2024
58d8198
update setting icon
James-Makoto Feb 18, 2024
89c62a7
Merge pull request #215 from James-Makoto/develop
solosky Feb 18, 2024
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
1 change: 1 addition & 0 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 @@ -848,5 +848,6 @@ const db_amiibo_t amiibo_list[] = {
{0x22c00000, 0x003a0202, "Chibi Robo", "小机器人"},
{0x22430000, 0x043d1b02, "Noah", "诺亚"},
{0x22440000, 0x043e1b02, "Mio", "弥央"},
{0x3f000000, 0x042e0002, "Sora", "索拉"},
{0, 0, 0, 0}
};
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 @@ -46,7 +46,7 @@ const db_game_t game_list[] = {
{44, 0, "Super Kirby Clash", "超级卡比猎人队", 1, 8},
{45, 0, "Super Mario 3D World + Bowser's Fury", "超级马力欧 3D世界+狂怒世界", 1, 19},
{46, 0, "Super Mario Odyssey", "超级马力欧：奥德赛", 70, 20},
{47, 0, "Super Smash Bros Ultimate", "任天堂明星大乱斗", 35, 95},
{47, 0, "Super Smash Bros Ultimate", "任天堂明星大乱斗", 35, 96},
{48, 0, "Yoshi's Crafted World", "耀西的手工世界", 50, 11},
{49, 0, "Yu-Gi-Oh! Rush Duel Saikyo Battle Royale ", "游戏王：激斗大逃杀", 1, 7},
{50, 0, "Dark Souls Remastered", "黑暗之魂：重制版", 1, 1},
Expand Down
1 change: 1 addition & 0 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 @@ -544,6 +544,7 @@ const db_link_t link_list[] = {
{47, 0x01000000, 0x037c0002, "", "暂无简介"},
{47, 0x01010000, 0x000e0002, "", "暂无简介"},
{47, 0x05c00100, 0x001d0002, "", "暂无简介"},
{47, 0x3f000000, 0x042e0002, "", "暂无简介"},
{48, 0x00030102, 0x00410302, "", "暂无简介"},
{48, 0x0005ff00, 0x023a0702, "", "暂无简介"},
{48, 0x00230000, 0x03680102, "", "暂无简介"},
Expand Down
2 changes: 1 addition & 1 deletion fw/application/src/app/chameleon/port/fds_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ bool fds_read_sync(uint16_t id, uint16_t key, uint16_t* max_length, uint8_t *buf
bool fds_write_sync(uint16_t id, uint16_t key, uint16_t data_length_words, void *buffer) {
char path[VFS_MAX_PATH_LEN];
fds_map_file_name(id, key, path);
int32_t bytes_written = vfs_get_default_driver()->write_file_data(path, buffer, data_length_words * 4);
int32_t bytes_written = vfs_get_default_driver()->write_file_data(path, buffer, data_length_words);
NRF_LOG_INFO("fds_write_sync: id=%X, key=%d, bytes_written=%d", id, key, bytes_written);
return bytes_written > 0;
}
Expand Down
16 changes: 8 additions & 8 deletions fw/application/src/mui/mui_resource.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ const xbm_t app_card_emulator_32x32 = {.width = 32, .height = 32, .data = app_ca
//************************************************************************
const uint8_t app_settings_32x32_data[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0xc0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x07,0x00,0x00,
0xfe,0x06,0x00,0x80,0x7f,0x03,0x00,0xc0,0xdf,0x01,0x00,0xf0,0xaf,0x00,0x00,
0xfc,0x57,0x00,0x00,0xfe,0x2b,0x00,0x80,0xff,0x12,0x00,0xe0,0xbf,0x09,0x00,
0xf0,0x5f,0x04,0x00,0xb0,0x2f,0x02,0x00,0x70,0x0b,0x01,0x00,0xf0,0x86,0x00,
0x00,0xf0,0x41,0x00,0x00,0xf0,0x20,0x00,0x00,0x70,0x10,0x00,0x00,0xf0,0x0f,
0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xfd,0xff,0x07,0xf0,0xfd,0xff,0x0f,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
0x00,0x80,0xff,0x7f,0x00,0x40,0x00,0xa0,0x00,0x40,0x4f,0x2d,0x01,0x40,0x09,
0x20,0x02,0x40,0x09,0xe0,0x03,0x40,0x4f,0x0f,0x02,0x40,0x00,0x00,0x02,0x40,
0xff,0x7f,0x02,0x40,0x00,0x00,0x02,0x40,0xcf,0x6a,0x02,0x40,0x89,0x14,0x02,
0x40,0x09,0x00,0x02,0x40,0x00,0x00,0x02,0xc0,0xa4,0x25,0x03,0x40,0x49,0x92,
0x02,0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xc0,0x03,0x00,0x00,0xc0,
0x03,0x00,0x80,0xc1,0x83,0x01,0xc0,0xf3,0xcf,0x03,0xc0,0xff,0xff,0x03,0x80,
0xff,0xff,0x01,0x00,0xff,0xff,0x00,0x00,0x1f,0xf8,0x00,0x80,0xcf,0xf3,0x01,
0xe0,0xe7,0xe7,0x07,0x00,0x00,0x00,0x00
};
const xbm_t app_settings_32x32 = {.width = 32, .height = 32, .data = app_settings_32x32_data};

Expand Down
1 change: 1 addition & 0 deletions fw/data/amiidb_amiibo.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,3 +846,4 @@
22c00000003a0202,Chibi Robo,小机器人
22430000043d1b02,Noah,诺亚
22440000043e1b02,Mio,弥央
3f000000042e0002,Sora,索拉
1 change: 1 addition & 0 deletions fw/data/amiidb_link.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@
47,01000000037c0002,,暂无简介
47,01010000000e0002,,暂无简介
47,05c00100001d0002,,暂无简介
47,3f000000042e0002,,暂无简介
48,0003010200410302,,暂无简介
48,0005ff00023a0702,,暂无简介
48,0023000003680102,,暂无简介
Expand Down
Binary file modified fw/resources/bmp/app_settings_32x32.bmp
View file
Open in desktop
Binary file not shown.
Loading