Setting page QR and General backup.

code/application/source/cardv/Makefile

@@ -283,6 +283,7 @@ SRC += \
 	./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuCommon.c \
 	./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/MenuPhoto.c \
 	./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.c \
 	./SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuPlayback.c \

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c

@@ -0,0 +1,140 @@
+// #include "MenuQR.h"
+#include "PrjInc.h"
+#include "UIFlowLVGL/UIFlowMenuCommonItem/TabMenu.h"
+#include "UIWnd/UIFlow.h"
+
+TMDEF_BEGIN_OPTIONS(CAMERA_MODE)
+TMDEF_OPTION_TEXT_S(CAMERA_MODE_PHOTO, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(CAMERA_MODE_PHOTO_AND_VIDEO, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(IMAGE_SIZE)
+TMDEF_OPTION_TEXT_S(IMAGE_SIZE_16M, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(IMAGE_SIZE_12M, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(IMAGE_SIZE_8M, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(VIDEO_SIZE)
+TMDEF_OPTION_TEXT_S(VIDEO_SIZE_FHD, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(VIDEO_SIZE_HD, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(VIDEO_SIZE_WVGA, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(VIDEA_LENGTH)
+TMDEF_OPTION_TEXT_S(VIDEA_LENGTH_10S, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(VIDEA_LENGTH_15S, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(NIGHT_MODE)
+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_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(SENSITIVITY)
+TMDEF_OPTION_TEXT_S(SENSITIVITY, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(DELAY)
+TMDEF_OPTION_TEXT_S(DELAY_OFF, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(DELAY_ON, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(OPERATING_TIME)
+TMDEF_OPTION_TEXT_S(OPERATING_TIME_OFF, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(OPERATING_TIME_ON, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(FORMAT_SD)
+TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(DATE_AND_TIME)
+TMDEF_OPTION_TEXT_S(DATE_AND_TIME_AUTO_UTC, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(DATE_AND_TIME_MANUAL, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+
+TMDEF_BEGIN_ITEMS(GENERAL)
+TMDEF_ITEM_TEXTID(CAMERA_MODE)
+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(SENSITIVITY)
+TMDEF_ITEM_TEXTID(DELAY)
+TMDEF_ITEM_TEXTID(OPERATING_TIME)
+TMDEF_ITEM_TEXTID(FORMAT_SD)
+TMDEF_ITEM_TEXTID(DATE_AND_TIME)
+TMDEF_END_ITEMS()
+
+// --------------------------------------------------------------------------
+// PAGES
+// -------------------------------------------------------------------------- 
+// GENERAL Menu Pages
+TMDEF_BEGIN_PAGES(GENERAL)
+TMDEF_PAGE_TEXT_ICON(GENERAL)
+TMDEF_END_PAGES()
+TMDEF_EMNU(gGeneralMenu, GENERAL, General_MenuCallback)
+
+// --------------------------------------------------------------------------
+// Menu Callback
+// --------------------------------------------------------------------------
+int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) 
+{
+  UINT16 uwItemId;
+//   UINT16 uwOption;
+  if (uiMessage == TMM_CONFIRM_OPTION)
+  {
+    uwItemId = LO_WORD(uiParam);
+    // uwOption = HI_WORD(uiParam);
+    switch (uwItemId)
+    {
+    case IDM_CAMERA_MODE:
+    {
+      break;
+    }
+    case IDM_IMAGE_SIZE:
+    {
+      break;
+    }
+    case IDM_VIDEO_SIZE:
+    {
+      break;
+    }
+    case IDM_VIDEA_LENGTH:
+    {
+      break;
+    }
+    case IDM_NIGHT_MODE:
+    {
+      break;
+    }
+    case IDM_FLASH_PWOER:
+    {
+      break;
+    }
+    case IDM_SENSITIVITY:
+    {
+      break;
+    }
+    case IDM_DELAY:
+    {
+      break;
+    }
+    case IDM_OPERATING_TIME:
+    {
+      break;
+    }
+    case IDM_FORMAT_SD:
+    {
+      break;
+    }
+    case IDM_DATE_AND_TIME:
+    {
+      break;
+    }
+    default: 
+    {
+
+      break;
+    }
+    }
+  }
+  return TMF_PROCESSED;
+}

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h

@@ -0,0 +1,7 @@
+#ifndef _MENUM_GENERAL_H_
+#define _MENUM_GENERAL_H_
+
+extern TM_MENU gGeneralMenu;
+extern TM_ITEM gTM_ITEMS_GENERAL[];
+
+#endif

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h

@@ -1,6 +1,9 @@
 #ifndef __MENUID_H
 #define __MENUID_H
 
+#include "Resource/Plugin/lv_plugin_common.h"
+#include "UIFlowLVGL/UIFlowLVGL.h"
+#include "UIInfo/UIInfo.h"
 #include "UIWnd/UIFlow.h"
 
 // Menu Item ID
@@ -100,6 +103,23 @@ enum _MENU_ID {
 
 	// Setting QR page
 	IDM_NETWORK_SELECTION,
+	IDM_QR_PICTURE,
+	IDM_PASSWORD,
+	IDM_CAMERA_INFO,
+	IDM_CAMERA_NAME,
+
+	// Setting GENERAL page
+	IDM_CAMERA_MODE,
+	IDM_IMAGE_SIZE,
+	IDM_VIDEO_SIZE,
+	IDM_VIDEA_LENGTH,
+	IDM_NIGHT_MODE,
+	IDM_FLASH_PWOER,
+	IDM_SENSITIVITY,
+	IDM_DELAY,
+	IDM_OPERATING_TIME,
+	IDM_FORMAT_SD,
+	IDM_DATE_AND_TIME,
 
 };
 
@@ -274,6 +294,8 @@ enum _MENU_IDS {
 	IDS_MOVIE_WB            = LV_PLUGIN_STRING_ID_STRID_WB,
 	IDS_MOVIE_COLOR         = LV_PLUGIN_STRING_ID_STRID_COLOR,
 	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_MOVIE_DUAL_CAM      = LV_PLUGIN_STRING_ID_STRID_DUAL_CAM,
 	IDS_MOVIE_CODEC         = LV_PLUGIN_STRING_ID_STRID_CODEC,
 
@@ -619,6 +641,48 @@ enum _MENU_IDS {
 
 	// Setting QR page
 	IDS_NETWORK_SELECTION = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_QR_PICTURE = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_PASSWORD = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_PASSWORD_OFF            = LV_PLUGIN_STRING_ID_STRID_OFF,
+	IDS_PASSWORD_ON             = LV_PLUGIN_STRING_ID_STRID_ON,
+	IDS_CAMERA_INFO = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_CAMERA_NAME = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_CAMERA_NAME_OFF            = LV_PLUGIN_STRING_ID_STRID_OFF,
+	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_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_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_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_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_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_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_DATE_AND_TIME_AUTO_UTC = LV_PLUGIN_STRING_ID_STRID_ISO3200,
+	IDS_DATE_AND_TIME_MANUAL = LV_PLUGIN_STRING_ID_STRID_ISO3200,
 
 	IDS_END,
 
@@ -704,6 +768,10 @@ enum _MENU_IDI {
 	IDI_MOVIE_WB            = LV_PLUGIN_IMG_ID_ICON_WB_AUTO,
 	IDI_MOVIE               = LV_PLUGIN_RES_ID_NONE,       // Movie menu enable icon
 	IDIX_MOVIE              = LV_PLUGIN_RES_ID_NONE,      // Movie menu disable icon
+	IDI_QR = LV_PLUGIN_RES_ID_NONE,
+	IDIX_QR = LV_PLUGIN_RES_ID_NONE,
+	IDI_GENERAL = LV_PLUGIN_RES_ID_NONE,
+	IDIX_GENERAL = 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,
 
@@ -758,6 +826,23 @@ enum _MENU_IDI {
 
 	// Setting QR page
 	IDI_NETWORK_SELECTION = LV_PLUGIN_RES_ID_NONE,
+	IDI_QR_PICTURE = LV_PLUGIN_RES_ID_NONE,
+	IDI_PASSWORD = LV_PLUGIN_RES_ID_NONE,
+	IDI_CAMERA_INFO = LV_PLUGIN_RES_ID_NONE,
+	IDI_CAMERA_NAME = LV_PLUGIN_RES_ID_NONE,
+
+	// 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_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,
 
 #if 0
 	// Language Options
@@ -856,6 +941,23 @@ enum _MENU_IDF {
 
 	// Setting QR page
 	IDF_NETWORK_SELECTION = FL_NULL,
+	IDF_QR_PICTURE = FL_NULL,
+	IDF_PASSWORD = FL_NULL,
+	IDF_CAMERA_INFO = FL_NULL,
+	IDF_CAMERA_NAME = FL_NULL,
+
+	// 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,
 
 };
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c

@@ -3,11 +3,29 @@
 #include "UIWnd/UIFlow.h"
 
 TMDEF_BEGIN_OPTIONS(NETWORK_SELECTION)
-TMDEF_OPTION_TEXT_S(END, TM_OPTION_NOT_SUPPORT)
+TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(QR_PICTURE)
+TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(PASSWORD)
+TMDEF_OPTION_TEXT_S(PASSWORD_OFF, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(PASSWORD_ON, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(CAMERA_INFO)
+TMDEF_OPTION_TEXT_S(END, TM_OPTION_ENABLE)
+TMDEF_END_OPTIONS()
+TMDEF_BEGIN_OPTIONS(CAMERA_NAME)
+TMDEF_OPTION_TEXT_S(CAMERA_NAME_OFF, TM_OPTION_ENABLE)
+TMDEF_OPTION_TEXT_S(CAMERA_NAME_ON, TM_OPTION_ENABLE)
 TMDEF_END_OPTIONS()
 
 TMDEF_BEGIN_ITEMS(QR)
 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()
 
 // --------------------------------------------------------------------------
@@ -15,7 +33,7 @@ TMDEF_END_ITEMS()
 // -------------------------------------------------------------------------- 
 // QR Menu Pages
 TMDEF_BEGIN_PAGES(QR)
-// TMDEF_PAGE_TEXT_ICON(QR)
+TMDEF_PAGE_TEXT_ICON(QR)
 TMDEF_END_PAGES()
 TMDEF_EMNU(gQrMenu, QR, Qr_MenuCallback)
 
@@ -34,7 +52,18 @@ int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
     {
     case IDM_NETWORK_SELECTION:
     {
-
+      break;
+    }
+    case IDM_QR_PICTURE:
+    {
+      break;
+    }
+    case IDM_PASSWORD:
+    {
+      break;
+    }
+    case IDM_CAMERA_NAME:
+    {
       break;
     }
     default: 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h

@@ -38,6 +38,7 @@ extern const PALETTE_ITEM gDemoKit_Palette_Palette[256];
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h"
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.h"
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.h"
+#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h"
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuMode.h"
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuSetup.h"
 #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuPhoto.h"