Merge branch 'solosky:develop' into develop

Author: James-Makoto

fw/application/Makefile

@@ -293,6 +293,7 @@ SRC_FILES += \
   $(PROJ_DIR)/app/settings/scene/settings_scene_oled_contrast.c \
   $(PROJ_DIR)/app/settings/scene/settings_scene_language.c \
   $(PROJ_DIR)/app/settings/scene/settings_scene_storage.c \
+  $(PROJ_DIR)/app/settings/scene/settings_scene_about.c \
   $(PROJ_DIR)/i18n/en_US.c \
   $(PROJ_DIR)/i18n/zh_Hans.c \
   $(PROJ_DIR)/i18n/zh_TW.c \
@@ -729,6 +730,7 @@ full: settingsgen
 gen:
 	python3 ../scripts/amiibo_db_gen.py
 	python3 ../scripts/i18n_gen.py
+	python3 ../scripts/font_data_gen.py
 	python3 ../scripts/resource_gen.py
 
 flash_ocd: default

fw/application/src/app/chameleon/port/tag_helper.c

@@ -15,18 +15,19 @@ const static tag_specific_type_name_t tag_type_names[] = {
     {TAG_TYPE_MIFARE_2048, "MF 2K", "MiFare 2K", 128 * NFC_TAG_MF1_DATA_SIZE},
     {TAG_TYPE_MIFARE_4096, "MF 4K", "MiFare 4K", 256 * NFC_TAG_MF1_DATA_SIZE},
     // NTAG series
-    {TAG_TYPE_NTAG_210, "N210", "NTAG 210", NTAG210_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_212, "N212", "NTAG 212", NTAG212_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_213, "N213", "NTAG 213", NTAG213_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_215, "N215", "NTAG 215", NTAG215_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_216, "N216", "NTAG 216", NTAG216_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-   
-    {TAG_TYPE_MF0ICU1, "ICU1", "MF0ICU1", MF0ICU1_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_MF0ICU2, "ICU2", "MF0ICU2", MF0ICU2_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_MF0UL11,"UL11", "MFOUL11", MF0UL11_PAGES * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_MF0UL21,"UL21", "MF0UL21", MF0UL21_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_210, "N210", "NTAG 210", NTAG210_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_212, "N212", "NTAG 212", NTAG212_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_213, "N213", "NTAG 213", NTAG213_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_215, "N215", "NTAG 215", NTAG215_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_216, "N216", "NTAG 216", NTAG216_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+
+    {TAG_TYPE_MF0ICU1, "MFUL", "Mifare Ultralight", MF0ICU1_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0ICU2, "MFULC", "Mifare Ultralight C", MF0ICU2_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0UL11, "MFEV11", "Mifare Ultralight EV1 (640 bit)", MF0UL11_PAGES *NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0UL21, "MFEV21", "Mifare Ultralight EV1 (1312 bit)", MF0UL21_PAGES *NFC_TAG_NTAG_DATA_SIZE},
 
 };
+
 // typedef enum {
 //     NFC_TAG_MF1_WRITE_NORMAL    = 0u,
 //     NFC_TAG_MF1_WRITE_DENIED    = 1u,
@@ -45,15 +46,11 @@ const tag_specific_type_t hf_tag_specific_types[] = {
     // Specific and necessary signs do not exist
     TAG_TYPE_UNDEFINED,
     // MiFare series
-    TAG_TYPE_MIFARE_Mini,
-    TAG_TYPE_MIFARE_1024,
-    TAG_TYPE_MIFARE_2048,
-    TAG_TYPE_MIFARE_4096,
+    TAG_TYPE_MIFARE_Mini, TAG_TYPE_MIFARE_1024, TAG_TYPE_MIFARE_2048, TAG_TYPE_MIFARE_4096,
     // NTAG series
-    TAG_TYPE_NTAG_213,
-    TAG_TYPE_NTAG_215,
-    TAG_TYPE_NTAG_216,
-};
+    TAG_TYPE_NTAG_210, TAG_TYPE_NTAG_212, TAG_TYPE_NTAG_213, TAG_TYPE_NTAG_215, TAG_TYPE_NTAG_216,
+
+    TAG_TYPE_MF0ICU1, TAG_TYPE_MF0ICU2, TAG_TYPE_MF0UL11, TAG_TYPE_MF0UL21};
 
 tag_group_type_t tag_helper_get_tag_group_type(tag_specific_type_t tag_type) {
     if (tag_type == TAG_TYPE_MIFARE_Mini || tag_type == TAG_TYPE_MIFARE_1024 || tag_type == TAG_TYPE_MIFARE_2048 ||

fw/application/src/app/chameleon/port/tag_helper.h

@@ -6,8 +6,7 @@
 #include "nfc_mf1.h"
 #include "tag_base_type.h"
 
-#define TAG_TYPE_MAX 9
-#define TAG_TYPE_HF_MAX 8
+#define TAG_TYPE_HF_MAX 13
 #define SLOT_MAX 8
 
 typedef struct {

fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_type.c

@@ -66,7 +66,7 @@ void chameleon_scene_menu_card_type_on_enter(void *user_data) {
     app_chameleon_t *app = user_data;
 
     // 0 is unkown...
-    for (uint32_t i = 1; i < TAG_TYPE_HF_MAX; i++) {
+    for (uint32_t i = 1; i < TAG_TYPE_HF_MAX + 1; i++) {
         const tag_specific_type_name_t *tag_name = tag_helper_get_tag_type_name(hf_tag_specific_types[i]);
         mui_list_view_add_item(app->p_list_view, ICON_FILE, tag_name->long_name, (void *)CHAMELEON_MENU_CARD_TYPE);
     }

fw/application/src/app/settings/scene/settings_scene_about.c

@@ -0,0 +1,37 @@
+#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 "utils2.h"
+#include "version2.h"
+#include "mui_icons.h"
+
+
+static void settings_scene_about_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;
+    if(p_item->icon == ICON_BACK){
+        mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
+    }
+}
+
+void settings_scene_about_on_enter(void *user_data) {
+
+    app_settings_t *app = user_data;
+
+    mui_list_view_add_item(app->p_list_view, ICON_FILE, _T(APP_SET_ABOUT_OPEN_SOURCE_PROJECT), NULL_USER_DATA);
+    mui_list_view_add_item(app->p_list_view, ICON_FILE, _T(APP_SET_ABOUT_LGPL_LICENSE), NULL_USER_DATA);
+    mui_list_view_add_item(app->p_list_view, ICON_FILE, "github.com/solosky/pixl.js", NULL_USER_DATA);
+    mui_list_view_add_item(app->p_list_view, ICON_BACK, getLangString(_L_BACK), NULL_USER_DATA);
+
+    mui_list_view_set_selected_cb(app->p_list_view, settings_scene_about_list_view_on_selected);
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MAIN);
+}
+
+void settings_scene_about_on_exit(void *user_data) {
+    app_settings_t *app = user_data;
+    mui_list_view_clear_items(app->p_list_view);
+    mui_list_view_set_selected_cb(app->p_list_view, NULL);
+}

fw/application/src/app/settings/scene/settings_scene_config.h

@@ -8,4 +8,5 @@ ADD_SCENE(settings, lcd_backlight, LCD_BACKLIGHT)
     ADD_SCENE(settings, oled_contrast, OLED_CONTRAST)
 #endif
 ADD_SCENE(settings, language, LANGUAGE)
-ADD_SCENE(settings, storage, STORAGE)
+ADD_SCENE(settings, storage, STORAGE)
+ADD_SCENE(settings, about, ABOUT)

fw/application/src/app/settings/scene/settings_scene_main.c

@@ -22,6 +22,7 @@ enum settings_main_menu_t {
     SETTINGS_MAIN_MENU_DFU,
     SETTINGS_MAIN_MENU_REBOOT,
     SETTINGS_MAIN_MENU_RESET_DEFAULT,
+    SETTINGS_MAIN_MENU_ABOUT,
     SETTINGS_MAIN_MENU_EXIT
 };
 
@@ -128,9 +129,11 @@ static void settings_scene_main_list_view_on_selected(mui_list_view_event_t even
         mui_msg_box_set_event_cb(app->p_msg_box, settings_scene_main_msg_box_reset_settings_cb);
 
         mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MSG_BOX);
-    }
+    } break;
 
-    break;
+    case SETTINGS_MAIN_MENU_ABOUT: {
+        mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, SETTINGS_SCENE_ABOUT);
+    } break;
     }
 }
 
