sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Drop 128x160 ESP-32 camera resolution (#1813)

Browse Source
This commit is contained in:
Oxan van Leeuwen
2021-05-31 12:27:41 +02:00
committed by GitHub
parent 4d586b1446
commit 25af5ab7c6
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/esp32_camera/__init__.py
View File

@@ -25,8 +25,6 @@ ESP32CameraFrameSize = esp32_camera_ns.enum("ESP32CameraFrameSize")
FRAME_SIZES = { FRAME_SIZES = {
"160X120": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120, "160X120": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120,
"QQVGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120, "QQVGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120,
"128X160": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_128X160,
"QQVGA2": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_128X160,
"176X144": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144, "176X144": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144,
"QCIF": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144, "QCIF": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144,
"240X176": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_240X176, "240X176": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_240X176,

6
esphome/components/esp32_camera/esp32_camera.cpp
View File

@@ -55,9 +55,6 @@ void ESP32Camera::dump_config() {
case FRAMESIZE_QQVGA: case FRAMESIZE_QQVGA:
ESP_LOGCONFIG(TAG, " Resolution: 160x120 (QQVGA)"); ESP_LOGCONFIG(TAG, " Resolution: 160x120 (QQVGA)");
break; break;
case FRAMESIZE_QQVGA2:
ESP_LOGCONFIG(TAG, " Resolution: 128x160 (QQVGA2)");
break;
case FRAMESIZE_QCIF: case FRAMESIZE_QCIF:
ESP_LOGCONFIG(TAG, " Resolution: 176x155 (QCIF)"); ESP_LOGCONFIG(TAG, " Resolution: 176x155 (QCIF)");
break; break;
@@ -209,9 +206,6 @@ void ESP32Camera::set_frame_size(ESP32CameraFrameSize size) {
case ESP32_CAMERA_SIZE_160X120: case ESP32_CAMERA_SIZE_160X120:
this->config_.frame_size = FRAMESIZE_QQVGA; this->config_.frame_size = FRAMESIZE_QQVGA;
break; break;
case ESP32_CAMERA_SIZE_128X160:
this->config_.frame_size = FRAMESIZE_QQVGA2;
break;
case ESP32_CAMERA_SIZE_176X144: case ESP32_CAMERA_SIZE_176X144:
this->config_.frame_size = FRAMESIZE_QCIF; this->config_.frame_size = FRAMESIZE_QCIF;
break; break;

1
esphome/components/esp32_camera/esp32_camera.h
View File

@@ -37,7 +37,6 @@ class CameraImageReader {
enum ESP32CameraFrameSize { enum ESP32CameraFrameSize {
ESP32_CAMERA_SIZE_160X120, // QQVGA ESP32_CAMERA_SIZE_160X120, // QQVGA
ESP32_CAMERA_SIZE_128X160, // QQVGA2
ESP32_CAMERA_SIZE_176X144, // QCIF ESP32_CAMERA_SIZE_176X144, // QCIF
ESP32_CAMERA_SIZE_240X176, // HQVGA ESP32_CAMERA_SIZE_240X176, // HQVGA
ESP32_CAMERA_SIZE_320X240, // QVGA ESP32_CAMERA_SIZE_320X240, // QVGA

17
tests/test4.yaml
View File

@@ -183,6 +183,23 @@ display:
lambda: |- lambda: |-
it.rectangle(0, 0, it.get_width(), it.get_height()); it.rectangle(0, 0, it.get_width(), it.get_height());
esp32_camera:
name: ESP-32 Camera
data_pins: [GPIO17, GPIO35, GPIO34, GPIO5, GPIO39, GPIO18, GPIO36, GPIO19]
vsync_pin: GPIO22
href_pin: GPIO26
pixel_clock_pin: GPIO21
external_clock:
pin: GPIO27
frequency: 20MHz
i2c_pins:
sda: GPIO25
scl: GPIO23
reset_pin: GPIO15
power_down_pin: GPIO1
resolution: 640x480
jpeg_quality: 10
external_components: external_components:
- source: github://esphome/esphome@dev - source: github://esphome/esphome@dev
refresh: 1d refresh: 1d