jomjol 5 лет назад
Родитель
Сommit
c05313aefc

+ 5 - 2
code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -72,7 +72,8 @@ static camera_config_t camera_config = {
     .ledc_channel = LEDC_CHANNEL_0,
 
     .pixel_format = PIXFORMAT_JPEG, //YUV422,GRAYSCALE,RGB565,JPEG
-    .frame_size = FRAMESIZE_UXGA,    //QQVGA-UXGA Do not use sizes above QVGA when not JPEG
+    .frame_size = FRAMESIZE_VGA,    //QQVGA-UXGA Do not use sizes above QVGA when not JPEG
+//    .frame_size = FRAMESIZE_UXGA,    //QQVGA-UXGA Do not use sizes above QVGA when not JPEG
 
     
 
@@ -150,6 +151,8 @@ void CCamera::SetQualitySize(int qual, framesize_t resol)
         image_height = 480;
         image_width = 640;             
     }
+    // No higher Mode than VGA, damit der Kameraspeicher ausreicht.
+/*
     if (resol == FRAMESIZE_SVGA)
     {
         image_height = 600;
@@ -170,7 +173,7 @@ void CCamera::SetQualitySize(int qual, framesize_t resol)
         image_height = 1200;
         image_width = 1600;             
     }
-
+*/
 }
 
 

+ 2 - 2
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="584a732";
+const char* GIT_REV="db0ca1c";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling-reduce-sd-use";
-const char* BUILD_TIME="2020-12-26 09:05";
+const char* BUILD_TIME="2020-12-26 19:56";

+ 2 - 2
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="584a732";
+const char* GIT_REV="db0ca1c";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling-reduce-sd-use";
-const char* BUILD_TIME="2020-12-26 09:05";
+const char* BUILD_TIME="2020-12-26 19:56";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin


BIN
firmware/html.zip


+ 1 - 1
sd-card/html/edit_config_param.html

@@ -123,7 +123,7 @@ textarea {
 			<td>
 				<select id="MakeImage_ImageSize_value1">
 					<option value="0" selected>VGA</option>
-					<option value="1" >SVGA</option>
+					<option value="1" >QVGA</option>
 				</select>
 			</td>
 			<td style="font-size: 80%;">

+ 1 - 1
sd-card/html/version.txt

@@ -1 +1 @@
-3.0.0
+4.0.0