Skip to content

Commit e9eadee

Browse files
committed
fix: update gitignore and memory buffer size, fix amiibo helper
- Increase MUI memory buffer size from 16KB to 18KB - Fix amiibo helper by moving ntag_new declaration inside functions - Reorganize amiibo list entries and add new characters
1 parent acffae0 commit e9eadee

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ dist
4949

5050
fw/scripts/.venv
5151

52-
52+
fw/temp

fw/application/src/amiibo_helper.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define AMIIID_SIZE 8
1919

2020
// to avoid stack-allocating the new larger ntag_t struct
21-
static ntag_t ntag_new;
21+
// static ntag_t ntag_new;
2222

2323
static nfc3d_amiibo_keys amiibo_keys;
2424
static bool amiibo_keys_loaded;
@@ -143,6 +143,8 @@ ret_code_t amiibo_helper_rand_amiibo_uuid(ntag_t *ntag) {
143143
ret_code_t err_code;
144144
ntag_t *ntag_current = ntag;
145145

146+
ntag_t ntag_new;
147+
146148
memcpy(&ntag_new, ntag_current, sizeof(ntag_t));
147149

148150
if (!is_valid_amiibo_ntag(ntag_current)) {
@@ -169,6 +171,7 @@ ret_code_t amiibo_helper_rand_amiibo_uuid(ntag_t *ntag) {
169171
ret_code_t amiibo_helper_set_amiibo_uuid(ntag_t *ntag, uint8_t *uuid) {
170172
ret_code_t err_code;
171173
ntag_t *ntag_current = ntag;
174+
ntag_t ntag_new;
172175

173176
memcpy(&ntag_new, ntag_current, sizeof(ntag_t));
174177

fw/application/src/amiidb/db_amiibo.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ const db_amiibo_t amiibo_list[] = {
599599
{0x05c20000, 0x037f0002, "Ridley", "利德雷"},
600600
{0x05c30000, 0x03800002, "Dark Samus", "黑暗萨姆斯"},
601601
{0x05c40000, 0x04131302, "E.M.M.I.", "E.M.M.I."},
602+
{0x05c50000, 0x043c1302, "Sylux", "赛拉克斯"},
602603
{0x06000000, 0x00120002, "Captain Falcon", "飞隼队长"},
603604
{0x06400100, 0x001e0002, "Olimar", "欧力玛"},
604605
{0x06420000, 0x035f1102, "Pikmin", "皮克敏"},
@@ -781,11 +782,13 @@ const db_amiibo_t amiibo_list[] = {
781782
{0x1d400000, 0x03870002, "Pokemon Trainer", "宝可梦训练师"},
782783
{0x1f000000, 0x000a0002, "Kirby", "卡比"},
783784
{0x1f000000, 0x02540c02, "Kirby", "卡比"},
785+
{0x1f000000, 0x04c41e03, "Kirby", ""},
784786
{0x1f010000, 0x00270002, "Meta Knight", "梅塔骑士"},
785787
{0x1f010000, 0x02550c02, "Meta Knight", "梅塔骑士"},
786788
{0x1f020000, 0x00280002, "King Dedede", "迪迪迪大王"},
787789
{0x1f020000, 0x02560c02, "King Dedede", "迪迪迪大王"},
788790
{0x1f030000, 0x02570c02, "Waddle Dee", "瓦多鲁迪"},
791+
{0x1f030100, 0x04c91e03, "Bandana Waddle Dee", ""},
789792
{0x1f400000, 0x035e1002, "Qbby", "丘比"},
790793
{0x21000000, 0x000b0002, "Marth", "马尔斯"},
791794
{0x21010000, 0x00180002, "Ike", "艾克"},
@@ -878,9 +881,6 @@ const db_amiibo_t amiibo_list[] = {
878881
{0x34db0001, 0x04ef1d02, "Alex", ""},
879882
{0x34dc0001, 0x04e71d02, "Ingrid", ""},
880883
{0x34dc0001, 0x04f01d02, "Ingrid", ""},
881-
{0x05c50000, 0x043c1302, "Sylux", "赛拉克斯"},
882-
{0x1f000000, 0x04c41e03, "Kirby", ""},
883-
{0x1f030100, 0x04c91e03, "Bandana Waddle Dee", ""},
884884
{0x35000100, 0x02e10f02, "One-Eyed Rathalos and Rider - Male", "独眼雄火龙与男骑士"},
885885
{0x35000200, 0x02e20f02, "One-Eyed Rathalos and Rider - Female", "独眼雄火龙与女骑士"},
886886
{0x35010000, 0x02e30f02, "Nabiru", "纳比露"},

fw/application/src/mui/mui_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
#define MUI_MEM_USE_TLSF
6-
#define MUI_MEM_BUFF_SIZE 16*1024
6+
#define MUI_MEM_BUFF_SIZE 18*1024
77

88
//#define MUI_MEM_DRAW_USAGE
99

pixl.js.code-workspace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
},
66
{
77
"path": "web"
8+
},
9+
{
10+
"path": "."
811
}
912
],
1013
"settings": {

0 commit comments

Comments
 (0)