Merge branch 'release/v0.9.0'

platformio · Aug 16, 2017 · 7ac70d2 · 7ac70d2
2 parents 9c69b3c + c2a6b72
commit 7ac70d2
Show file tree

Hide file tree

Showing 9 changed files with 293 additions and 101 deletions.
diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -71,7 +71,7 @@ def parse_mk(path):
 
 def build_component(path):
     envsafe = env.Clone()
-    src_filter = "+<*> -<test> -<tests>"
+    src_filter = "+<*> -<test*>"
     if isfile(join(path, "component.mk")):
         params = parse_mk(join(path, "component.mk"))
         if params.get("COMPONENT_PRIV_INCLUDEDIRS"):
@@ -116,6 +116,7 @@ def build_espidf_bootloader():
             "-Wl,--gc-sections",
             "-T", "esp32.bootloader.ld",
             "-T", "esp32.rom.ld",
+            "-T", "esp32.peripherals.ld",
             "-T", "esp32.bootloader.rom.ld"
         ]
     ),
@@ -130,7 +131,8 @@ def build_espidf_bootloader():
         LIBS=[
             envsafe.BuildLibrary(
                 join("$BUILD_DIR", "bootloaderSupport"),
-                join(FRAMEWORK_DIR, "components", "bootloader_support")
+                join(FRAMEWORK_DIR, "components", "bootloader_support"),
+                src_filter="+<*> -<test>"
             ),
             envsafe.BuildLibrary(
                 join("$BUILD_DIR", "bootloaderLog"),
@@ -146,7 +148,12 @@ def build_espidf_bootloader():
                 join(FRAMEWORK_DIR, "components", "micro-ecc"),
                 src_filter="+<*> -<micro-ecc/test>"
             ),
-            "rtc_clk", "gcc", "stdc++"
+            envsafe.BuildLibrary(
+                join("$BUILD_DIR", "bootloaderSoc"),
+                join(FRAMEWORK_DIR, "components", "soc"),
+                src_filter="+<*> -<test> -<esp32/test>"
+            ),
+            "gcc", "stdc++"
         ]
     )
 
@@ -162,8 +169,12 @@ def build_espidf_bootloader():
 env.Prepend(
     CPPPATH=[
         join("$PROJECTSRC_DIR"),
-        join(FRAMEWORK_DIR, "components", "xtensa-debug-module", "include"),
+        join(FRAMEWORK_DIR, "components", "aws_iot", "include"),
+        join(FRAMEWORK_DIR, "components", "aws_iot",
+             "aws-iot-device-sdk-embedded-C", "include"),
+        join(FRAMEWORK_DIR, "components", "app_trace", "include"),
         join(FRAMEWORK_DIR, "components", "app_update", "include"),
+        join(FRAMEWORK_DIR, "components", "xtensa-debug-module", "include"),
         join(FRAMEWORK_DIR, "components", "bootloader_support", "include"),
         join(FRAMEWORK_DIR, "components",
              "bootloader_support", "include_priv"),
@@ -182,8 +193,15 @@ def build_espidf_bootloader():
         join(FRAMEWORK_DIR, "components", "expat", "port", "include"),
         join(FRAMEWORK_DIR, "components", "fatfs", "src"),
         join(FRAMEWORK_DIR, "components", "freertos", "include"),
+        join(FRAMEWORK_DIR, "components", "jsmn", "include"),
         join(FRAMEWORK_DIR, "components", "json", "include"),
         join(FRAMEWORK_DIR, "components", "json", "port", "include"),
+        join(FRAMEWORK_DIR, "components", "libsodium", "libsodium", "src",
+             "libsodium", "include"),
+        join(FRAMEWORK_DIR, "components", "libsodium", "port_include",
+             "sodium"),
+        join(FRAMEWORK_DIR, "components", "libsodium", "libsodium", "src",
+             "libsodium", "include", "sodium"),
         join(FRAMEWORK_DIR, "components", "log", "include"),
         join(FRAMEWORK_DIR, "components", "lwip", "include", "lwip"),
         join(FRAMEWORK_DIR, "components", "lwip", "include", "lwip", "port"),
@@ -205,8 +223,12 @@ def build_espidf_bootloader():
         join(FRAMEWORK_DIR, "components", "sdmmc", "include"),
         join(FRAMEWORK_DIR, "components", "spi_flash", "include"),
         join(FRAMEWORK_DIR, "components", "tcpip_adapter", "include"),
+        join(FRAMEWORK_DIR, "components", "soc", "esp32", "include"),
+        join(FRAMEWORK_DIR, "components", "soc", "include"),
+        join(FRAMEWORK_DIR, "components", "heap", "include"),
         join(FRAMEWORK_DIR, "components", "ulp", "include"),
         join(FRAMEWORK_DIR, "components", "vfs", "include"),
+        join(FRAMEWORK_DIR, "components", "wear_levelling", "include"),
         join(FRAMEWORK_DIR, "components", "wpa_supplicant", "include"),
         join(FRAMEWORK_DIR, "components", "wpa_supplicant", "port", "include")
     ],
@@ -221,7 +243,7 @@ def build_espidf_bootloader():
     ],
 
     LIBS=[
-        "btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "rtc_clk", "pp",
+        "btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "pp",
         "wpa", "wpa2", "wps", "smartconfig", "m", "c", "gcc", "stdc++"
     ]
 )