@@ -207,6 +210,8 @@ static void settings_scene_main_reload(void *user_data) {
     mui_list_view_add_item(app->p_list_view, 0xe1ce, _T(APP_SET_RESET_DEFAULT),
                            (void *)SETTINGS_MAIN_MENU_RESET_DEFAULT);
 
+    mui_list_view_add_item(app->p_list_view, 0xe1cf, _T(APP_SET_ABOUT), (void *)SETTINGS_MAIN_MENU_ABOUT);
+
     mui_list_view_add_item(app->p_list_view, 0xe069, _T(BACK_TO_MAIN_MENU), (void *)SETTINGS_MAIN_MENU_EXIT);
 
     mui_list_view_set_focus(app->p_list_view, foucs_index);

fw/application/src/i18n/de_DE.c

@@ -31,6 +31,9 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_APP_SET_RESET_DEFAULT] = "Standardeinstellungen",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Einstellungen zurückgesetzt!",
     [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Auf Standardeinstellungen zurücksetzen?",
+    [_L_APP_SET_ABOUT] = "",
+    [_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "",
+    [_L_APP_SET_ABOUT_LGPL_LICENSE] = "",
     [_L_15S] = "15 Sekunden",
     [_L_30S] = "30 Sekunden",
     [_L_45S] = "45 Sekunden",

fw/application/src/i18n/en_US.c

@@ -31,6 +31,9 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_APP_SET_RESET_DEFAULT] = "Reset Default Setting",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Reset Success!",
     [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Confirm Reset Settings?",
+    [_L_APP_SET_ABOUT] = "About Device",
+    [_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "Open Source Project",
+    [_L_APP_SET_ABOUT_LGPL_LICENSE] = "GPL 2.0 License",
     [_L_15S] = "15 Seconds",
     [_L_30S] = "30 Seconds",
     [_L_45S] = "45 Seconds",

fw/application/src/i18n/es_ES.c

@@ -22,15 +22,18 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_SET_LCD_BACKLIGHT_TITLE] = "Brillo de fondo",
     [_L_APP_SET_ANIM] = "Animar menú",
     [_L_APP_SET_LIPO_BAT] = "Batería LiPO",
-    [_L_APP_SET_SHOW_MEM_USAGE] = "Mem. usada",
+    [_L_APP_SET_SHOW_MEM_USAGE] = "Estad. Mem.",
     [_L_APP_SET_HIBERNATE] = "Hibernar",
     [_L_APP_SET_SLEEP_TIMEOUT] = "Dormir en:",
     [_L_APP_SET_LANGUAGE] = "Idioma",
     [_L_APP_SET_DFU] = "Actualizar firmware",
     [_L_APP_SET_REBOOT] = "Reiniciar",
     [_L_APP_SET_RESET_DEFAULT] = "Restablecer config.",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "¡Configuración Restablecida!",
-    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "¿Confirma Restablecer\nConfig.?",
+    [_L_APP_SET_ABOUT] = "Acerca del dispositivo",
+    [_L_APP_SET_ABOUT_OPEN_SOURCE_PROJECT] = "Poyecto de código abierto",
+    [_L_APP_SET_ABOUT_LGPL_LICENSE] = "Licencia GPL 2.0",
     [_L_15S] = "15 segundos",
     [_L_30S] = "30 segundos",
     [_L_45S] = "45 segundos",
@@ -44,7 +47,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_AUTO_RANDOM_GENERATION] = "Serial alea. aut",
     [_L_SHOW_QRCODE] = "Mostrar QR",
     [_L_DELETE_TAG] = "Borrar amiibo...",
-    [_L_DELETE_TAG_CONFIRM] = "¿\nBorrar %s\n?",
+    [_L_DELETE_TAG_CONFIRM] = "¿Borrar %s?",
     [_L_BACK_TO_DETAILS] = "[Detalles amiibo]",
     [_L_BACK_TO_FILE_LIST] = "[Lista Archivos]",
     [_L_BACK_TO_MAIN_MENU] = "[Menú Principal]",
@@ -65,7 +68,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_READ_FILE_FAILED] = "Error al leer archivo",
     [_L_INPUT_FOLDER_NAME] = "Nombre carpeta:",
     [_L_INPUT_AMIIBO_NAME] = "Nombre amiibo:",
