Skip to content

Commit 04e28ac

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.7.0'
2 parents 8de944a + 9486d57 commit 04e28ac

File tree

14 files changed

+40
-14
lines changed

14 files changed

+40
-14
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: python
22
python:
33
- "2.7"
4-
- "3.5"
4+
- "3.6"
55

66
env:
77
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink

‎boards/esp32-poe.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"arduino",
2020
"espidf"
2121
],
22-
"name": "me=OLIMEX ESP32-PoE",
22+
"name": "OLIMEX ESP32-PoE",
2323
"upload": {
2424
"flash_size": "4MB",
2525
"maximum_ram_size": 327680,

‎builder/frameworks/espidf.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ def build_espidf_bootloader():
192192
join(FRAMEWORK_DIR, "components", "aws_iot",
193193
"aws-iot-device-sdk-embedded-C", "include"),
194194
join(FRAMEWORK_DIR, "components", "bootloader_support", "include"),
195+
join(FRAMEWORK_DIR, "components", "bootloader_support", "include_priv"),
195196
join(FRAMEWORK_DIR, "components", "bt", "include"),
196197
join(FRAMEWORK_DIR, "components", "bt", "bluedroid", "api", "include", "api"),
197198
join(FRAMEWORK_DIR, "components", "coap", "port", "include"),
@@ -422,6 +423,7 @@ def build_espidf_bootloader():
422423
"aws_iot",
423424
"espcoredump",
424425
"bootloader",
426+
"bootloader_support",
425427
"heap",
426428
"esptool_py",
427429
"freertos",
@@ -454,6 +456,12 @@ def build_espidf_bootloader():
454456
src_filter="+<*> -<test> -<sys_view> -<gcov>"
455457
))
456458

459+
libs.append(env.BuildLibrary(
460+
join("$BUILD_DIR", "bootloader_support"),
461+
join(FRAMEWORK_DIR, "components", "bootloader_support"),
462+
src_filter="+<*> -<test> -<src/bootloader_init.c>"
463+
))
464+
457465
libs.append(env.BuildLibrary(
458466
join("$BUILD_DIR", "soc"),
459467
join(FRAMEWORK_DIR, "components", "soc"),

‎builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def __fetch_spiffs_size(target, source, env):
278278
UPLOADOTACMD='"$PYTHONEXE" "$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
279279
)
280280
for image in env.get("FLASH_EXTRA_IMAGES", []):
281-
env.Append(UPLOADERFLAGS=[image[0], image[1]])
281+
env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])])
282282

283283
if "uploadfs" in COMMAND_LINE_TARGETS:
284284
env.Replace(

‎examples/espidf-aws-iot/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

‎examples/espidf-ble-adv/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

‎examples/espidf-blink/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

‎examples/espidf-coap-server/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

‎examples/espidf-exceptions/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

‎examples/espidf-hello-world/src/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
*
3-
* Automatically generated file; DO NOT EDIT.
43
* Espressif IoT Development Framework Configuration
54
*
65
*/
@@ -30,6 +29,7 @@
3029
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
3130
#define CONFIG_MBEDTLS_AES_C 1
3231
#define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
32+
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
3333
#define CONFIG_MBEDTLS_GCM_C 1
3434
#define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
3535
#define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
3939
#define CONFIG_SPIFFS_CACHE 1
4040
#define CONFIG_INT_WDT 1
4141
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
42+
#define CONFIG_ESP_GRATUITOUS_ARP 1
4243
#define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
4344
#define CONFIG_MBEDTLS_ECDSA_C 1
4445
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
162163
#define CONFIG_ESPTOOLPY_COMPRESSED 1
163164
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
164165
#define CONFIG_TCP_SND_BUF_DEFAULT 5744
166+
#define CONFIG_GARP_TMR_INTERVAL 60
165167
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
166168
#define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
167169
#define CONFIG_HCI_TRACE_LEVEL_WARNING 1

0 commit comments

Comments
 (0)