fix(color): USB SD card mode may crash to emergency mode (#7657)

radio/src/gui/colorlcd/mainview/view_main.cpp

@@ -31,6 +31,15 @@
 #include "view_channels.h"
 #include "widget.h"
 
+static void saveViewId(unsigned view)
+{
+  if (view != g_model.view) {
+    TRACE("save view #%d", view);
+    g_model.view = view;
+    storageDirty(EE_MODEL);
+  }
+}
+
 static void tile_view_deleted_cb(lv_event_t* e)
 {
   lv_obj_t* target = lv_event_get_target(e);
@@ -44,15 +53,6 @@ static void tile_view_deleted_cb(lv_event_t* e)
   }
 }
 
-static void saveViewId(unsigned view)
-{
-  if (view != g_model.view) {
-    TRACE("save view #%d", view);
-    g_model.view = view;
-    storageDirty(EE_MODEL);
-  }
-}
-
 static void tile_view_scroll_begin(lv_event_t * e)
 {
 	lv_anim_t* a = (lv_anim_t*)lv_event_get_param(e);
@@ -100,8 +100,7 @@ ViewMain::ViewMain() :
   lv_obj_set_user_data(tile_view, this);
   lv_obj_add_event_cb(tile_view, tile_view_scroll_begin, LV_EVENT_SCROLL_BEGIN, NULL);
   lv_obj_add_event_cb(tile_view, tile_view_scroll, LV_EVENT_SCROLL, nullptr);
-  lv_obj_add_event_cb(tile_view, tile_view_scroll_end, LV_EVENT_SCROLL_END,
-                      nullptr);
+  lv_obj_add_event_cb(tile_view, tile_view_scroll_end, LV_EVENT_SCROLL_END, nullptr);
 
   // create last to be on top
   topbar = new TopBar(this);
@@ -268,24 +267,20 @@ void ViewMain::onCancel()
 
 void ViewMain::refreshWidgetSelectTimer()
 {
-  if (!widget_select_timer) {
-    widget_select_timer = lv_timer_create(ViewMain::ws_timer, 10 * 1000, this);
-  } else {
-    lv_timer_reset(widget_select_timer);
-  }
+  widgetSelectCancelTime = get_tmr10ms() + 1000; // 10 seconds
 }
 
-bool ViewMain::enableWidgetSelect(bool enable)
+void ViewMain::enableWidgetSelect(bool enable)
 {
   TRACE("enableWidgetSelect(%d)", enable);
-  if (widget_select == enable) return false;
+  if (widget_select == enable) return;
   widget_select = enable;
 
   lv_obj_t* tile = lv_tileview_get_tile_act(tile_view);
-  if (!tile) return true;
+  if (!tile) return;
 
   auto cont_obj = lv_obj_get_child(tile, 0);
-  if (!cont_obj) return true;
+  if (!cont_obj) return;
 
   auto cont = (WidgetsContainer*)lv_obj_get_user_data(cont_obj);
 
@@ -306,20 +301,8 @@ bool ViewMain::enableWidgetSelect(bool enable)
     lv_obj_add_flag(tile_view, LV_OBJ_FLAG_SCROLL_CHAIN_HOR);
     lv_obj_add_flag(tile_view, LV_OBJ_FLAG_SCROLL_CHAIN_VER);
 
-    if (widget_select_timer) {
-      lv_timer_del(widget_select_timer);
-      widget_select_timer = nullptr;
-    }
+    widgetSelectCancelTime = 0;
   }
-
-  return true;
-}
-
-void ViewMain::ws_timer(lv_timer_t* t)
-{
-  ViewMain* view = (ViewMain*)t->user_data;
-  if (!view) return;
-  view->enableWidgetSelect(false);
 }
 
 bool ViewMain::onLongPress()
@@ -393,6 +376,8 @@ void ViewMain::_refreshWidgets()
       if (customScreens[i])
         customScreens[i]->refreshWidgets(isVisible);
     }
+    if (widget_select && widgetSelectCancelTime < get_tmr10ms())
+      enableWidgetSelect(false);
   }
 }
 

radio/src/gui/colorlcd/mainview/view_main.h

@@ -43,7 +43,7 @@ class ViewMain : public NavWindow
   void addMainView(WidgetsContainer* view, uint32_t viewId);
 
   void updateTopbarVisibility();
-  bool enableWidgetSelect(bool enable);
+  void enableWidgetSelect(bool enable);
 
   unsigned getMainViewsCount() const;
   unsigned getCurrentMainView() const;
@@ -78,7 +78,7 @@ class ViewMain : public NavWindow
   lv_obj_t* tile_view = nullptr;
   TopBar* topbar = nullptr;
   bool widget_select = false;
-  lv_timer_t* widget_select_timer = nullptr;
+  tmr10ms_t widgetSelectCancelTime = 0;
 
   // Set topbar visibility [0.0 -> 1.0]
   void setTopbarVisible(float visible);
@@ -86,8 +86,6 @@ class ViewMain : public NavWindow
 
   void _refreshWidgets();
 
-  static void ws_timer(lv_timer_t* t);
-
 #if defined(HARDWARE_KEYS)
   void doKeyShortcut(event_t event) override;
   void onPressPGUP() override;