Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit a3b88c1

Browse files
geeksvillegeeksville
committed
Update with latest custom meshtastic IDF lib builds per:
meshtastic/esp32-arduino-lib-builder@4898fe4
1 parent c4d8178 commit a3b88c1

File tree

140 files changed

+1500
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1500
-464
lines changed

‎tools/sdk/bin/bootloader_dio_40m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dio_80m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dout_40m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dout_80m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qio_40m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qio_80m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qout_40m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qout_80m.bin

-32 Bytes
Binary file not shown.

‎tools/sdk/include/bt/esp_bt.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
extern "C" {
2626
#endif
2727

28-
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20190506
28+
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20200106
2929

3030
/**
3131
* @brief Bluetooth mode for controller enable/disable
@@ -96,6 +96,12 @@ the adv packet will be discarded until the memory is restored. */
9696
#define BTDM_CONTROLLER_MODE_EFF ESP_BT_MODE_BTDM
9797
#endif
9898

99+
#ifdef CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF
100+
#define BTDM_CTRL_AUTO_LATENCY_EFF CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF
101+
#else
102+
#define BTDM_CTRL_AUTO_LATENCY_EFF false
103+
#endif
104+
99105
#define BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT 9 //Maximum BLE connection limitation
100106
#define BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_LIMIT 7 //Maximum ACL connection limitation
101107
#define BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_LIMIT 3 //Maximum SCO/eSCO connection limitation
@@ -118,6 +124,7 @@ the adv packet will be discarded until the memory is restored. */
118124
.ble_max_conn = CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF, \
119125
.bt_max_acl_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF, \
120126
.bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF, \
127+
.auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF, \
121128
.bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF, \
122129
.magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL, \
123130
};
@@ -149,6 +156,7 @@ typedef struct {
149156
uint8_t ble_max_conn; /*!< BLE maximum connection numbers */
150157
uint8_t bt_max_acl_conn; /*!< BR/EDR maximum ACL connection numbers */
151158
uint8_t bt_sco_datapath; /*!< SCO data path, i.e. HCI or PCM module */
159+
bool auto_latency; /*!< BLE auto latency, used to enhance classic BT performance */
152160
/*
153161
* Following parameters can not be configured runtime when call esp_bt_controller_init()
154162
* It will be overwrite with a constant value which in menuconfig or from a macro.

‎tools/sdk/include/bt/esp_gatt_common_api.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ extern "C" {
4444
*/
4545
extern esp_err_t esp_ble_gatt_set_local_mtu (uint16_t mtu);
4646

47+
#if (BLE_INCLUDED == TRUE)
48+
extern uint16_t esp_ble_get_sendable_packets_num (void);
49+
#endif
50+
4751
#ifdef __cplusplus
4852
}
4953
#endif

