diff --git a/code/components/jomjol_controlcamera/ClassControllCamera.cpp b/code/components/jomjol_controlcamera/ClassControllCamera.cpp index 9ea1bd64..a2f4925d 100644 --- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp +++ b/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; } - +*/ } diff --git a/code/main/version.cpp b/code/main/version.cpp index d2780f7d..79776c5c 100644 --- a/code/main/version.cpp +++ b/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"; \ No newline at end of file +const char* BUILD_TIME="2020-12-26 19:56"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index d2780f7d..79776c5c 100644 --- a/code/version.cpp +++ b/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"; \ No newline at end of file +const char* BUILD_TIME="2020-12-26 19:56"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 2b90ed9e..3c44d037 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 5346ed3f..43f9c861 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 86ec518a..7cd35d71 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index 1b995808..74cb8a54 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -123,7 +123,7 @@ textarea { diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 4a36342f..fcdb2e10 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -3.0.0 +4.0.0