From 360d6b81b3918c752fe2fb1d7e847ba2ad15c3ba Mon Sep 17 00:00:00 2001 From: solosky Date: Sun, 4 Feb 2024 22:02:33 +0800 Subject: [PATCH 1/3] fix wrong data length when save card data --- fw/application/src/app/chameleon/port/fds_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fw/application/src/app/chameleon/port/fds_utils.c b/fw/application/src/app/chameleon/port/fds_utils.c index 158d2866..cf4ff100 100644 --- a/fw/application/src/app/chameleon/port/fds_utils.c +++ b/fw/application/src/app/chameleon/port/fds_utils.c @@ -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; } From 6841b261d01f012e9a395c129afc8c884016a7a3 Mon Sep 17 00:00:00 2001 From: James-Makoto <55654427+James-Makoto@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:47:59 +0800 Subject: [PATCH 2/3] amiibo_db update --- fw/application/src/amiidb/db_amiibo.c | 1 + fw/application/src/amiidb/db_game.c | 2 +- fw/application/src/amiidb/db_link.c | 1 + fw/data/amiidb_amiibo.csv | 1 + fw/data/amiidb_link.csv | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fw/application/src/amiidb/db_amiibo.c b/fw/application/src/amiidb/db_amiibo.c index 8b53fc86..7fc7acc1 100644 --- a/fw/application/src/amiidb/db_amiibo.c +++ b/fw/application/src/amiidb/db_amiibo.c @@ -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} }; diff --git a/fw/application/src/amiidb/db_game.c b/fw/application/src/amiidb/db_game.c index c0a128fd..58d8d3fa 100644 --- a/fw/application/src/amiidb/db_game.c +++ b/fw/application/src/amiidb/db_game.c @@ -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}, diff --git a/fw/application/src/amiidb/db_link.c b/fw/application/src/amiidb/db_link.c index 5b094656..c3bd7674 100644 --- a/fw/application/src/amiidb/db_link.c +++ b/fw/application/src/amiidb/db_link.c @@ -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, "", "暂无简介"}, diff --git a/fw/data/amiidb_amiibo.csv b/fw/data/amiidb_amiibo.csv index b965c6de..06558b18 100644 --- a/fw/data/amiidb_amiibo.csv +++ b/fw/data/amiidb_amiibo.csv @@ -846,3 +846,4 @@ 22c00000003a0202,Chibi Robo,小机器人 22430000043d1b02,Noah,诺亚 22440000043e1b02,Mio,弥央 +3f000000042e0002,Sora,索拉 diff --git a/fw/data/amiidb_link.csv b/fw/data/amiidb_link.csv index 0e7e223f..921841db 100644 --- a/fw/data/amiidb_link.csv +++ b/fw/data/amiidb_link.csv @@ -542,6 +542,7 @@ 47,01000000037c0002,,暂无简介 47,01010000000e0002,,暂无简介 47,05c00100001d0002,,暂无简介 +47,3f000000042e0002,,暂无简介 48,0003010200410302,,暂无简介 48,0005ff00023a0702,,暂无简介 48,0023000003680102,,暂无简介 From 58d819897e71b49b85c2f27fa3471f551a5bbee5 Mon Sep 17 00:00:00 2001 From: James-Makoto <55654427+James-Makoto@users.noreply.github.com> Date: Sun, 18 Feb 2024 18:30:31 +0800 Subject: [PATCH 3/3] update setting icon --- fw/application/src/mui/mui_resource.c | 16 ++++++++-------- fw/resources/bmp/app_settings_32x32.bmp | Bin 2102 -> 1088 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fw/application/src/mui/mui_resource.c b/fw/application/src/mui/mui_resource.c index d637f93c..f653f944 100644 --- a/fw/application/src/mui/mui_resource.c +++ b/fw/application/src/mui/mui_resource.c @@ -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}; diff --git a/fw/resources/bmp/app_settings_32x32.bmp b/fw/resources/bmp/app_settings_32x32.bmp index 194dd5a970c29ea23009cf8c20c578879792e315..fb67d3a262d86aa8378d10273ab5d5520c3d5254 100644 GIT binary patch literal 1088 zcmc(cO%4Jv2!-jyg^4>);L=kVOF yw{e+VGPD{oMf^2h2jG8YMB_eZ#6w%0S$R@g(ix*UW(BvCOdw~MY|R?p^Y{YY>;=34 literal 2102 zcmds%XE>H^9L67o6qzBV(ncl8C=JpcN)+v7G_XyHR)zMWLD~a}1`XPw zH2A&GP`&TrQOEIqct5=V0%T-ls8+2S)vH%WR#p}{IXUFz<*8Al1_}xa)T~*PTD5ASsHljNk`lFR z*G5@c85I>3R8>_`Q&U4-T^$V#4eHdXgQlh?T3T9YYim=tZe4VAbf{Oa9`)OFGCNyo@lxEGE(Y$$cTC`|E%a$$C*Vo6uzyL!-Lt3?J zMeEkBY15_+Mn*=oZQB-OV`JL2Yln%63GLgr$JEpmGcz;H&CRi}u%JVS4s`6;5lc%; zI(6zq=gyt!(xnSsyLQFO$_i_1Yr1vohK-F4-Me?EM~@!#?AeoEy?W8RcW?Ui=|kVX zed*V)AN~9HXTX2~*xK4MaNs}&4H|@O;X=H;yjZko5sMcuX33HzEM2;kWy_Y~?d^?^j}N}SzARt9 zoE0lpuyW-}R;^lvpPwJASFdKxnl({Sm!-frP+_;fVn>Mj| z^Jcbe*}~SXTiLd48-am=Y~Q|}pr9avgM-W`}gnXz<~oqMn-b*;6b9IqBwNu5Yf@m#Kgo98yibpTpaQ7 z@f<#Um?KAyaP;U=5)u+fOiUyxDT!mpj&c0>aZa2#!O4>+Id$q3r%#{e%$YNsJ$sgO z=gx8d{CO^1xIl7pGASu3T)cRZOP4Nj`SNA1T)9GOYAR`IX@Bqt|_ z+}vCqJ$l6B$B%jP