Merge pull request solosky#178 from solosky/develop

2.9.1

Author: solosky

.gitignore

@@ -1,5 +1,6 @@
 fw/.settings
 fw/_build
+fw/.idea
 
 fw/src/amiibo_private.c
 fw/src/version.inc.h

.vscode/settings.json

@@ -20,6 +20,15 @@
         "vector": "c",
         "string_view": "c",
         "initializer_list": "c",
-        "ranges": "c"
+        "ranges": "c",
+        "optional": "c",
+        "istream": "c",
+        "ostream": "c",
+        "ratio": "c",
+        "system_error": "c",
+        "functional": "c",
+        "tuple": "c",
+        "type_traits": "c",
+        "utility": "c"
     }
 }

docs/en/05+5-translation.md

@@ -16,12 +16,11 @@ The script `font_data_gen.sh` only can be run in Git Bash windows in Windows.
 2. Run `fw/scripts/i18n_gen.py` to generate new language files.
 3. Optional: Run `fw/scripts/font_data_gen.sh` to generate new font data if you add new charaters in i18n.csv
 4. Edit `fw/application/src/i18n/language.h` and `fw/application/src/i18n/language.c` to adopt new language
-5. Edit `fw/application/src/app/settings/scene/settings_scene_language.c` to adopt new language
-6. Edit Makefile to include `$(PROJ_DIR)/i18n/ja_JP.c` as C source files
-7. Run `make full` rebuild firmware
+5. Edit Makefile to include `$(PROJ_DIR)/i18n/ja_JP.c` as C source files
+6. Run `make full` rebuild firmware
 
 ## Font notes 
 
 For release build (RELEASE=1), the firmware use wenquanyi_9pt_u8g2.bdf to display unicode characters.  <br />
 Please check new language charater codepoint is included in wenquanyi_9pt_u8g2.bdf or not.<br />
-If not, I am not recommended to support the new language due to the MCU internal flash restrction. 
+If not, I am not recommended to support the new language due to the MCU internal flash restrction. 

docs/en/README.md

@@ -39,7 +39,18 @@ This fork is divided in two main sections, Hardware and Firmware
 
 - [Bluetooth BLE File Transfer protocol](05+1-ble_protocol.md)
 - [AmiiboLink BLE Protocol](05+2-amiibolink_ble.md)
