diff --git a/code/application/source/cardv/Makefile b/code/application/source/cardv/Makefile index b759a0e1c..4b31af912 100755 --- a/code/application/source/cardv/Makefile +++ b/code/application/source/cardv/Makefile @@ -284,6 +284,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.c \ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index ffd53f735..d5ab81f8f 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -26,9 +26,9 @@ TMDEF_OPTION_TEXT_S(NIGHT_MODE_MAX_RANGE, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(NIGHT_MODE_BALANCE, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(NIGHT_MODE_MINBLUR, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() -TMDEF_BEGIN_OPTIONS(FLASH_PWOER) -TMDEF_OPTION_TEXT_S(FLASH_PWOER_HIGH, TM_OPTION_ENABLE) -TMDEF_OPTION_TEXT_S(FLASH_PWOER_LOW, TM_OPTION_ENABLE) +TMDEF_BEGIN_OPTIONS(FLASH_POWER) +TMDEF_OPTION_TEXT_S(FLASH_POWER_HIGH, TM_OPTION_ENABLE) +TMDEF_OPTION_TEXT_S(FLASH_POWER_LOW, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(SENSITIVITY) TMDEF_OPTION_TEXT_S(SENSITIVITY, TM_OPTION_ENABLE) @@ -55,7 +55,7 @@ TMDEF_ITEM_TEXTID(IMAGE_SIZE) TMDEF_ITEM_TEXTID(VIDEO_SIZE) TMDEF_ITEM_TEXTID(VIDEA_LENGTH) TMDEF_ITEM_TEXTID(NIGHT_MODE) -TMDEF_ITEM_TEXTID(FLASH_PWOER) +TMDEF_ITEM_TEXTID(FLASH_POWER) TMDEF_ITEM_TEXTID(SENSITIVITY) TMDEF_ITEM_TEXTID(DELAY) TMDEF_ITEM_TEXTID(OPERATING_TIME) @@ -105,7 +105,7 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { break; } - case IDM_FLASH_PWOER: + case IDM_FLASH_POWER: { break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h index 8bc04356d..01a43b9b7 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h @@ -114,13 +114,16 @@ enum _MENU_ID { IDM_VIDEO_SIZE, IDM_VIDEA_LENGTH, IDM_NIGHT_MODE, - IDM_FLASH_PWOER, + IDM_FLASH_POWER, IDM_SENSITIVITY, IDM_DELAY, IDM_OPERATING_TIME, IDM_FORMAT_SD, IDM_DATE_AND_TIME, + // Setting Send page + IDM_SEND, + }; // Menu String ID @@ -296,6 +299,7 @@ enum _MENU_IDS { IDS_MOVIE = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_QR = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_GENERAL = LV_PLUGIN_STRING_ID_STRID_MOVIE, + IDS_SEND = LV_PLUGIN_STRING_ID_STRID_MOVIE, IDS_MOVIE_DUAL_CAM = LV_PLUGIN_STRING_ID_STRID_DUAL_CAM, IDS_MOVIE_CODEC = LV_PLUGIN_STRING_ID_STRID_CODEC, @@ -651,39 +655,42 @@ enum _MENU_IDS { IDS_CAMERA_NAME_ON = LV_PLUGIN_STRING_ID_STRID_ON, // Setting GENERAL page - IDS_CAMERA_MODE = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_CAMERA_MODE = LV_PLUGIN_STRING_ID_STRING_CAMERA_MODE, IDS_CAMERA_MODE_PHOTO = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_CAMERA_MODE_PHOTO_AND_VIDEO = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_IMAGE_SIZE = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_IMAGE_SIZE = LV_PLUGIN_STRING_ID_STRING_IMAGE_SIZE, IDS_IMAGE_SIZE_8M = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_IMAGE_SIZE_12M = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_IMAGE_SIZE_16M = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_VIDEO_SIZE = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_VIDEO_SIZE = LV_PLUGIN_STRING_ID_STRING_VIDEO_SIZE, IDS_VIDEO_SIZE_FHD = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_VIDEO_SIZE_HD = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_VIDEO_SIZE_WVGA = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_VIDEA_LENGTH = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_VIDEA_LENGTH = LV_PLUGIN_STRING_ID_STRING_VIDEO_LENGTH, IDS_VIDEA_LENGTH_10S = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_VIDEA_LENGTH_15S = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_NIGHT_MODE = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_NIGHT_MODE_MAX_RANGE = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_NIGHT_MODE_BALANCE = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_NIGHT_MODE_MINBLUR = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_FLASH_PWOER = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_FLASH_PWOER_HIGH = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_FLASH_PWOER_LOW = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_SENSITIVITY = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_DELAY = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_FLASH_POWER = LV_PLUGIN_STRING_ID_STRING_FLASH_POWER, + IDS_FLASH_POWER_HIGH = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_FLASH_POWER_LOW = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_SENSITIVITY = LV_PLUGIN_STRING_ID_STRING_SENSITIVITY, + IDS_DELAY = LV_PLUGIN_STRING_ID_STRING_DELAY, IDS_DELAY_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_DELAY_ON = LV_PLUGIN_STRING_ID_STRID_ON, - IDS_OPERATING_TIME = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_OPERATING_TIME = LV_PLUGIN_STRING_ID_STRING_OPERATING_TIME, IDS_OPERATING_TIME_OFF = LV_PLUGIN_STRING_ID_STRID_OFF, IDS_OPERATING_TIME_ON = LV_PLUGIN_STRING_ID_STRID_ON, - IDS_FORMAT_SD = LV_PLUGIN_STRING_ID_STRID_ISO3200, - IDS_DATE_AND_TIME = LV_PLUGIN_STRING_ID_STRID_ISO3200, + IDS_FORMAT_SD = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD, + IDS_DATE_AND_TIME = LV_PLUGIN_STRING_ID_STRING_DATE_AND_TIME, IDS_DATE_AND_TIME_AUTO_UTC = LV_PLUGIN_STRING_ID_STRID_ISO3200, IDS_DATE_AND_TIME_MANUAL = LV_PLUGIN_STRING_ID_STRID_ISO3200, + // Setting Send page + // IDS_SEND = + IDS_END, }; @@ -772,6 +779,8 @@ enum _MENU_IDI { IDIX_QR = LV_PLUGIN_RES_ID_NONE, IDI_GENERAL = LV_PLUGIN_RES_ID_NONE, IDIX_GENERAL = LV_PLUGIN_RES_ID_NONE, + IDI_SEND = LV_PLUGIN_RES_ID_NONE, + IDIX_SEND = LV_PLUGIN_RES_ID_NONE, IDI_MOVIE_DUAL_CAM = LV_PLUGIN_IMG_ID_ICON_DUALCAM_BOTH_M, IDI_MOVIE_CODEC = LV_PLUGIN_IMG_ID_ICON_MENU_SETUP_ON_M, @@ -832,17 +841,17 @@ enum _MENU_IDI { IDI_CAMERA_NAME = LV_PLUGIN_IMG_ID_SF_CAMERA_NAME, // Setting GENERAL page - IDI_CAMERA_MODE = LV_PLUGIN_RES_ID_NONE, - IDI_IMAGE_SIZE = LV_PLUGIN_RES_ID_NONE, - IDI_VIDEO_SIZE = LV_PLUGIN_RES_ID_NONE, - IDI_VIDEA_LENGTH = LV_PLUGIN_RES_ID_NONE, + IDI_CAMERA_MODE = LV_PLUGIN_IMG_ID_SF_CAMERA_MODE, + IDI_IMAGE_SIZE = LV_PLUGIN_IMG_ID_SF_IMAGE_SIZE, + IDI_VIDEO_SIZE = LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE, + IDI_VIDEA_LENGTH = LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH, IDI_NIGHT_MODE = LV_PLUGIN_RES_ID_NONE, - IDI_FLASH_PWOER = LV_PLUGIN_RES_ID_NONE, - IDI_SENSITIVITY = LV_PLUGIN_RES_ID_NONE, - IDI_DELAY = LV_PLUGIN_RES_ID_NONE, - IDI_OPERATING_TIME = LV_PLUGIN_RES_ID_NONE, - IDI_FORMAT_SD = LV_PLUGIN_RES_ID_NONE, - IDI_DATE_AND_TIME = LV_PLUGIN_RES_ID_NONE, + IDI_FLASH_POWER = LV_PLUGIN_IMG_ID_SF_FLASH_POWER, + IDI_SENSITIVITY = LV_PLUGIN_IMG_ID_SF_SENSITVITY, + IDI_DELAY = LV_PLUGIN_IMG_ID_SF_DELAY, + IDI_OPERATING_TIME = LV_PLUGIN_IMG_ID_SF_OPERATING_TIME, + IDI_FORMAT_SD = LV_PLUGIN_IMG_ID_SF_FORMAT_SD, + IDI_DATE_AND_TIME = LV_PLUGIN_IMG_ID_ICON_DATE_TIME, #if 0 // Language Options @@ -947,17 +956,17 @@ enum _MENU_IDF { IDF_CAMERA_NAME = FL_CAMERA_NAME, // Setting GENERAL page - IDF_CAMERA_MODE = FL_NULL, - IDF_IMAGE_SIZE = FL_NULL, - IDF_VIDEO_SIZE = FL_NULL, - IDF_VIDEA_LENGTH = FL_NULL, - IDF_NIGHT_MODE = FL_NULL, - IDF_FLASH_PWOER = FL_NULL, - IDF_SENSITIVITY = FL_NULL, - IDF_DELAY = FL_NULL, - IDF_OPERATING_TIME = FL_NULL, - IDF_FORMAT_SD = FL_NULL, - IDF_DATE_AND_TIME = FL_NULL, + IDF_CAMERA_MODE = FL_CAMERA_MODE, + IDF_IMAGE_SIZE = FL_IMAGE_SIZE, + IDF_VIDEO_SIZE = FL_VIDEO_SIZE, + IDF_VIDEA_LENGTH = FL_VIDEA_LENGTH, + IDF_NIGHT_MODE = FL_NIGHT_MODE, + IDF_FLASH_POWER = FL_FLASH_POWER, + IDF_SENSITIVITY = FL_SENSITIVITY, + IDF_DELAY = FL_DELAY, + IDF_OPERATING_TIME = FL_OPERATING_TIME, + IDF_FORMAT_SD = FL_FORMAT_SD, + IDF_DATE_AND_TIME = FL_DATE_AND_TIME }; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c new file mode 100644 index 000000000..31f62fb3f --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -0,0 +1,59 @@ +#include "PrjInc.h" +#include "UIWnd/UIFlow.h" + +TMDEF_BEGIN_ITEMS(SEND) +// TMDEF_ITEM_TEXTID(NETWORK_SELECTION) +// TMDEF_ITEM_TEXTID(QR_PICTURE) +// TMDEF_ITEM_TEXTID(PASSWORD) +// TMDEF_ITEM_TEXTID(CAMERA_INFO) +// TMDEF_ITEM_TEXTID(CAMERA_NAME) +TMDEF_END_ITEMS() + +// -------------------------------------------------------------------------- +// PAGES +// -------------------------------------------------------------------------- +// SEND Menu Pages +TMDEF_BEGIN_PAGES(SEND) +TMDEF_PAGE_TEXT_ICON(SEND) +TMDEF_END_PAGES() +TMDEF_EMNU(gSendMenu, SEND, Send_MenuCallback) + +// -------------------------------------------------------------------------- +// Menu Callback +// -------------------------------------------------------------------------- +int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) +{ + printf(" ====================================================== \n"); + UINT16 uwItemId; +// UINT16 uwOption; + if (uiMessage == TMM_CONFIRM_OPTION) + { + uwItemId = LO_WORD(uiParam); + // uwOption = HI_WORD(uiParam); + switch (uwItemId) + { + // case IDM_NETWORK_SELECTION: + // { + // break; + // } + // case IDM_QR_PICTURE: + // { + // break; + // } + // case IDM_PASSWORD: + // { + // break; + // } + // case IDM_CAMERA_NAME: + // { + // break; + // } + default: + { + + break; + } + } + } + return TMF_PROCESSED; +} \ No newline at end of file diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h new file mode 100644 index 000000000..3eefcf366 --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h @@ -0,0 +1,7 @@ +#ifndef _MENUM_SEND_H_ +#define _MENUM_SEND_H_ + +extern TM_MENU gSendMenu; +extern TM_ITEM gTM_ITEMS_SEND[]; + +#endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 9a5d29dd5..58f554f51 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -286,7 +286,7 @@ void MenuItem_OnOpen(lv_obj_t* obj) pNextMenu = &gMovieMenu; #endif - pNextMenu = &gQrMenu; // TODO: test + pNextMenu = &gGeneralMenu; // TODO: test //MenuCommonItem_SetCurrentMenu(&gCommonMenu); MenuCommonItem_SetCurrentMenu(pNextMenu); pMenu = MenuCommonItem_GetCurrentMenu(); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h index 21221a7a8..164e64aca 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h @@ -39,6 +39,7 @@ extern const PALETTE_ITEM gDemoKit_Palette_Palette[256]; #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h" +#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMode.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h" diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index 1271d0416..a16be7ff1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -220,6 +220,19 @@ typedef enum { FL_CAMERA_INFO, FL_CAMERA_NAME, + // General page + FL_CAMERA_MODE, + FL_IMAGE_SIZE, + FL_VIDEO_SIZE, + FL_VIDEA_LENGTH, + FL_NIGHT_MODE, + FL_FLASH_POWER, + FL_SENSITIVITY, + FL_DELAY, + FL_OPERATING_TIME, + FL_FORMAT_SD, + FL_DATE_AND_TIME, + //Setup FL_LCD_OFF, FL_BrightAdjIndex,