Merge pull request #206 from solosky/develop

2.9.5
solosky · Jan 20, 2024 · e68a2c2 · e68a2c2
2 parents 6c38fb1 + 7716173
commit e68a2c2
Show file tree

Hide file tree

Showing 13 changed files with 1,232 additions and 1,194 deletions.
diff --git a/fw/application/src/amiidb/db_amiibo.c b/fw/application/src/amiidb/db_amiibo.c
@@ -846,5 +846,7 @@ const db_amiibo_t amiibo_list[] = {
 {0x22410000, 0x041e0002, "Pyra", "焰"}, 
 {0x22420000, 0x041f0002, "Mythra", "光"}, 
 {0x22c00000, 0x003a0202, "Chibi Robo", "小机器人"}, 
+{0x22430000, 0x043d1b02, "Noah", "诺亚"}, 
+{0x22440000, 0x043e1b02, "Mio", "弥央"}, 
 {0, 0, 0, 0}
 };
diff --git a/fw/application/src/amiidb/db_game.c b/fw/application/src/amiidb/db_game.c
@@ -18,7 +18,7 @@ const db_game_t game_list[] = {
 {16, 0, "Fire Emblem Engage", "火焰纹章：结合", 80, 13}, 
 {17, 0, "Conga Master Party", "康茄大师派对", 1, 14}, 
 {18, 0, "Diablo3/Diablo III", "暗黑破坏神 3", 85, 1}, 
-{19, 0, "Xenoblade Chronicles 3", "异度神剑3", 45, 3}, 
+{19, 0, "Xenoblade Chronicles 3", "异度神剑3", 45, 5}, 
 {20, 0, "Cyber Shadow", "赛博暗影", 1, 5}, 
 {21, 0, "Just Shapes Beats", "形状节奏", 1, 5}, 
 {22, 0, "Kirby and the Forgotten Land", "星之卡比：探索发现", 1, 5}, 

diff --git a/fw/application/src/amiidb/db_link.c b/fw/application/src/amiidb/db_link.c
@@ -217,6 +217,8 @@ const db_link_t link_list[] = {
 {19, 0x22420000, 0x041f0002, "", "解锁光之圣杯"}, 
 {19, 0x22410000, 0x041e0002, "", "解锁天之圣杯"}, 
 {19, 0x22400000, 0x002b0002, "", "解锁蒙那多"}, 
+{19, 0x22430000, 0x043d1b02, "", "解锁执政官N服装/诺亚、兰兹、优妮的休闲装"}, 
+{19, 0x22440000, 0x043e1b02, "", "解锁执政官M服装/弥央、圣奈、泰恩的休闲装"}, 
 {20, 0x35c30000, 0x036e0a02, "", "暂无简介"}, 
 {20, 0x35c10000, 0x036c0a02, "", "暂无简介"}, 
 {20, 0x35c00000, 0x02500a02, "", "暂无简介"}, 

diff --git a/fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c b/fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c
@@ -66,6 +66,7 @@ static void amiibo_scene_file_browser_reload_folders(app_amiibo_t *app) {
     }
 
     mui_list_view_sort(app->p_list_view, amiibo_scene_file_browser_list_item_cmp);
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_LIST);
 }
 
 static void amiibo_scene_file_browser_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