-- [video player](05+4-video_player.md) (Retired on Firmware 2.5.2 due to flash size restrictions.
+- [video player](05+4-video_player.md) (Retired on Firmware 2.5.2 due to flash size restrictions.)
+
+
+# Tutorial
+
+## iNFC
+
+- [Pixl Firmware Upgrade Tutorial](https://www.youtube.com/watch?v=vldNVaoqJg0)
+
+## MTools Lite
+
+- [How to use card emulator on Pixl js OLED LCD](https://www.youtube.com/watch?v=KiuyfBKalhI)
 
 
 # **key_retail.bin**

fw/application/Makefile

@@ -90,82 +90,82 @@ SRC_FILES += \
   $(SDK_ROOT)/components/libraries/crypto/backend/mbedtls/mbedtls_backend_hmac.c \
   $(SDK_ROOT)/components/libraries/crypto/backend/mbedtls/mbedtls_backend_aes.c \
   $(SDK_ROOT)/external/mbedtls/library/aes.c \
-	$(SDK_ROOT)/external/mbedtls/library/aesni.c \
-	$(SDK_ROOT)/external/mbedtls/library/arc4.c \
-	$(SDK_ROOT)/external/mbedtls/library/aria.c \
-	$(SDK_ROOT)/external/mbedtls/library/asn1parse.c \
-	$(SDK_ROOT)/external/mbedtls/library/asn1write.c \
-	$(SDK_ROOT)/external/mbedtls/library/base64.c \
-	$(SDK_ROOT)/external/mbedtls/library/bignum.c \
-	$(SDK_ROOT)/external/mbedtls/library/blowfish.c \
-	$(SDK_ROOT)/external/mbedtls/library/camellia.c \
-	$(SDK_ROOT)/external/mbedtls/library/ccm.c \
-	$(SDK_ROOT)/external/mbedtls/library/certs.c \
-	$(SDK_ROOT)/external/mbedtls/library/chacha20.c \
-	$(SDK_ROOT)/external/mbedtls/library/chachapoly.c \
-	$(SDK_ROOT)/external/mbedtls/library/cipher.c \
-	$(SDK_ROOT)/external/mbedtls/library/cipher_wrap.c \
-	$(SDK_ROOT)/external/mbedtls/library/cmac.c \
-	$(SDK_ROOT)/external/mbedtls/library/ctr_drbg.c \
-	$(SDK_ROOT)/external/mbedtls/library/debug.c \
-	$(SDK_ROOT)/external/mbedtls/library/des.c \
-	$(SDK_ROOT)/external/mbedtls/library/dhm.c \
-	$(SDK_ROOT)/external/mbedtls/library/ecdh.c \
-	$(SDK_ROOT)/external/mbedtls/library/ecdsa.c \
-	$(SDK_ROOT)/external/mbedtls/library/ecjpake.c \
-	$(SDK_ROOT)/external/mbedtls/library/ecp.c \
-	$(SDK_ROOT)/external/mbedtls/library/ecp_curves.c \
-	$(SDK_ROOT)/external/mbedtls/library/entropy.c \
-	$(SDK_ROOT)/external/mbedtls/library/entropy_poll.c \
-	$(SDK_ROOT)/external/mbedtls/library/error.c \
-	$(SDK_ROOT)/external/mbedtls/library/gcm.c \
-	$(SDK_ROOT)/external/mbedtls/library/havege.c \
-	$(SDK_ROOT)/external/mbedtls/library/hmac_drbg.c \
-	$(SDK_ROOT)/external/mbedtls/library/md.c \
-	$(SDK_ROOT)/external/mbedtls/library/md2.c \
-	$(SDK_ROOT)/external/mbedtls/library/md4.c \
-	$(SDK_ROOT)/external/mbedtls/library/md5.c \
-	$(SDK_ROOT)/external/mbedtls/library/md_wrap.c \
-	$(SDK_ROOT)/external/mbedtls/library/memory_buffer_alloc.c \
-	$(SDK_ROOT)/external/mbedtls/library/net_sockets.c \
-	$(SDK_ROOT)/external/mbedtls/library/nist_kw.c \
-	$(SDK_ROOT)/external/mbedtls/library/oid.c \
-	$(SDK_ROOT)/external/mbedtls/library/padlock.c \
-	$(SDK_ROOT)/external/mbedtls/library/pem.c \
-	$(SDK_ROOT)/external/mbedtls/library/pk.c \
-	$(SDK_ROOT)/external/mbedtls/library/pk_wrap.c \
-	$(SDK_ROOT)/external/mbedtls/library/pkcs11.c \
-	$(SDK_ROOT)/external/mbedtls/library/pkcs12.c \
-	$(SDK_ROOT)/external/mbedtls/library/pkcs5.c \
-	$(SDK_ROOT)/external/mbedtls/library/pkparse.c \
-	$(SDK_ROOT)/external/mbedtls/library/pkwrite.c \
-	$(SDK_ROOT)/external/mbedtls/library/platform.c \
-	$(SDK_ROOT)/external/mbedtls/library/platform_util.c \
-	$(SDK_ROOT)/external/mbedtls/library/poly1305.c \
-	$(SDK_ROOT)/external/mbedtls/library/ripemd160.c \
-	$(SDK_ROOT)/external/mbedtls/library/rsa.c \
-	$(SDK_ROOT)/external/mbedtls/library/rsa_internal.c \
-	$(SDK_ROOT)/external/mbedtls/library/sha1.c \
-	$(SDK_ROOT)/external/mbedtls/library/sha256.c \
-	$(SDK_ROOT)/external/mbedtls/library/sha512.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_cache.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_ciphersuites.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_cli.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_cookie.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_srv.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_ticket.c \
-	$(SDK_ROOT)/external/mbedtls/library/ssl_tls.c \
-	$(SDK_ROOT)/external/mbedtls/library/threading.c \
-	$(SDK_ROOT)/external/mbedtls/library/version.c \
-	$(SDK_ROOT)/external/mbedtls/library/version_features.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509_create.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509_crl.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509_crt.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509_csr.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509write_crt.c \
-	$(SDK_ROOT)/external/mbedtls/library/x509write_csr.c \
-	$(SDK_ROOT)/external/mbedtls/library/xtea.c \
+  $(SDK_ROOT)/external/mbedtls/library/aesni.c \
+  $(SDK_ROOT)/external/mbedtls/library/arc4.c \
+  $(SDK_ROOT)/external/mbedtls/library/aria.c \
+  $(SDK_ROOT)/external/mbedtls/library/asn1parse.c \
+  $(SDK_ROOT)/external/mbedtls/library/asn1write.c \
+  $(SDK_ROOT)/external/mbedtls/library/base64.c \
+  $(SDK_ROOT)/external/mbedtls/library/bignum.c \
+  $(SDK_ROOT)/external/mbedtls/library/blowfish.c \
+  $(SDK_ROOT)/external/mbedtls/library/camellia.c \
+  $(SDK_ROOT)/external/mbedtls/library/ccm.c \
+  $(SDK_ROOT)/external/mbedtls/library/certs.c \
+  $(SDK_ROOT)/external/mbedtls/library/chacha20.c \
+  $(SDK_ROOT)/external/mbedtls/library/chachapoly.c \
+  $(SDK_ROOT)/external/mbedtls/library/cipher.c \
+  $(SDK_ROOT)/external/mbedtls/library/cipher_wrap.c \
+  $(SDK_ROOT)/external/mbedtls/library/cmac.c \
+  $(SDK_ROOT)/external/mbedtls/library/ctr_drbg.c \
+  $(SDK_ROOT)/external/mbedtls/library/debug.c \
+  $(SDK_ROOT)/external/mbedtls/library/des.c \
+  $(SDK_ROOT)/external/mbedtls/library/dhm.c \
+  $(SDK_ROOT)/external/mbedtls/library/ecdh.c \
+  $(SDK_ROOT)/external/mbedtls/library/ecdsa.c \
+  $(SDK_ROOT)/external/mbedtls/library/ecjpake.c \
+  $(SDK_ROOT)/external/mbedtls/library/ecp.c \
+  $(SDK_ROOT)/external/mbedtls/library/ecp_curves.c \
+  $(SDK_ROOT)/external/mbedtls/library/entropy.c \
+  $(SDK_ROOT)/external/mbedtls/library/entropy_poll.c \
+  $(SDK_ROOT)/external/mbedtls/library/error.c \
+  $(SDK_ROOT)/external/mbedtls/library/gcm.c \
+  $(SDK_ROOT)/external/mbedtls/library/havege.c \
+  $(SDK_ROOT)/external/mbedtls/library/hmac_drbg.c \
+  $(SDK_ROOT)/external/mbedtls/library/md.c \
+  $(SDK_ROOT)/external/mbedtls/library/md2.c \
+  $(SDK_ROOT)/external/mbedtls/library/md4.c \
+  $(SDK_ROOT)/external/mbedtls/library/md5.c \
+  $(SDK_ROOT)/external/mbedtls/library/md_wrap.c \
+  $(SDK_ROOT)/external/mbedtls/library/memory_buffer_alloc.c \
+  $(SDK_ROOT)/external/mbedtls/library/net_sockets.c \
+  $(SDK_ROOT)/external/mbedtls/library/nist_kw.c \
+  $(SDK_ROOT)/external/mbedtls/library/oid.c \
+  $(SDK_ROOT)/external/mbedtls/library/padlock.c \
+  $(SDK_ROOT)/external/mbedtls/library/pem.c \
+  $(SDK_ROOT)/external/mbedtls/library/pk.c \
+  $(SDK_ROOT)/external/mbedtls/library/pk_wrap.c \
+  $(SDK_ROOT)/external/mbedtls/library/pkcs11.c \
+  $(SDK_ROOT)/external/mbedtls/library/pkcs12.c \
+  $(SDK_ROOT)/external/mbedtls/library/pkcs5.c \
+  $(SDK_ROOT)/external/mbedtls/library/pkparse.c \
+  $(SDK_ROOT)/external/mbedtls/library/pkwrite.c \
+  $(SDK_ROOT)/external/mbedtls/library/platform.c \
+  $(SDK_ROOT)/external/mbedtls/library/platform_util.c \
+  $(SDK_ROOT)/external/mbedtls/library/poly1305.c \
+  $(SDK_ROOT)/external/mbedtls/library/ripemd160.c \
+  $(SDK_ROOT)/external/mbedtls/library/rsa.c \
+  $(SDK_ROOT)/external/mbedtls/library/rsa_internal.c \
+  $(SDK_ROOT)/external/mbedtls/library/sha1.c \
+  $(SDK_ROOT)/external/mbedtls/library/sha256.c \
+  $(SDK_ROOT)/external/mbedtls/library/sha512.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_cache.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_ciphersuites.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_cli.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_cookie.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_srv.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_ticket.c \
+  $(SDK_ROOT)/external/mbedtls/library/ssl_tls.c \
+  $(SDK_ROOT)/external/mbedtls/library/threading.c \
+  $(SDK_ROOT)/external/mbedtls/library/version.c \
+  $(SDK_ROOT)/external/mbedtls/library/version_features.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509_create.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509_crl.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509_crt.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509_csr.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509write_crt.c \
+  $(SDK_ROOT)/external/mbedtls/library/x509write_csr.c \
+  $(SDK_ROOT)/external/mbedtls/library/xtea.c \
   $(PROJ_DIR)/main.c \
   $(PROJ_DIR)/ntag/ntag_emu_v2.c \
   $(PROJ_DIR)/ntag/ntag_store.c \
@@ -202,7 +202,6 @@ SRC_FILES += \
   $(PROJ_DIR)/mui/u8g2_font_likeminecraft_te.c \
   $(PROJ_DIR)/mui/u8g2_font_siji_t_6x10.c \
   $(PROJ_DIR)/mui/u8g2_font_wqy12_t_gb2312a.c \
-  $(PROJ_DIR)/mui/u8g2_font_wqy12_t_gb2312a_lite.c \
   $(PROJ_DIR)/mui/mui_core.c \
   $(PROJ_DIR)/mui/mui_canvas.c \
   $(PROJ_DIR)/mui/mui_event.c \
@@ -294,7 +293,8 @@ 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/es_ES.c \
+  $(PROJ_DIR)/i18n/hu_HU.c \
   $(PROJ_DIR)/i18n/language.c \
   $(PROJ_DIR)/hal/hal_nfc_t2t.c \
   $(PROJ_DIR)/amiidb/db_amiibo.c \

fw/application/src/app/amiibo/scene/amiibo_scene_file_browser_menu.c

@@ -6,11 +6,14 @@
 #include "ntag_def.h"
 #include "ntag_store.h"
 #include "vfs.h"
+#include "mui_icons.h"
+
 
 #include "i18n/language.h"
 #include "mini_app_launcher.h"
 #include "mini_app_registry.h"
 
+
 #define AMIIBO_MAX_AMIIBO_IN_BATCH 50
 
 enum file_browser_menu_t {
@@ -109,7 +112,6 @@ static void amiibo_scene_file_browser_text_input_create_amiibo_batch_event_cb(mu
         char file_name[VFS_MAX_NAME_LEN];
         ntag_t ntag;
 
-
         mui_msg_box_set_header(app->p_msg_box, _T(CREATING_TAG_BATCH));
         mui_msg_box_set_btn_text(app->p_msg_box, NULL, NULL, NULL);
         mui_msg_box_set_btn_focus(app->p_msg_box, 1);
@@ -118,7 +120,7 @@ static void amiibo_scene_file_browser_text_input_create_amiibo_batch_event_cb(mu
         for (uint8_t i = 0; i < num_amiibo; i++) {
             sprintf(file_name, "new_%02d.bin", i + 1);
 
-            sprintf(msg, "%s %s ..",_T(CREATING_TAG_BATCH), file_name);
+            sprintf(msg, "%s %s ..", _T(CREATING_TAG_BATCH), file_name);
             mui_msg_box_set_message(app->p_msg_box, msg);
             mui_update_now(mui());
 
@@ -193,7 +195,7 @@ static void amiibo_scene_file_browser_menu_msg_box_remove_folder_event_cb(mui_ms
     vfs_obj_t obj;
     cwalk_append_segment(path, string_get_cstr(app->current_folder), string_get_cstr(app->current_file));
 
-    if (event == MUI_MSG_BOX_EVENT_SELECT_RIGHT) {
+    if (event == MUI_MSG_BOX_EVENT_SELECT_LEFT) {
 
         int32_t res = p_driver->stat_file(path, &obj);
         if (res == VFS_OK) {
@@ -205,12 +207,12 @@ static void amiibo_scene_file_browser_menu_msg_box_remove_folder_event_cb(mui_ms
         }
 
         if (res == VFS_OK) {
-            mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, AMIIBO_SCENE_FILE_BROWSER);
+            mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
         }
 
     } else {
         // cancel, return to menu
-        mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, AMIIBO_SCENE_FILE_BROWSER_MENU);
+        mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_LIST);
     }
 }
 
@@ -256,8 +258,8 @@ static void amiibo_scene_file_browser_menu_on_selected(mui_list_view_event_t eve
         snprintf(msg, sizeof(msg), "%s %s ?", getLangString(_L_DELETE), string_get_cstr(app->current_file));
         mui_msg_box_set_header(app->p_msg_box, getLangString(_L_DELETE));
         mui_msg_box_set_message(app->p_msg_box, msg);
-        mui_msg_box_set_btn_text(app->p_msg_box, getLangString(_L_CANCEL), NULL, getLangString(_L_DELETE));
-        mui_msg_box_set_btn_focus(app->p_msg_box, 2);
+        mui_msg_box_set_btn_text(app->p_msg_box, getLangString(_L_DELETE), NULL, getLangString(_L_CANCEL));
+        mui_msg_box_set_btn_focus(app->p_msg_box, 0);
         mui_msg_box_set_event_cb(app->p_msg_box, amiibo_scene_file_browser_menu_msg_box_remove_folder_event_cb);
 
         mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_MSG_BOX);
@@ -286,24 +288,24 @@ static void amiibo_scene_file_browser_menu_on_selected(mui_list_view_event_t eve
 void amiibo_scene_file_browser_menu_on_enter(void *user_data) {
     app_amiibo_t *app = user_data;
 
-    mui_list_view_add_item(app->p_list_view, 0xe1c7, string_get_cstr(app->current_file), FILE_BROWSER_MENU_FILE_NAME);
+    mui_list_view_add_item(app->p_list_view, ICON_FILE, string_get_cstr(app->current_file), FILE_BROWSER_MENU_FILE_NAME);
 
-    mui_list_view_add_item(app->p_list_view, 0xe1c8, getLangString(_L_CREATE_NEW_FOLDER),
+    mui_list_view_add_item(app->p_list_view, ICON_NEW, getLangString(_L_CREATE_NEW_FOLDER),
                            (void *)FILE_BROWSER_MENU_CREATE_FOLDER);
-    mui_list_view_add_item(app->p_list_view, 0xe1c8, getLangString(_L_CREATE_NEW_TAG),
+    mui_list_view_add_item(app->p_list_view, ICON_NEW, getLangString(_L_CREATE_NEW_TAG),
                            (void *)FILE_BROWSER_MENU_CREATE_AMIIBO);
-    mui_list_view_add_item(app->p_list_view, 0xe1c8, getLangString(_L_CREATE_NEW_TAG_BATCH),
+    mui_list_view_add_item(app->p_list_view, ICON_NEW, getLangString(_L_CREATE_NEW_TAG_BATCH),
                            (void *)FILE_BROWSER_MENU_CREATE_AMIIBO_BATCH);
     if (string_cmp_str(app->current_file, "..") != 0) {
         char txt[32];
         snprintf(txt, sizeof(txt), "%s..", getLangString(_L_RENAME));
-        mui_list_view_add_item(app->p_list_view, 0xe1c9, txt, (void *)FILE_BROWSER_MENU_RENAME_FOLDER);
+        mui_list_view_add_item(app->p_list_view, ICON_EMPTY, txt, (void *)FILE_BROWSER_MENU_RENAME_FOLDER);
         snprintf(txt, sizeof(txt), "%s..", getLangString(_L_DELETE));
-        mui_list_view_add_item(app->p_list_view, 0xe1ca, txt, (void *)FILE_BROWSER_MENU_REMOVE_FOLDER);
+        mui_list_view_add_item(app->p_list_view, ICON_DELETE, txt, (void *)FILE_BROWSER_MENU_REMOVE_FOLDER);
     }
-    mui_list_view_add_item(app->p_list_view, 0xe069, getLangString(_L_BACK_TO_FILE_LIST),
+    mui_list_view_add_item(app->p_list_view, ICON_BACK, getLangString(_L_BACK_TO_FILE_LIST),
                            (void *)FILE_BROWSER_MENU_BACK_FILE_BROWSER);
-    mui_list_view_add_item(app->p_list_view, 0xe069, getLangString(_L_BACK_TO_MAIN_MENU),
+    mui_list_view_add_item(app->p_list_view, ICON_BACK, getLangString(_L_BACK_TO_MAIN_MENU),
                            (void *)FILE_BROWSER_MENU_BACK_MAIN_MENU);
 
     mui_list_view_set_selected_cb(app->p_list_view, amiibo_scene_file_browser_menu_on_selected);