@@ -340,7 +362,9 @@ def build_espidf_bootloader():
     "idf_test",
     "partition_table",
     "nghttp",
-    "spi_flash"
+    "soc",
+    "spi_flash",
+    "libsodium"
 )
 
 for d in listdir(join(FRAMEWORK_DIR, "components")):
@@ -351,10 +375,40 @@ def build_espidf_bootloader():
         libs.append(build_component(component_dir))
 
 
+# component.mk contains configuration for bootloader
 libs.append(env.BuildLibrary(
     join("$BUILD_DIR", "spi_flash"),
     join(FRAMEWORK_DIR, "components", "spi_flash"),
-    src_filter="+<*> -<test>"
+    src_filter="+<*> -<test*>"
 ))
 
+libs.append(env.BuildLibrary(
+    join("$BUILD_DIR", "app_trace"),
+    join(FRAMEWORK_DIR, "components", "app_trace"),
+    src_filter="+<*> -<test> -<sys_view>"
+))
+
+libs.append(env.BuildLibrary(
+    join("$BUILD_DIR", "soc"),
+    join(FRAMEWORK_DIR, "components", "soc"),
+    src_filter="+<*> -<test> -<esp32/test>"
+))
+
+envsafe = env.Clone()
+envsafe.Append(
+    CPPDEFINES=[
+        "CONFIGURED", "NATIVE_LITTLE_ENDIAN", "HAVE_WEAK_SYMBOLS",
+        "__STDC_LIMIT_MACROS", "__STDC_CONSTANT_MACROS"
+    ],
+    CCFLAGS=["-Wno-type-limits", "-Wno-unknown-pragmas"]
+)
+
+libs.append(
+    envsafe.BuildLibrary(
+        join("$BUILD_DIR", "libsodium"),
+        join(FRAMEWORK_DIR, "components", "libsodium", "libsodium", "src",
+             "libsodium")
+    )
+)
+
 env.Prepend(LIBS=libs)
diff --git a/examples/espidf-ble-adv/src/main.c b/examples/espidf-ble-adv/src/main.c
@@ -13,10 +13,14 @@
 // limitations under the License.
 
 #include <stdio.h>
+#include <string.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "bt.h"
-#include <string.h>
+#include "esp_log.h"
+#include "nvs_flash.h"
+
+static const char *tag = "BLE_ADV";
 
 #define HCI_H4_CMD_PREAMBLE_SIZE           (4)
 
@@ -214,11 +218,25 @@ void bleAdvtTask(void *pvParameters)
 
 void app_main()
 {
-    esp_bt_controller_init();
+    /* Initialize NVS — it is used to store PHY calibration data */
+    esp_err_t ret = nvs_flash_init();
+    if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
+        ESP_ERROR_CHECK(nvs_flash_erase());
+        ret = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK( ret );
+    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+
+    if (esp_bt_controller_init(&bt_cfg) != ESP_OK) {
+        ESP_LOGI(tag, "Bluetooth controller initialize failed");
+        return;
+    }
 
     if (esp_bt_controller_enable(ESP_BT_MODE_BTDM) != ESP_OK) {
+        ESP_LOGI(tag, "Bluetooth controller enable failed");
         return;
     }
 
     xTaskCreatePinnedToCore(&bleAdvtTask, "bleAdvtTask", 2048, NULL, 5, NULL, 0);
 }
+
diff --git a/examples/espidf-ble-adv/src/sdkconfig.h b/examples/espidf-ble-adv/src/sdkconfig.h
@@ -4,19 +4,24 @@
  * Espressif IoT Development Framework Configuration
  *
  */
+#define CONFIG_GATTC_ENABLE 1
 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
 #define CONFIG_PHY_ENABLED 1
 #define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
-#define CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1
+#define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
+#define CONFIG_BLE_SMP_ENABLE 1
+#define CONFIG_IPC_TASK_STACK_SIZE 1024
 #define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
 #define CONFIG_NEWLIB_STDOUT_ADDCR 1
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
+#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
 #define CONFIG_ETHERNET 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
 #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1
+#define CONFIG_AWS_IOT_MQTT_PORT 8883
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
 #define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10
 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1
@@ -25,81 +30,96 @@
 #define CONFIG_CONSOLE_UART_BAUDRATE 115200
 #define CONFIG_LWIP_MAX_SOCKETS 10
 #define CONFIG_EMAC_TASK_PRIORITY 20