-    [_L_DELETE_FILE] = "¿Borrar el %s ?",
+    [_L_DELETE_FILE] = "¿Borrar %s?",
     [_L_DELETE] = "Borrar...",
     [_L_TIPS] = "Confirmar",
     [_L_INPUT_NEW_NAME] = "Nuevo nombre:",
@@ -75,7 +78,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_CREATE_NEW_TAG_BATCH] = "Crear amiibo en lote...",
     [_L_INPUT_TAG_NUM] = "¿Cuántos?",
     [_L_CREATE_TOO_MANY_NUM] = "Sólo se puede crear %d en lote",
-    [_L_CREATING_TAG_BATCH] = "Creando",
+    [_L_CREATING_TAG_BATCH] = "Creando...",
     [_L_CREATING_TAG_FAILED] = "¡Error al crear %s!",
     [_L_RENAME] = "Renombrar...",
     [_L_OPEN_FOLDER_FAILED] = "Fallo al abrir carpeta",
@@ -85,8 +88,8 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_RANDOM_MODE_AUTO] = "Aleatorio (Auto.)",
     [_L_SEQUENCE_MODE] = "Modo Secuencial",
     [_L_READ_WRITE_MODE] = "Modo Lectura/Escrit.",
-    [_L_AMIIBOLINK_V1] = "V1",
-    [_L_AMIIBOLINK_V2] = "V2",
+    [_L_AMIIBOLINK_V1] = "AmiiboLink V1",
+    [_L_AMIIBOLINK_V2] = "AmiiboLink V2",
     [_L_AMILOOP] = "AmiLoop",
     [_L_MODE] = "Modo",
     [_L_AUTO_RANDOM] = "Aleat. autom.",
