Merge branch 'master' of https://gitee.com/openLuat/LuatOS

components/camera/luat_camera.h

@@ -25,6 +25,7 @@ enum
 	LUAT_CAMERA_MODE_SCAN,
 
     LUAT_CAMERA_TYPE_USB = 0x20,
+    LUAT_CAMERA_TYPE_DVP = 0
 };
 
 typedef struct luat_camera_conf

components/camera/luat_lib_camera.c

@@ -495,19 +495,21 @@ static const rotable_Reg_t reg_camera[] =
 	{ "preview",     ROREG_FUNC(l_camera_preview)},
     { "stop" ,       ROREG_FUNC(l_camera_stop)},
     { "capture",     ROREG_FUNC(l_camera_capture)},
-	{ "video",     ROREG_FUNC(l_camera_video)},
-	{ "startRaw",     ROREG_FUNC(l_camera_start_raw)},
-	{ "getRaw",     ROREG_FUNC(l_camera_get_raw)},
+	{ "video",       ROREG_FUNC(l_camera_video)},
+	{ "startRaw",    ROREG_FUNC(l_camera_start_raw)},
+	{ "getRaw",      ROREG_FUNC(l_camera_get_raw)},
 	{ "close",		 ROREG_FUNC(l_camera_close)},
     { "on",          ROREG_FUNC(l_camera_on)},
 
     //@const AUTO number 摄像头工作在自动模式
-	{ "AUTO",             ROREG_INT(LUAT_CAMERA_MODE_AUTO)},
+	{ "AUTO",        ROREG_INT(LUAT_CAMERA_MODE_AUTO)},
     //@const SCAN number 摄像头工作在扫码模式，只输出Y分量
-	{ "SCAN",             ROREG_INT(LUAT_CAMERA_MODE_SCAN)},
+	{ "SCAN",        ROREG_INT(LUAT_CAMERA_MODE_SCAN)},
     //@const TYPE number 摄像头类型，USB
-    { "USB",              ROREG_INT(LUAT_CAMERA_TYPE_USB)},
-	{ NULL,          {}}
+    { "USB",         ROREG_INT(LUAT_CAMERA_TYPE_USB)},
+    //@const TYPE number 摄像头类型，DVP
+    { "DVP",         ROREG_INT(LUAT_CAMERA_TYPE_DVP)},
+	{ NULL,          ROREG_INT(0)}
 };
 
 LUAMOD_API int luaopen_camera( lua_State *L ) {

luat/modules/luat_lib_gpio.c

@@ -720,10 +720,10 @@ static const rotable_Reg_t reg_gpio[] =
     { "WAKEUP4",         ROREG_INT(HAL_WAKEUP_4)},
     //@const WAKEUP5 number WAKEUP_PAD
     { "WAKEUP5",         ROREG_INT(HAL_WAKEUP_5)},
-    //@const charge_detect_pad number WAKEUP_PAD
+    //@const CHG_DET number WAKEUP_PAD
     { "CHG_DET",         ROREG_INT(HAL_WAKEUP_CHARGE)},
 #endif
-	//@const POWERKEY number WAKEUP_PAD
+	//@const PWR_KEY number WAKEUP_PAD
 	{ "PWR_KEY",         ROREG_INT(HAL_WAKEUP_PWRKEY)},
 #endif
 	{ NULL,             ROREG_INT(0) }