+#define CONFIG_TIMER_TASK_STACK_DEPTH 2048
+#define CONFIG_FATFS_CODEPAGE 1
+#define CONFIG_ESP32_DEFAULT_CPU_FREQ_160 1
 #define CONFIG_ULP_COPROC_RESERVE_MEM 0
 #define CONFIG_ESPTOOLPY_BAUD 115200
 #define CONFIG_INT_WDT_CHECK_CPU1 1
+#define CONFIG_FLASHMODE_DIO 1
 #define CONFIG_ESPTOOLPY_AFTER_RESET 1
 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-"
+#define CONFIG_FREERTOS_IDLE_TASK_STACKSIZE 1024
 #define CONFIG_ESP32_WIFI_AMPDU_ENABLED 1
 #define CONFIG_CONSOLE_UART_NUM 0
 #define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
 #define CONFIG_ESPTOOLPY_BAUD_115200B 1
 #define CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX 0
+#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
 #define CONFIG_CONSOLE_UART_DEFAULT 1
 #define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
+#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
 #define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
-#define CONFIG_MBEDTLS_MPI_USE_INTERRUPT 1
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
+#define CONFIG_BTDM_CONTROLLER_RUN_CPU 0
+#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 #define CONFIG_TASK_WDT 1
 #define CONFIG_MAIN_TASK_STACK_SIZE 4096
 #define CONFIG_TASK_WDT_TIMEOUT_S 5
 #define CONFIG_INT_WDT_TIMEOUT_MS 300
 #define CONFIG_ESPTOOLPY_FLASHMODE "dio"
 #define CONFIG_BTC_TASK_STACK_SIZE 3072
+#define CONFIG_BLUEDROID_ENABLED 1
 #define CONFIG_ESPTOOLPY_BEFORE "default_reset"
 #define CONFIG_LOG_DEFAULT_LEVEL 3
 #define CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION 1
-#define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 0
-#define CONFIG_SPI_FLASH_ENABLE_COUNTERS 1
+#define CONFIG_TIMER_QUEUE_LENGTH 10
+#define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 32
 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
+#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
 #define CONFIG_ESP32_WIFI_NVS_ENABLED 1
+#define CONFIG_AWS_IOT_SDK 1
 #define CONFIG_DMA_RX_BUF_NUM 10
-#define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1
 #define CONFIG_TCP_SYNMAXRTX 6
 #define CONFIG_PYTHON "python"
 #define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_PARTITION_TABLE_SINGLE_APP 1
-#define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 #define CONFIG_WIFI_ENABLED 1
 #define CONFIG_LWIP_DHCP_DOES_ARP_CHECK 1
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 4096
-#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 0
-#define CONFIG_PHY_DATA_OFFSET 0xf000
+#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 2000
+#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
 #define CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
+#define CONFIG_FATFS_CODEPAGE_ASCII 1
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 1
-#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 240
-#define CONFIG_MBEDTLS_HARDWARE_AES 1
+#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 160
 #define CONFIG_FREERTOS_HZ 100
 #define CONFIG_LOG_COLORS 1
 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
 #define CONFIG_FREERTOS_ASSERT_FAIL_ABORT 1
+#define CONFIG_ESP32_XTAL_FREQ 0
 #define CONFIG_MONITOR_BAUD_115200B 1
 #define CONFIG_LOG_BOOTLOADER_LEVEL 3
+#define CONFIG_SMP_ENABLE 1
 #define CONFIG_ESPTOOLPY_BEFORE_RESET 1
 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
-#define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
+#define CONFIG_ESP32_XTAL_FREQ_AUTO 1
 #define CONFIG_TCP_MAXRTX 12
 #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
 #define CONFIG_DMA_TX_BUF_NUM 10
 #define CONFIG_ESP32_DEBUG_OCDAWARE 1
-#define CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG 1
+#define CONFIG_TIMER_TASK_PRIORITY 1
 #define CONFIG_BT_ENABLED 1
 #define CONFIG_MONITOR_BAUD 115200
-#define CONFIG_MBEDTLS_HARDWARE_SHA 1
 #define CONFIG_FREERTOS_CORETIMER_0 1
 #define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
 #define CONFIG_MBEDTLS_HAVE_TIME 1
 #define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY 1
+#define CONFIG_GATTS_ENABLE 1
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
-#define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
+#define CONFIG_AWS_IOT_MQTT_HOST ""
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
+#define CONFIG_BT_ACL_CONNECTIONS 4
+#define CONFIG_FATFS_MAX_LFN 255
+#define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
 #define CONFIG_APP_OFFSET 0x10000
 #define CONFIG_MEMMAP_SMP 1
-#define CONFIG_MBEDTLS_HARDWARE_MPI 1
+#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
 #define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0"
+#define CONFIG_OPTIMIZATION_LEVEL_RELEASE 1