@@ -129,8 +132,8 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_EMPTY_MSG] = "¿Vaciar Carp. Favoritos?",
     [_L_APP_AMIIDB_FAV_DELETE_MSG] = "¿Confirma borrado?",
     [_L_APP_AMIIDB_FAV_SELECT_FOLDER] = "Selec. carp. favoritos...",
-    [_L_APP_AMIIDB_FAV_SUCCESS] = "¡Favorito correcto!",
-    [_L_APP_AMIIDB_FAV_FAILED] = "¡Favorito fallido!",
+    [_L_APP_AMIIDB_FAV_SUCCESS] = "¡Adicionado a Favoritos!",
+    [_L_APP_AMIIDB_FAV_FAILED] = "¡Fallo al adicionar\na Favoritos!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Asignación correcta",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "¡Asignación fallida!",
     [_L_APP_CHAMELEON] = "Emular Etiqueta RFID",
@@ -156,14 +159,14 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_CHAMELEON_CARD_DATA_FACTORY_SUCCESS] = "¡Datos inicializados!",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_NOT_FOUND] = "Archivo no encontrado",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_SIZE_NOT_MATCH] = "Tamaño archivo incorrecto",
-    [_L_APP_CHAMELEON_CARD_DATA_LOAD_FAILED] = "Falla carga archivo",
+    [_L_APP_CHAMELEON_CARD_DATA_LOAD_FAILED] = "Falla al cargar archivo",
     [_L_APP_CHAMELEON_CARD_DATA_LOAD_SUCCESS] = "Carga archivo correcta",
     [_L_APP_CHAMELEON_CARD_DATA_SAVE_INPUT_FILE_NAME] = "Nombre archivo:",
     [_L_APP_CHAMELEON_CARD_DATA_SAVE_FAILED] = "¡Error al guardar!",
     [_L_APP_CHAMELEON_CARD_DATA_SAVE_SUCCESS] = "Guardado correcto",
     [_L_APP_CHAMELEON_CARD_ADV_CUSTOM_MODE] = "Modo personali.",
     [_L_APP_CHAMELEON_CARD_GEN1A_MODE] = "Gen1A habilitada",
-    [_L_APP_CHAMELEON_CARD_GENERATE_UID] = "Generar nuevo UID",
+    [_L_APP_CHAMELEON_CARD_GENERATE_UID] = "Generar UID aleat.",
     [_L_APP_CHAMELEON_CARD_GENERATE_UID_SUCCESS] = "UID generado",
     [_L_APP_CHAMELEON_CARD_GEN2_MODE] = "Gen2 habilitada",
     [_L_APP_CHAMELEON_CARD_WRITE_MODE] = "Modo escrit.",