‎tools/sdk/include/bt/esp_gatt_defs.h

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern "C" {
3434
* All "ESP_GATT_UUID_xxx" is attribute types
3535
*/
3636
#define ESP_GATT_UUID_IMMEDIATE_ALERT_SVC 0x1802 /* Immediate alert Service*/
37-
#define ESP_GATT_UUID_LINK_LOSS_SVC 0x1803 /* Link Loss Service*/
37+
#define ESP_GATT_UUID_LINK_LOSS_SVC 0x1803 /* Link Loss Service*/
3838
#define ESP_GATT_UUID_TX_POWER_SVC 0x1804 /* TX Power Service*/
3939
#define ESP_GATT_UUID_CURRENT_TIME_SVC 0x1805 /* Current Time Service Service*/
4040
#define ESP_GATT_UUID_REF_TIME_UPDATE_SVC 0x1806 /* Reference Time Update Service*/
@@ -68,8 +68,14 @@ extern "C" {
6868
#define ESP_GATT_UUID_CHAR_PRESENT_FORMAT 0x2904 /* Characteristic Presentation Format*/
6969
#define ESP_GATT_UUID_CHAR_AGG_FORMAT 0x2905 /* Characteristic Aggregate Format*/
7070
#define ESP_GATT_UUID_CHAR_VALID_RANGE 0x2906 /* Characteristic Valid Range */
71-
#define ESP_GATT_UUID_EXT_RPT_REF_DESCR 0x2907
72-
#define ESP_GATT_UUID_RPT_REF_DESCR 0x2908
71+
#define ESP_GATT_UUID_EXT_RPT_REF_DESCR 0x2907 /* External Report Reference */
72+
#define ESP_GATT_UUID_RPT_REF_DESCR 0x2908 /* Report Reference */
73+
#define ESP_GATT_UUID_NUM_DIGITALS_DESCR 0x2909 /* Number of Digitals */
74+
#define ESP_GATT_UUID_VALUE_TRIGGER_DESCR 0x290A /* Value Trigger Setting */
75+
#define ESP_GATT_UUID_ENV_SENSING_CONFIG_DESCR 0x290B /* Environmental Sensing Configuration */
76+
#define ESP_GATT_UUID_ENV_SENSING_MEASUREMENT_DESCR 0x290C /* Environmental Sensing Measurement */
77+
#define ESP_GATT_UUID_ENV_SENSING_TRIGGER_DESCR 0x290D /* Environmental Sensing Trigger Setting */
78+
#define ESP_GATT_UUID_TIME_TRIGGER_DESCR 0x290E /* Time Trigger Setting */
7379

7480
/* GAP Profile Attributes */
7581
#define ESP_GATT_UUID_GAP_DEVICE_NAME 0x2A00
@@ -299,7 +305,7 @@ typedef enum {
299305
* @brief Attribute description (used to create database)
300306
*/
301307
typedef struct
302-
{
308+
{
303309
uint16_t uuid_length; /*!< UUID length */
304310
uint8_t *uuid_p; /*!< UUID value */
305311
uint16_t perm; /*!< Attribute permission */
@@ -348,23 +354,23 @@ typedef struct
348354
/**
349355
* @brief Gatt include service entry element
350356
*/
351-
typedef struct
357+
typedef struct
352358
{
353-
uint16_t start_hdl; /*!< Gatt start handle value of included service */
354-
uint16_t end_hdl; /*!< Gatt end handle value of included service */
355-
uint16_t uuid; /*!< Gatt attribute value UUID of included service */
359+
uint16_t start_hdl; /*!< Gatt start handle value of included service */
360+
uint16_t end_hdl; /*!< Gatt end handle value of included service */
361+
uint16_t uuid; /*!< Gatt attribute value UUID of included service */
356362
} esp_gatts_incl_svc_desc_t; /*!< Gatt include service entry element */
357363

358364
/**
359365
* @brief Gatt include 128 bit service entry element
360366
*/
361-
typedef struct
367+
typedef struct
362368
{
363-
uint16_t start_hdl; /*!< Gatt start handle value of included 128 bit service */
364-
uint16_t end_hdl; /*!< Gatt end handle value of included 128 bit service */
365-
} esp_gatts_incl128_svc_desc_t; /*!< Gatt include 128 bit service entry element */
369+
uint16_t start_hdl; /*!< Gatt start handle value of included 128 bit service */
370+
uint16_t end_hdl; /*!< Gatt end handle value of included 128 bit service */
371+
} esp_gatts_incl128_svc_desc_t; /*!< Gatt include 128 bit service entry element */
366372

367-
/// Gatt attribute value
373+
/// Gatt attribute value
368374
typedef struct {
369375
uint8_t value[ESP_GATT_MAX_ATTR_LEN]; /*!< Gatt attribute value */
370376
uint16_t handle; /*!< Gatt attribute handle */
@@ -426,8 +432,8 @@ typedef struct {
426432
/**
427433
* @brief service element
428434
*/
429-
typedef struct {
430-
bool is_primary; /*!< The service flag, true if the service is primary service, else is secondly service */
435+
typedef struct {
436+
bool is_primary; /*!< The service flag, true if the service is primary service, else is secondary service */
431437
uint16_t start_handle; /*!< The start handle of the service */
432438
uint16_t end_handle; /*!< The end handle of the service */
433439
esp_bt_uuid_t uuid; /*!< The uuid of the service */

‎tools/sdk/include/config/sdkconfig.h

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@
2828
#define CONFIG_FATFS_PER_FILE_CACHE 1
2929
#define CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY 1
3030
#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
31+
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
3132
#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
3233
#define CONFIG_UDP_RECVMBOX_SIZE 6
34+
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
3335
#define CONFIG_ARDUHAL_PARTITION_SCHEME_DEFAULT 1
3436
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3537
#define CONFIG_MBEDTLS_AES_C 1
3638
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
37-
#define CONFIG_A2DP_SINK_TASK_STACK_SIZE 2048
3839
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3940
#define CONFIG_MBEDTLS_GCM_C 1
4041
#define CONFIG_ESPTOOLPY_FLASHSIZE "4MB"
@@ -63,7 +64,6 @@
6364
#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 16
6465
#define CONFIG_MBEDTLS_SSL_ALPN 1
6566
#define CONFIG_MBEDTLS_PEM_WRITE_C 1
66-
#define CONFIG_BT_SPP_ENABLED 1
6767
#define CONFIG_BT_RESERVE_DRAM 0xdb5c
6868
#define CONFIG_APP_COMPILE_TIME_DATE 1
6969
#define CONFIG_CXX_EXCEPTIONS 1
@@ -78,7 +78,7 @@
7878
#define CONFIG_CAMERA_CORE1 1
7979
#define CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL 5
8080
#define CONFIG_MB_SERIAL_BUF_SIZE 256
81-
#define CONFIG_CONSOLE_UART_BAUDRATE 115200
81+
#define CONFIG_CONSOLE_UART_BAUDRATE 921600
8282
#define CONFIG_SPIRAM_SUPPORT 1
8383
#define CONFIG_MFN56_1X 1
8484
#define CONFIG_LWIP_MAX_SOCKETS 10
@@ -88,7 +88,6 @@
8888
#define CONFIG_TIMER_TASK_STACK_DEPTH 2048
8989
#define CONFIG_TCP_MSS 1436
9090
#define CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED 1
91-
#define CONFIG_BTDM_CONTROLLER_MODE_BTDM 1
9291
#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF 3
9392
#define CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4 1
9493
#define CONFIG_TCPIP_TASK_AFFINITY_CPU0 1
@@ -100,6 +99,7 @@
10099
#define CONFIG_INT_WDT_CHECK_CPU1 1
101100
#define CONFIG_ADC_CAL_LUT_ENABLE 1
102101
#define CONFIG_FLASHMODE_DIO 1
102+
#define CONFIG_LWIP_ESP_LWIP_ASSERT 1
103103
#define CONFIG_ESPTOOLPY_AFTER_RESET 1
104104
#define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED 1
105105
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -108,6 +108,8 @@
108108
#define CONFIG_FREERTOS_IDLE_TASK_STACKSIZE 1024
109109
#define CONFIG_MBEDTLS_RC4_DISABLED 1
110110
#define CONFIG_FATFS_LFN_STACK 1
111+
#define CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED 1
112+
#define CONFIG_FREERTOS_USE_TICKLESS_IDLE 1
111113
#define CONFIG_CONSOLE_UART_NUM 0
112114
#define CONFIG_ARDUINO_EVENT_RUNNING_CORE 1
113115
#define CONFIG_ESP32_APPTRACE_LOCK_ENABLE 1
@@ -116,7 +118,6 @@
116118
#define CONFIG_TCP_OVERSIZE_MSS 1
117119
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
118120
#define CONFIG_CONSOLE_UART_DEFAULT 1
119-
#define CONFIG_A2DP_SOURCE_TASK_STACK_SIZE 2048
120121
#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
121122
#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
122123
#define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
@@ -159,14 +160,14 @@
159160
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA 1
160161
#define CONFIG_ESPTOOLPY_BEFORE "default_reset"
161162
#define CONFIG_ADC2_DISABLE_DAC 1
162-
#define CONFIG_HFP_ENABLE 1
163163
#define CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM 100
164164
#define CONFIG_ESP32_REV_MIN_0 1
165165
#define CONFIG_LOG_DEFAULT_LEVEL 1
166166
#define CONFIG_TIMER_QUEUE_LENGTH 10
167167
#define CONFIG_ESP32_REV_MIN 0
168168
#define CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT 1
169169
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE 0
170+
#define CONFIG_OV5640_SUPPORT 1
170171
#define CONFIG_MAKE_WARN_UNDEFINED_VARIABLES 1
171172
#define CONFIG_FATFS_TIMEOUT_MS 10000
172173
#define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 32
@@ -181,7 +182,6 @@
181182
#define CONFIG_MDNS_MAX_SERVICES 10
182183
#define CONFIG_ULP_COPROC_ENABLED 1
183184
#define CONFIG_LSSH_SPARSE_MN_5 1
184-
#define CONFIG_HFP_AUDIO_DATA_PATH_PCM 1
185185
#define CONFIG_IDF_TARGET_ESP32 1
186186
#define CONFIG_EMAC_CHECK_LINK_PERIOD_MS 2000
187187
#define CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL 1
@@ -217,13 +217,10 @@
217217
#define CONFIG_ESP32_WIFI_RX_BA_WIN 16
218218
#define CONFIG_MBEDTLS_X509_CSR_PARSE_C 1
219219
#define CONFIG_SPIFFS_USE_MTIME 1
220-
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN 0
221220
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
222-
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN 2
223221
#define CONFIG_PICO_PSRAM_CS_IO 10
224222
#define CONFIG_EMAC_TASK_STACK_SIZE 3072
225223
#define CONFIG_MB_QUEUE_LENGTH 20
226-
#define CONFIG_SW_COEXIST_PREFERENCE_VALUE 2
227224
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
228225
#define CONFIG_OV2640_SUPPORT 1
229226
#define CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER 1
@@ -238,6 +235,7 @@
238235
#define CONFIG_SPIFFS_GC_MAX_RUNS 10
239236
#define CONFIG_ARDUINO_RUN_CORE1 1
240237
#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
238+
#define CONFIG_ESP32_WIFI_RX_IRAM_OPT 1
241239
#define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
242240
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
243241
#define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA 1
@@ -262,6 +260,7 @@
262260
#define CONFIG_BTU_TASK_STACK_SIZE 4096
263261
#define CONFIG_SMP_ENABLE 1
264262
#define CONFIG_SPIRAM_SIZE -1
263+
#define CONFIG_PM_ENABLE 1
265264
#define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
266265
#define CONFIG_SPIFFS_MAX_PARTITIONS 3
267266
#define CONFIG_ESP_ERR_TO_NAME_LOOKUP 1
@@ -275,18 +274,18 @@
275274
#define CONFIG_WARN_WRITE_STRINGS 1
276275
#define CONFIG_SPIFFS_OBJ_NAME_LEN 32
277276
#define CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT 5
278-
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF 2
277+
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF 0
279278
#define CONFIG_LOG_BOOTLOADER_LEVEL_NONE 1
280279
#define CONFIG_PARTITION_TABLE_MD5 1
281280
#define CONFIG_TCPIP_RECVMBOX_SIZE 32
282281
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
283282
#define CONFIG_ESP32_XTAL_FREQ_AUTO 1
284-
#define CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST 1
285283
#define CONFIG_TCP_MAXRTX 12
286284
#define CONFIG_ESPTOOLPY_AFTER "hard_reset"
287285
#define CONFIG_TCPIP_TASK_AFFINITY 0x0
288286
#define CONFIG_LWIP_SO_REUSE 1
289287
#define CONFIG_ARDUINO_UDP_RUN_CORE1 1
288+
#define CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY 1
290289
#define CONFIG_DMA_TX_BUF_NUM 10
291290
#define CONFIG_LWIP_MAX_LISTENING_TCP 16
292291
#define CONFIG_FREERTOS_INTERRUPT_BACKTRACE 1
@@ -300,8 +299,6 @@
300299
#define CONFIG_BT_ENABLED 1
301300
#define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
302301
#define CONFIG_D0WD_PSRAM_CLK_IO 17
303-
#define CONFIG_BT_SSP_ENABLED 1
304-
#define CONFIG_SW_COEXIST_PREFERENCE_BALANCE 1
305302
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
306303
#define CONFIG_MONITOR_BAUD 115200
307304
#define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
@@ -325,7 +322,6 @@
325322
#define CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED 1
326323
#define CONFIG_FREERTOS_ISR_STACKSIZE 1536
327324
#define CONFIG_SUPPORT_TERMIOS 1
328-
#define CONFIG_CLASSIC_BT_ENABLED 1
329325
#define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
330326
#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK 1
331327
#define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
@@ -339,7 +335,6 @@
339335
#define CONFIG_SCAN_DUPLICATE_TYPE 0
340336
#define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
341337
#define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
342-
#define CONFIG_HFP_CLIENT_ENABLE 1
343338
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
344339
#define CONFIG_SPI_SLAVE_ISR_IN_IRAM 1
345340
#define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
@@ -350,8 +345,8 @@
350345
#define CONFIG_BOOTLOADER_WDT_ENABLE 1
351346
#define CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED 1
352347
#define CONFIG_LWIP_LOOPBACK_MAX_PBUFS 8
353-
#define CONFIG_A2DP_ENABLE 1
354348
#define CONFIG_MB_TIMER_GROUP 0
349+
#define CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP 3
355350
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
356351
#define CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE 1
357352
#define CONFIG_SPIFFS_PAGE_SIZE 256
@@ -379,5 +374,5 @@
379374
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
380375
#define CONFIG_ESP32_WIFI_IRAM_OPT 1
381376
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
382-
#define CONFIG_ARDUINO_IDF_COMMIT "367c3c09c"
377+
#define CONFIG_ARDUINO_IDF_COMMIT "b6599abb1"
383378
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

‎tools/sdk/include/driver/driver/ledc.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,19 @@ esp_err_t ledc_timer_config(const ledc_timer_config_t* timer_conf);
171171
*/
172172
esp_err_t ledc_update_duty(ledc_mode_t speed_mode, ledc_channel_t channel);
173173

174+
/**
175+
* @brief Set LEDC output gpio.
176+
*
177+
* @param gpio_num The LEDC output gpio
178+
* @param speed_mode Select the LEDC speed_mode, high-speed mode and low-speed mode
179+
* @param ledc_channel LEDC channel (0-7), select from ledc_channel_t
180+
*
181+
* @return
182+
* - ESP_OK Success
183+
* - ESP_ERR_INVALID_ARG Parameter error
184+
*/
185+
esp_err_t ledc_set_pin(int gpio_num, ledc_mode_t speed_mode, ledc_channel_t ledc_channel);
186+
174187
/**
175188
* @brief LEDC stop.
176189
* Disable LEDC output, and set idle level

‎tools/sdk/include/esp-face/dl_lib_matrix3d.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
#include <math.h>
88
#include <assert.h>
99

10-
#if CONFIG_SPIRAM_SUPPORT
10+
#if CONFIG_SPIRAM_SUPPORT || CONFIG_ESP32_SPIRAM_SUPPORT
1111
#include "freertos/FreeRTOS.h"
12+
#define DL_SPIRAM_SUPPORT 1
13+
#else
14+
#define DL_SPIRAM_SUPPORT 0
1215
#endif
1316

1417
#ifndef max
@@ -80,20 +83,20 @@ typedef struct
8083
* @param align Align of memory. If not required, set 0.
8184
* @return Pointer of allocated memory. Null for failed.
8285
*/
83-
static inline void *dl_lib_calloc(int cnt, int size, int align)
86+
static void *dl_lib_calloc(int cnt, int size, int align)
8487
{
8588
int total_size = cnt * size + align + sizeof(void *);
8689
void *res = malloc(total_size);
8790
if (NULL == res)
8891
{
89-
#if CONFIG_SPIRAM_SUPPORT
92+
#if DL_SPIRAM_SUPPORT
9093
res = heap_caps_malloc(total_size, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
9194
}
9295
if (NULL == res)
9396
{
9497
printf("Item psram alloc failed. Size: %d x %d\n", cnt, size);
9598
#else
96-
printf("Item alloc failed. Size: %d x %d\n", cnt, size);
99+
printf("Item alloc failed. Size: %d x %d, SPIRAM_FLAG: %d\n", cnt, size, DL_SPIRAM_SUPPORT);
97100
#endif
98101
return NULL;
99102
}

0 commit comments

Comments
 (0)