Merge pull request solosky#212 from solosky/develop

2.10.0

Author: solosky

.vscode/settings.json

@@ -29,6 +29,11 @@
         "functional": "c",
         "tuple": "c",
         "type_traits": "c",
-        "utility": "c"
+        "utility": "c",
+        "mui_list_view.h": "c",
+        "nrf_log.h": "c",
+        "string.h": "c",
+        "math.h": "c",
+        "mlib_common.h": "c"
     }
 }

fw/application/Makefile

@@ -211,6 +211,7 @@ SRC_FILES += \
   $(PROJ_DIR)/mui/mui_mem.c \
   $(PROJ_DIR)/mui/mui_anim.c \
   $(PROJ_DIR)/mui/mui_math.c \
+  $(PROJ_DIR)/mui/mui_resource.c \
   $(PROJ_DIR)/mui/view/mui_list_view.c \
   $(PROJ_DIR)/mui/view/mui_text_input.c \
   $(PROJ_DIR)/mui/view/mui_msg_box.c \
@@ -275,6 +276,7 @@ SRC_FILES += \
   $(PROJ_DIR)/app/chameleon/port/fds_utils.c \
   $(PROJ_DIR)/app/chameleon/port/tag_helper.c \
   $(PROJ_DIR)/app/desktop/app_desktop.c \
+  $(PROJ_DIR)/app/desktop/view/app_list_view.c \
   $(PROJ_DIR)/app/amiibo/app_amiibo.c \
   $(PROJ_DIR)/app/amiibo/view/amiibo_detail_view.c \
   $(PROJ_DIR)/app/amiibo/scene/amiibo_scene.c \
@@ -541,6 +543,7 @@ INC_FOLDERS += \
   $(PROJ_DIR)/app/ble/scene \
   $(PROJ_DIR)/app/ble/view \
   $(PROJ_DIR)/app/desktop \
+  $(PROJ_DIR)/app/desktop/view \
   $(PROJ_DIR)/app/settings \
   $(PROJ_DIR)/app/settings/scene \
   $(PROJ_DIR)/app/amiibo \
@@ -721,6 +724,11 @@ ota:
 full: settingsgen
 	mergehex --merge $(OUTPUT_DIRECTORY)/settings.hex $(OUTPUT_DIRECTORY)/bootloader.hex $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex $(OUTPUT_DIRECTORY)/pixljs.hex --output $(OUTPUT_DIRECTORY)/pixljs_all.hex
 
+gen:
+	python3 ../scripts/amiibo_db_gen.py
+	python3 ../scripts/i18n_gen.py
+	python3 ../scripts/resource_gen.py
+
 flash_ocd: default
 	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit
 

fw/application/src/app/amiibo/app_amiibo.c

@@ -151,6 +151,7 @@ mini_app_t app_amiibo_info = {.id = MINI_APP_ID_AMIIBO,
                               .sys = false,
                               .deamon = false,
                               .hibernate_enabled = true,
+                              .icon_32x32 = &app_amiibo_emulator_32x32,
                               .run_cb = app_amiibo_on_run,
                               .kill_cb = app_amiibo_on_kill,
                               .on_event_cb = app_amiibo_on_event};

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

@@ -142,7 +142,7 @@ static void amiibo_scene_amiibo_detail_menu_on_selected(mui_list_view_event_t ev
         sprintf(msg, _T(DELETE_TAG_CONFIRM), string_get_cstr(app->current_file));
         mui_msg_box_set_message(app->p_msg_box, msg);
         mui_msg_box_set_btn_text(app->p_msg_box, _T(CONFIRM), NULL, _T(CANCEL));
-        mui_msg_box_set_btn_focus(app->p_msg_box, 0);
+        mui_msg_box_set_btn_focus(app->p_msg_box, 2);
         mui_msg_box_set_event_cb(app->p_msg_box, amiibo_scene_amiibo_detail_delete_tag_confirmed);
 
         mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_MSG_BOX);

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

@@ -259,7 +259,7 @@ static void amiibo_scene_file_browser_menu_on_selected(mui_list_view_event_t eve
         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_DELETE), NULL, getLangString(_L_CANCEL));
-        mui_msg_box_set_btn_focus(app->p_msg_box, 0);
+        mui_msg_box_set_btn_focus(app->p_msg_box, 2);
         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);

fw/application/src/app/amiibolink/app_amiibolink.c

@@ -87,6 +87,7 @@ mini_app_t app_amiibolink_info = {.id = MINI_APP_ID_AMIIBOLINK,
                                         .deamon = false,
                                         .sys = false,
                                         .hibernate_enabled = true,
+                                        .icon_32x32 = &app_amiibo_link_32x32,
                                         .run_cb = app_amiibolink_on_run,
                                         .kill_cb = app_amiibolink_on_kill,
                                         .on_event_cb = app_amiibolink_on_event};

fw/application/src/app/amiidb/app_amiidb.c

@@ -155,6 +155,7 @@ const mini_app_t app_amiidb_info = {.id = MINI_APP_ID_AMIIDB,
                                     .sys = false,
                                     .deamon = false,
                                     .hibernate_enabled = false,
+                                    .icon_32x32 = &app_amiibo_database_32x32,
                                     .run_cb = app_amiidb_on_run,
                                     .kill_cb = app_amiidb_on_kill,
                                     .on_event_cb = app_amiidb_on_event};

fw/application/src/app/amiidb/scene/amiidb_scene_fav_list_menu.c

@@ -70,7 +70,7 @@ static void amiidb_scene_fav_list_menu_msg_box(app_amiidb_t *app, const char *he
     mui_msg_box_set_message(app->p_msg_box, msg);
     mui_msg_box_set_btn_text(app->p_msg_box, getLangString(_L_APP_AMIIDB_CONFIRM), NULL,
                              getLangString(_L_APP_AMIIDB_CANCEL));
-    mui_msg_box_set_btn_focus(app->p_msg_box, 0);
+    mui_msg_box_set_btn_focus(app->p_msg_box, 2);
     mui_msg_box_set_event_cb(app->p_msg_box, cb);
 
     mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_MSG_BOX);

fw/application/src/app/ble/app_ble.c

@@ -54,6 +54,7 @@ mini_app_t app_ble_info = {.id = MINI_APP_ID_BLE,
                                  .deamon = false,
                                  .sys = false,
                                  .hibernate_enabled = false,
+                                 .icon_32x32 = &app_ble_transfer_32x32,
                                  .run_cb = app_ble_on_run,
                                  .kill_cb = app_ble_on_kill,
                                  .on_event_cb = app_ble_on_event};

fw/application/src/app/chameleon/app_chameleon.c

@@ -105,6 +105,7 @@ mini_app_t app_chameleon_info = {.id = MINI_APP_ID_CHAMELEON,
                                  .deamon = false,
                                  .sys = false,
                                  .hibernate_enabled = true,
+                                 .icon_32x32 = &app_card_emulator_32x32,
                                  .run_cb = app_chameleon_on_run,
                                  .kill_cb = app_chameleon_on_kill,
                                  .on_event_cb = app_chameleon_on_event};