Skip to content

Commit 3da04ce

Browse files
me-no-devme-no-dev
committed
Update IDF release/v3.3 1ba3bf297
1 parent 0f77227 commit 3da04ce

File tree

128 files changed

+893
-273
lines changed

Some content is hidden

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

128 files changed

+893
-273
lines changed

Diff for: ‎libraries/WiFi/src/ETH.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ IPAddress ETHClass::gatewayIP()
193193

194194
IPAddress ETHClass::dnsIP(uint8_t dns_no)
195195
{
196-
ip_addr_t dns_ip = dns_getserver(dns_no);
197-
return IPAddress(dns_ip.u_addr.ip4.addr);
196+
const ip_addr_t * dns_ip = dns_getserver(dns_no);
197+
return IPAddress(dns_ip->u_addr.ip4.addr);
198198
}
199199

200200
IPAddress ETHClass::broadcastIP()

Diff for: ‎libraries/WiFi/src/WiFiSTA.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ IPAddress WiFiSTAClass::dnsIP(uint8_t dns_no)
488488
if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){
489489
return IPAddress();
490490
}
491-
ip_addr_t dns_ip = dns_getserver(dns_no);
492-
return IPAddress(dns_ip.u_addr.ip4.addr);
491+
const ip_addr_t * dns_ip = dns_getserver(dns_no);
492+
return IPAddress(dns_ip->u_addr.ip4.addr);
493493
}
494494

