espressif/esp32-camera
1
0
Fork 0
mirror of https://github.com/espressif/esp32-camera.git synced 2025-07-15 01:03:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix re-definitions in ESP32 driver

Browse Source 
Fixes: https://github.com/espressif/esp32-camera/issues/264
This commit is contained in:
me-no-dev
2021-05-12 19:39:23 +03:00
parent 5da530c983
commit ec14f1d6f7
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
driver/camera.c
View File

@ -55,25 +55,6 @@
#include "ov7670.h" #include "ov7670.h"
#endif #endif
typedef enum {
CAMERA_NONE = 0,
CAMERA_UNKNOWN = 1,
CAMERA_OV7725 = 7725,
CAMERA_OV2640 = 2640,
CAMERA_OV3660 = 3660,
CAMERA_OV5640 = 5640,
CAMERA_OV7670 = 7670,
CAMERA_NT99141 = 9141,
} camera_model_t;
#define REG_PID 0x0A
#define REG_VER 0x0B
#define REG_MIDH 0x1C
#define REG_MIDL 0x1D
#define REG16_CHIDH 0x300A
#define REG16_CHIDL 0x300B
#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
#include "esp32-hal-log.h" #include "esp32-hal-log.h"
#define TAG "" #define TAG ""

1
driver/include/sensor.h
View File

@ -39,6 +39,7 @@ typedef enum {
CAMERA_NT99141, CAMERA_NT99141,
CAMERA_MODEL_MAX, CAMERA_MODEL_MAX,
CAMERA_NONE, CAMERA_NONE,
CAMERA_UNKNOWN
} camera_model_t; } camera_model_t;
typedef enum { typedef enum {