espressif/arduino-esp32
1
0
Fork 1
mirror of https://github.com/0xFEEDC0DE64/arduino-esp32.git synced 2025-07-05 06:46:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDF release/v4.0 acdba0eb4

Browse Source
This commit is contained in:
me-no-dev
2020-04-13 12:10:06 +00:00
parent b47b0dc966
commit 92eb1a2264
80 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/sdk/include/config/sdkconfig.h
View File

@ -1987,5 +1987,5 @@
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
#endif
#define CONFIG_ARDUINO_IDF_COMMIT "a3f3c7bdc"
#define CONFIG_ARDUINO_IDF_COMMIT "acdba0eb4"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.0"

8
tools/sdk/include/driver/driver/rtc_cntl.h
View File

@ -18,6 +18,10 @@
#include "esp_err.h"
#include "esp_intr_alloc.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Register a handler for specific RTC_CNTL interrupts
*
@ -46,3 +50,7 @@ esp_err_t rtc_isr_register(intr_handler_t handler, void* handler_arg,
* handler_arg isn't registered
*/
esp_err_t rtc_isr_deregister(intr_handler_t handler, void* handler_arg);
#ifdef __cplusplus
}
#endif

9
tools/sdk/include/esp-face/dl_lib_matrix3d.h
View File

@ -7,8 +7,11 @@
#include <math.h>
#include <assert.h>
#if CONFIG_ESP32_SPIRAM_SUPPORT
#if CONFIG_SPIRAM_SUPPORT || CONFIG_ESP32_SPIRAM_SUPPORT
#include "freertos/FreeRTOS.h"
#define DL_SPIRAM_SUPPORT 1
#else
#define DL_SPIRAM_SUPPORT 0
#endif
#ifndef max
@ -86,14 +89,14 @@ static void *dl_lib_calloc(int cnt, int size, int align)
void *res = malloc(total_size);
if (NULL == res)
{
#if CONFIG_ESP32_SPIRAM_SUPPORT
#if DL_SPIRAM_SUPPORT
res = heap_caps_malloc(total_size, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
}
if (NULL == res)
{
printf("Item psram alloc failed. Size: %d x %d\n", cnt, size);
#else
printf("Item alloc failed. Size: %d x %d, SPIRAM_FLAG: %d\n", cnt, size, CONFIG_ESP32_SPIRAM_SUPPORT);
printf("Item alloc failed. Size: %d x %d, SPIRAM_FLAG: %d\n", cnt, size, DL_SPIRAM_SUPPORT);
#endif
return NULL;
}

8
tools/sdk/include/esp32/esp32/clk.h
View File

@ -15,6 +15,10 @@
#pragma once
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* @file esp32/clk.h
*
@ -85,3 +89,7 @@ int esp_clk_xtal_freq(void);
* @return Value or RTC counter, expressed in microseconds
*/
uint64_t esp_clk_rtc_time();
#ifdef __cplusplus
}
#endif

7
tools/sdk/include/spi_flash/esp_flash_spi_init.h
View File

@ -17,6 +17,10 @@
#include "hal/spi_types.h"
#include "esp_flash.h"
#ifdef __cplusplus
extern "C" {
#endif
/// Configurations for the SPI Flash to init
typedef struct {
spi_host_device_t host_id; ///< Bus to use
@ -53,3 +57,6 @@ esp_err_t spi_bus_add_flash_device(esp_flash_t **out_chip, const esp_flash_spi_d
*/
esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
#ifdef __cplusplus
}
#endif