495495
/**

Diff for: ‎platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ compiler.warning_flags.all=-Wall -Werror=all -Wextra
2222

2323
compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
2424
compiler.sdk.path={runtime.platform.path}/tools/sdk
25-
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/efuse" "-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/esp_adc_cal" "-I{compiler.sdk.path}/include/esp_event" "-I{compiler.sdk.path}/include/esp_http_client" "-I{compiler.sdk.path}/include/esp_http_server" "-I{compiler.sdk.path}/include/esp_https_ota" "-I{compiler.sdk.path}/include/esp_https_server" "-I{compiler.sdk.path}/include/esp_ringbuf" "-I{compiler.sdk.path}/include/espcoredump" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freemodbus" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/nimble" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/protobuf-c" "-I{compiler.sdk.path}/include/protocomm" "-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/smartconfig_ack" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/spiffs" "-I{compiler.sdk.path}/include/tcp_transport" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/unity" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/wifi_provisioning" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/esp32-camera" "-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/fb_gfx"
25+
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/efuse" "-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/esp_adc_cal" "-I{compiler.sdk.path}/include/esp_event" "-I{compiler.sdk.path}/include/esp_http_client" "-I{compiler.sdk.path}/include/esp_http_server" "-I{compiler.sdk.path}/include/esp_https_ota" "-I{compiler.sdk.path}/include/esp_https_server" "-I{compiler.sdk.path}/include/esp_ringbuf" "-I{compiler.sdk.path}/include/esp_websocket_client" "-I{compiler.sdk.path}/include/espcoredump" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freemodbus" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/nimble" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/protobuf-c" "-I{compiler.sdk.path}/include/protocomm" "-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/smartconfig_ack" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/spiffs" "-I{compiler.sdk.path}/include/tcp_transport" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/unity" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/wifi_provisioning" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/esp32-camera" "-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/fb_gfx"
2626

2727
compiler.c.cmd=xtensa-esp32-elf-gcc
2828
compiler.c.flags=-std=gnu99 -Os -g3 -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-maybe-uninitialized -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c
@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
3535

3636
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
3737
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception
38-
compiler.c.elf.libs=-lgcc -lfreertos -lmesh -lod -lwear_levelling -lfb_gfx -lesp_adc_cal -lc_nano -lesp32 -ldriver -lhal -ljsmn -lsmartconfig -lesp_http_server -lprotocomm -lface_recognition -lespnow -ltcpip_adapter -lface_detection -lunity -lc -llibsodium -lesp_http_client -lapp_update -lnewlib -lcxx -ltcp_transport -lm -lefuse -lopenssl -lwifi_provisioning -lespcoredump -llog -lmbedtls -lesp_ringbuf -lwps -lnet80211 -lmqtt -lesp_https_server -lapp_trace -lesp_event -lesp32-camera -lsoc -lheap -llwip -lwpa -lrtc -lxtensa-debug-module -lspi_flash -lphy -lfr -lconsole -lcoap -lbtdm_app -lsdmmc -lfd -lmicro-ecc -ljson -lcore -lprotobuf-c -lethernet -lspiffs -lnvs_flash -lwpa_supplicant -lvfs -lasio -lwpa2 -lpp -lbootloader_support -limage_util -ldl_lib -lulp -lnghttp -lpthread -lfreemodbus -lexpat -lfatfs -lsmartconfig_ack -lmdns -lcoexist -lesp-tls -lesp_https_ota -lbt -lstdc++
38+
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lod -lmdns -lvfs -lesp_websocket_client -lespcoredump -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -ldl -lspiffs -lface_detection -lefuse -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
3939

4040
compiler.as.cmd=xtensa-esp32-elf-as
4141

Diff for: ‎tools/gen_esp32part.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def find_by_type(self, ptype, subtype):
160160
subtype = SUBTYPES[int(ptype)][subtype]
161161
except KeyError:
162162
try:
163-
ptype = int(ptype, 0)
163+
subtype = int(subtype, 0)
164164
except TypeError:
165165
pass
166166

Diff for: ‎tools/platformio-build.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp_https_ota"),
119119
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp_https_server"),
120120
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp_ringbuf"),
121+
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp_websocket_client"),
121122
join(FRAMEWORK_DIR, "tools", "sdk", "include", "espcoredump"),
122123
join(FRAMEWORK_DIR, "tools", "sdk", "include", "ethernet"),
123124
join(FRAMEWORK_DIR, "tools", "sdk", "include", "expat"),
@@ -170,7 +171,7 @@
170171
],
171172

172173
LIBS=[
173-
"-lgcc", "-lfreertos", "-lmesh", "-lod", "-lwear_levelling", "-lfb_gfx", "-lesp_adc_cal", "-lc_nano", "-lesp32", "-ldriver", "-lhal", "-ljsmn", "-lsmartconfig", "-lesp_http_server", "-lprotocomm", "-lface_recognition", "-lespnow", "-ltcpip_adapter", "-lface_detection", "-lunity", "-lc", "-llibsodium", "-lesp_http_client", "-lapp_update", "-lnewlib", "-lcxx", "-ltcp_transport", "-lm", "-lefuse", "-lopenssl", "-lwifi_provisioning", "-lespcoredump", "-llog", "-lmbedtls", "-lesp_ringbuf", "-lwps", "-lnet80211", "-lmqtt", "-lesp_https_server", "-lapp_trace", "-lesp_event", "-lesp32-camera", "-lsoc", "-lheap", "-llwip", "-lwpa", "-lrtc", "-lxtensa-debug-module", "-lspi_flash", "-lphy", "-lfr", "-lconsole", "-lcoap", "-lbtdm_app", "-lsdmmc", "-lfd", "-lmicro-ecc", "-ljson", "-lcore", "-lprotobuf-c", "-lethernet", "-lspiffs", "-lnvs_flash", "-lwpa_supplicant", "-lvfs", "-lasio", "-lwpa2", "-lpp", "-lbootloader_support", "-limage_util", "-ldl_lib", "-lulp", "-lnghttp", "-lpthread", "-lfreemodbus", "-lexpat", "-lfatfs", "-lsmartconfig_ack", "-lmdns", "-lcoexist", "-lesp-tls", "-lesp_https_ota", "-lbt", "-lstdc++"
174+
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lod", "-lmdns", "-lvfs", "-lesp_websocket_client", "-lespcoredump", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-ldl", "-lspiffs", "-lface_detection", "-lefuse", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
174175
],
175176

176177
LIBSOURCE_DIRS=[

Diff for: ‎tools/sdk/bin/bootloader_dio_40m.bin

1.38 KB
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dio_80m.bin

-112 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dout_40m.bin

-112 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dout_80m.bin

-112 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qio_40m.bin

-1.58 KB
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qio_80m.bin

-112 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qout_40m.bin

-128 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qout_80m.bin

-112 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/include/bt/esp_bt.h

+9-1
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.

Diff for: ‎tools/sdk/include/bt/esp_gatt_common_api.h

+4
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

Diff for: ‎tools/sdk/include/bt/esp_gatt_defs.h

+21-15
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 */

0 commit comments

Comments
 (0)