diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c index 5106cec48..a2ff87a26 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c @@ -155,8 +155,8 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = { { "Русский", 14 }, /* LV_PLUGIN_STRING_ID_STRID_LANG_RU */ { "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */ { "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */ - { "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */ - { "PC Camera", 9 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */ + { "MSDC", 4 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */ + { "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */ { "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */ { "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */ { "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr index 458a060eb..1d0159a79 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr @@ -60,7 +60,7 @@ "state": 6 } ], - "text": "PC-ACM", + "text": "MSDC", "widget": "Label" }, { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang index 0f9ceb0bc..f42489480 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -422,8 +422,8 @@ "Русский", "USB", "PC Mode", + "MSDC", "PC-ACM", - "PC Camera", "Pictbridge", "Power Charging", "TV Mode", diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c index d0d024e5b..468f1d25d 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c @@ -115,7 +115,7 @@ lv_obj_t* UIFlowUSB_create(){ lv_obj_set_drag(label_usbmode, false); lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_set_text(label_usbmode, LV_PLUGIN_STRING_ID_STRID_MSDC); - lv_label_set_text(label_usbmode,"PC-ACM"); + lv_label_set_text(label_usbmode,"MSDC"); lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_label_set_align(label_usbmode, LV_LABEL_ALIGN_CENTER); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c index ed6b0aa65..5bdea0211 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c @@ -22,7 +22,7 @@ static void UIFlowUsb_Key(lv_obj_t* obj, uint32_t key) switch(key) { - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: if((System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_USBMSDC)){ Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC); }