@@ -119,7 +120,6 @@ void amiibo_scene_file_browser_on_enter(void *user_data) {
     mui_list_view_set_focus(app->p_list_view, app->current_focus_index);
 
     NRF_LOG_INFO("%X", app);
-    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_LIST);
 }
 
 void amiibo_scene_file_browser_on_exit(void *user_data) {

diff --git a/fw/application/src/app/settings/scene/settings_scene_main.c b/fw/application/src/app/settings/scene/settings_scene_main.c
@@ -174,7 +174,13 @@ static void settings_scene_main_reload(void *user_data) {
                                p_settings->hibernate_enabled ? _T(ON_F) : _T(OFF_F),
                                (void *)SETTINGS_MAIN_MENU_ENABLE_HIBERNATE);
 
-    snprintf(txt, sizeof(txt), "[%ds]", nrf_pwr_mgmt_get_timeout());
+    if (nrf_pwr_mgmt_get_timeout() == 0) {
+        snprintf(txt, sizeof(txt), "%s", getLangString(_L_OFF_F));
+    } else if (nrf_pwr_mgmt_get_timeout() > 0 && nrf_pwr_mgmt_get_timeout() < 60) {
+        snprintf(txt, sizeof(txt), "[%ds]", nrf_pwr_mgmt_get_timeout());
+    } else {
+        snprintf(txt, sizeof(txt), "[%dm]", nrf_pwr_mgmt_get_timeout() / 60);
+    }
     mui_list_view_add_item_ext(app->p_list_view, 0xe1c9, _T(APP_SET_SLEEP_TIMEOUT), txt,
                                (void *)SETTINGS_MAIN_MENU_SLEEP_TIMEOUT);
 

diff --git a/fw/application/src/app/settings/scene/settings_scene_sleep_timeout.c b/fw/application/src/app/settings/scene/settings_scene_sleep_timeout.c
@@ -14,6 +14,7 @@ enum settings_sleep_timeout_menu_t {
     SETTINGS_SLEEP_TIMEOUT_MENU_1MIN,
     SETTINGS_SLEEP_TIMEOUT_MENU_2MIN,
     SETTINGS_SLEEP_TIMEOUT_MENU_3MIN,
+    SETTINGS_SLEEP_TIMEOUT_MENU_OFF,
     SETTINGS_SLEEP_TIMEOUT_MENU_EXIT
 };
 
@@ -52,13 +53,19 @@ static void settings_scene_sleep_timeout_list_view_on_selected(mui_list_view_eve
         p_settings->sleep_timeout_sec = 180;
         nrf_pwr_mgmt_set_timeout(180);
         break;
+
+    case SETTINGS_SLEEP_TIMEOUT_MENU_OFF:
+        p_settings->sleep_timeout_sec = 0;
+        nrf_pwr_mgmt_set_timeout(0);
+        break;
     }
     mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
 }
 
 void settings_scene_sleep_timeout_on_enter(void *user_data) {
 
     app_settings_t *app = user_data;
+    mui_list_view_add_item(app->p_list_view, 0xe105, getLangString(_L_OFF), (void *)SETTINGS_SLEEP_TIMEOUT_MENU_OFF);
     mui_list_view_add_item(app->p_list_view, 0xe105, getLangString(_L_15S), (void *)SETTINGS_SLEEP_TIMEOUT_MENU_15S);
     mui_list_view_add_item(app->p_list_view, 0xe105, getLangString(_L_30S), (void *)SETTINGS_SLEEP_TIMEOUT_MENU_30S);
     mui_list_view_add_item(app->p_list_view, 0xe105, getLangString(_L_45S), (void *)SETTINGS_SLEEP_TIMEOUT_MENU_45S);

diff --git a/fw/application/src/mod/settings.c b/fw/application/src/mod/settings.c
@@ -40,7 +40,7 @@ settings_data_t m_settings_data = {0};
     }
 
 static void validate_settings() {
-    if (m_settings_data.sleep_timeout_sec == 0 || m_settings_data.sleep_timeout_sec > 180) {
+    if (m_settings_data.sleep_timeout_sec > 180) {
         m_settings_data.sleep_timeout_sec = 30;
     }
 

diff --git a/fw/application/src/mui/mui_anim.c b/fw/application/src/mui/mui_anim.c
@@ -155,6 +155,13 @@ static void mui_anim_tick_handler() {
                     p_anim->run_cnt = 0;
                 }else {
                     // reached end of animation
+                    if(p_anim->current_value != p_anim->end_value){
+                        p_anim->current_value = p_anim->end_value;
+                        p_anim->exec_cb(p_anim->var, p_anim->end_value);
+                        mui_update_required = true;
+                        NRF_LOG_INFO("ANIM FIX");
+                    }
+
                     mui_anim_ptr_array_remove(m_anim_ptr_array, it);
                 }
             }