nam/esp32-camera-driver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Target proper device headers after IDF 4.0

Browse Source
This commit is contained in:
me-no-dev
2020-01-25 05:36:51 +02:00
parent 4cda87fb96
commit b1c9712d11
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conversions/esp_jpg_decode.c
View File

@@ -12,7 +12,17 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "esp_jpg_decode.h" #include "esp_jpg_decode.h"
#include "esp_system.h"
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#include "esp32/rom/tjpgd.h"
#else
#error Target CONFIG_IDF_TARGET is not supported
#endif
#else // ESP32 Before IDF 4.0
#include "rom/tjpgd.h" #include "rom/tjpgd.h"
#endif
#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"

12
conversions/to_jpg.cpp
View File

@@ -13,7 +13,6 @@
// limitations under the License. // limitations under the License.
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "esp_spiram.h"
#include "esp_attr.h" #include "esp_attr.h"
#include "soc/efuse_reg.h" #include "soc/efuse_reg.h"
#include "esp_heap_caps.h" #include "esp_heap_caps.h"
@@ -22,6 +21,17 @@
#include "jpge.h" #include "jpge.h"
#include "yuv.h" #include "yuv.h"
#include "esp_system.h"
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#include "esp32/spiram.h"
#else
#error Target CONFIG_IDF_TARGET is not supported
#endif
#else // ESP32 Before IDF 4.0
#include "esp_spiram.h"
#endif
#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/camera.c
View File

@@ -19,7 +19,6 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/semphr.h" #include "freertos/semphr.h"
#include "rom/lldesc.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/gpio_sig_map.h" #include "soc/gpio_sig_map.h"
#include "soc/i2s_reg.h" #include "soc/i2s_reg.h"

12
driver/private_include/camera_common.h
View File

@@ -3,7 +3,6 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#include "rom/lldesc.h"
#include "esp_err.h" #include "esp_err.h"
#include "esp_intr_alloc.h" #include "esp_intr_alloc.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@@ -12,6 +11,17 @@
#include "esp_camera.h" #include "esp_camera.h"
#include "sensor.h" #include "sensor.h"
#include "esp_system.h"
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#include "esp32/rom/lldesc.h"
#else
#error Target CONFIG_IDF_TARGET is not supported
#endif
#else // ESP32 Before IDF 4.0
#include "rom/lldesc.h"
#endif
typedef union { typedef union {
struct { struct {
uint8_t sample2; uint8_t sample2;