diff --git a/README.md b/README.md index a3c2211..559488f 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications. * [Home](http://platformio.org/platforms/espressif32) (home page in PlatformIO Platform Registry) -* [Documentation](http://docs.platformio.org/en/stable/platforms/espressif32.html) (advanced usage, packages, boards, frameworks, etc.) +* [Documentation](http://docs.platformio.org/page/platforms/espressif32.html) (advanced usage, packages, boards, frameworks, etc.) # Usage -1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html) +1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html) 2. Install Espressif 32 development platform: ```bash # install the latest stable version diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index dccdcf8..d693b35 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -143,7 +143,7 @@ def build_espidf_bootloader(): join(FRAMEWORK_DIR, "components", "micro-ecc"), src_filter="+<*> -" ), - "rtc", "gcc", "stdc++" + "rtc_clk", "gcc", "stdc++" ] ) @@ -218,7 +218,7 @@ env.Prepend( ], LIBS=[ - "btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "pp", + "btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "rtc_clk", "pp", "wpa", "wpa2", "wps", "smartconfig", "m", "c", "gcc", "stdc++" ] ) diff --git a/builder/main.py b/builder/main.py index 401eebf..d70798b 100644 --- a/builder/main.py +++ b/builder/main.py @@ -89,11 +89,13 @@ env.Replace( UPLOADERFLAGS=[ "--chip", "esp32", "--port", '"$UPLOAD_PORT"', + "--before", "default_reset", + "--after", "hard_reset", "--baud", "$UPLOAD_SPEED", "write_flash", "-z", "--flash_mode", "$BOARD_FLASH_MODE", "--flash_freq", "${__get_board_f_flash(__env__)}", - "--flash_size", env.BoardConfig().get("upload.flash_size", "4MB") + "--flash_size", "detect" ], UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE', diff --git a/examples/arduino-blink/.travis.yml b/examples/arduino-blink/.travis.yml index ac0a029..593d7ef 100644 --- a/examples/arduino-blink/.travis.yml +++ b/examples/arduino-blink/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choose one of the following templates (proposed below) and uncomment diff --git a/examples/arduino-blink/README.rst b/examples/arduino-blink/README.rst index c455a2d..e6d8784 100644 --- a/examples/arduino-blink/README.rst +++ b/examples/arduino-blink/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/arduino-blink/lib/readme.txt b/examples/arduino-blink/lib/readme.txt index 0d0e7be..4b6209e 100644 --- a/examples/arduino-blink/lib/readme.txt +++ b/examples/arduino-blink/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 9748671..379aaed 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:esp32dev] platform = espressif32 diff --git a/examples/arduino-wifiscan/.travis.yml b/examples/arduino-wifiscan/.travis.yml index ac0a029..593d7ef 100644 --- a/examples/arduino-wifiscan/.travis.yml +++ b/examples/arduino-wifiscan/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choose one of the following templates (proposed below) and uncomment diff --git a/examples/arduino-wifiscan/README.rst b/examples/arduino-wifiscan/README.rst index 49dfa1a..48bf203 100644 --- a/examples/arduino-wifiscan/README.rst +++ b/examples/arduino-wifiscan/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/arduino-wifiscan/lib/readme.txt b/examples/arduino-wifiscan/lib/readme.txt index 0d0e7be..4b6209e 100644 --- a/examples/arduino-wifiscan/lib/readme.txt +++ b/examples/arduino-wifiscan/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/arduino-wifiscan/platformio.ini b/examples/arduino-wifiscan/platformio.ini index c359dfd..2f796f6 100644 --- a/examples/arduino-wifiscan/platformio.ini +++ b/examples/arduino-wifiscan/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-ble-adv/.travis.yml b/examples/espidf-ble-adv/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-ble-adv/.travis.yml +++ b/examples/espidf-ble-adv/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-ble-adv/README.rst b/examples/espidf-ble-adv/README.rst index dc07957..1d4392e 100644 --- a/examples/espidf-ble-adv/README.rst +++ b/examples/espidf-ble-adv/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-ble-adv/lib/readme.txt b/examples/espidf-ble-adv/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-ble-adv/lib/readme.txt +++ b/examples/espidf-ble-adv/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-ble-adv/platformio.ini b/examples/espidf-ble-adv/platformio.ini index e743c61..2461183 100644 --- a/examples/espidf-ble-adv/platformio.ini +++ b/examples/espidf-ble-adv/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-ble-adv/src/main.c b/examples/espidf-ble-adv/src/main.c index 7d12388..afd1182 100644 --- a/examples/espidf-ble-adv/src/main.c +++ b/examples/espidf-ble-adv/src/main.c @@ -215,5 +215,10 @@ void bleAdvtTask(void *pvParameters) void app_main() { esp_bt_controller_init(); + + if (esp_bt_controller_enable(ESP_BT_MODE_BTDM) != ESP_OK) { + 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 index 9bde466..83eaddb 100644 --- a/examples/espidf-ble-adv/src/sdkconfig.h +++ b/examples/espidf-ble-adv/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/espidf-coap-server/.travis.yml b/examples/espidf-coap-server/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-coap-server/.travis.yml +++ b/examples/espidf-coap-server/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-coap-server/README.rst b/examples/espidf-coap-server/README.rst index 294285d..95412d8 100644 --- a/examples/espidf-coap-server/README.rst +++ b/examples/espidf-coap-server/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-coap-server/lib/readme.txt b/examples/espidf-coap-server/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-coap-server/lib/readme.txt +++ b/examples/espidf-coap-server/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-coap-server/platformio.ini b/examples/espidf-coap-server/platformio.ini index e743c61..2461183 100644 --- a/examples/espidf-coap-server/platformio.ini +++ b/examples/espidf-coap-server/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-coap-server/src/sdkconfig.h b/examples/espidf-coap-server/src/sdkconfig.h index 9bde466..83eaddb 100644 --- a/examples/espidf-coap-server/src/sdkconfig.h +++ b/examples/espidf-coap-server/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/espidf-hello-world/.travis.yml b/examples/espidf-hello-world/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-hello-world/.travis.yml +++ b/examples/espidf-hello-world/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-hello-world/README.rst b/examples/espidf-hello-world/README.rst index a30e25c..0dd0bcc 100644 --- a/examples/espidf-hello-world/README.rst +++ b/examples/espidf-hello-world/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-hello-world/lib/readme.txt b/examples/espidf-hello-world/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-hello-world/lib/readme.txt +++ b/examples/espidf-hello-world/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-hello-world/platformio.ini b/examples/espidf-hello-world/platformio.ini index b3b366a..535432e 100644 --- a/examples/espidf-hello-world/platformio.ini +++ b/examples/espidf-hello-world/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:esp32dev] platform = espressif32 diff --git a/examples/espidf-hello-world/src/sdkconfig.h b/examples/espidf-hello-world/src/sdkconfig.h index 9bde466..83eaddb 100644 --- a/examples/espidf-hello-world/src/sdkconfig.h +++ b/examples/espidf-hello-world/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/espidf-http-request/.travis.yml b/examples/espidf-http-request/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-http-request/.travis.yml +++ b/examples/espidf-http-request/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-http-request/README.rst b/examples/espidf-http-request/README.rst index c21cd89..0942be4 100644 --- a/examples/espidf-http-request/README.rst +++ b/examples/espidf-http-request/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-http-request/lib/readme.txt b/examples/espidf-http-request/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-http-request/lib/readme.txt +++ b/examples/espidf-http-request/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-http-request/platformio.ini b/examples/espidf-http-request/platformio.ini index ced207a..e8818f5 100644 --- a/examples/espidf-http-request/platformio.ini +++ b/examples/espidf-http-request/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-http-request/src/main.c b/examples/espidf-http-request/src/main.c index 1f8d988..3831ae6 100644 --- a/examples/espidf-http-request/src/main.c +++ b/examples/espidf-http-request/src/main.c @@ -88,7 +88,7 @@ static void initialise_wifi(void) }; ESP_LOGI(TAG, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); - ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) ); + ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_start() ); } @@ -115,7 +115,7 @@ static void http_get_task(void *pvParameters) if(err != 0 || res == NULL) { ESP_LOGE(TAG, "DNS lookup failed err=%d res=%p", err, res); - vTaskDelay(1000 / portTICK_RATE_MS); + vTaskDelay(1000 / portTICK_PERIOD_MS); continue; } @@ -129,7 +129,7 @@ static void http_get_task(void *pvParameters) if(s < 0) { ESP_LOGE(TAG, "... Failed to allocate socket."); freeaddrinfo(res); - vTaskDelay(1000 / portTICK_RATE_MS); + vTaskDelay(1000 / portTICK_PERIOD_MS); continue; } ESP_LOGI(TAG, "... allocated socket\r\n"); @@ -138,7 +138,7 @@ static void http_get_task(void *pvParameters) ESP_LOGE(TAG, "... socket connect failed errno=%d", errno); close(s); freeaddrinfo(res); - vTaskDelay(4000 / portTICK_RATE_MS); + vTaskDelay(4000 / portTICK_PERIOD_MS); continue; } @@ -148,7 +148,7 @@ static void http_get_task(void *pvParameters) if (write(s, REQUEST, strlen(REQUEST)) < 0) { ESP_LOGE(TAG, "... socket send failed"); close(s); - vTaskDelay(4000 / portTICK_RATE_MS); + vTaskDelay(4000 / portTICK_PERIOD_MS); continue; } ESP_LOGI(TAG, "... socket send success"); @@ -166,7 +166,7 @@ static void http_get_task(void *pvParameters) close(s); for(int countdown = 10; countdown >= 0; countdown--) { ESP_LOGI(TAG, "%d... ", countdown); - vTaskDelay(1000 / portTICK_RATE_MS); + vTaskDelay(1000 / portTICK_PERIOD_MS); } ESP_LOGI(TAG, "Starting again!"); } @@ -175,7 +175,6 @@ static void http_get_task(void *pvParameters) void app_main() { nvs_flash_init(); - system_init(); initialise_wifi(); xTaskCreate(&http_get_task, "http_get_task", 2048, NULL, 5, NULL); -} \ No newline at end of file +} diff --git a/examples/espidf-http-request/src/sdkconfig.h b/examples/espidf-http-request/src/sdkconfig.h index 9bde466..83eaddb 100644 --- a/examples/espidf-http-request/src/sdkconfig.h +++ b/examples/espidf-http-request/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/espidf-peripherals-uart/.travis.yml b/examples/espidf-peripherals-uart/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-peripherals-uart/.travis.yml +++ b/examples/espidf-peripherals-uart/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-peripherals-uart/README.rst b/examples/espidf-peripherals-uart/README.rst index 27183da..b3a999f 100644 --- a/examples/espidf-peripherals-uart/README.rst +++ b/examples/espidf-peripherals-uart/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-peripherals-uart/lib/readme.txt b/examples/espidf-peripherals-uart/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-peripherals-uart/lib/readme.txt +++ b/examples/espidf-peripherals-uart/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-peripherals-uart/platformio.ini b/examples/espidf-peripherals-uart/platformio.ini index e743c61..2461183 100644 --- a/examples/espidf-peripherals-uart/platformio.ini +++ b/examples/espidf-peripherals-uart/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-peripherals-uart/src/sdkconfig.h b/examples/espidf-peripherals-uart/src/sdkconfig.h index 9bde466..83eaddb 100644 --- a/examples/espidf-peripherals-uart/src/sdkconfig.h +++ b/examples/espidf-peripherals-uart/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/espidf-storage-sdcard/.travis.yml b/examples/espidf-storage-sdcard/.travis.yml index 72c6e43..2c4ff5c 100644 --- a/examples/espidf-storage-sdcard/.travis.yml +++ b/examples/espidf-storage-sdcard/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/espidf-storage-sdcard/README.rst b/examples/espidf-storage-sdcard/README.rst index 6be3563..2f296fc 100644 --- a/examples/espidf-storage-sdcard/README.rst +++ b/examples/espidf-storage-sdcard/README.rst @@ -12,8 +12,8 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ -2. Download `development platform with examples `_ +1. `Install PlatformIO Core `_ +2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/espidf-storage-sdcard/lib/readme.txt b/examples/espidf-storage-sdcard/lib/readme.txt index a3271c7..6581e73 100644 --- a/examples/espidf-storage-sdcard/lib/readme.txt +++ b/examples/espidf-storage-sdcard/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/espidf-storage-sdcard/platformio.ini b/examples/espidf-storage-sdcard/platformio.ini index e743c61..2461183 100644 --- a/examples/espidf-storage-sdcard/platformio.ini +++ b/examples/espidf-storage-sdcard/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/espidf-storage-sdcard/src/sdkconfig.h b/examples/espidf-storage-sdcard/src/sdkconfig.h index 9bde466..83eaddb 100644 --- a/examples/espidf-storage-sdcard/src/sdkconfig.h +++ b/examples/espidf-storage-sdcard/src/sdkconfig.h @@ -7,6 +7,7 @@ #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_ESPTOOLPY_FLASHFREQ "40m" #define CONFIG_NEWLIB_STDOUT_ADDCR 1 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 1 @@ -17,6 +18,7 @@ #define CONFIG_LOG_BOOTLOADER_LEVEL_INFO 1 #define CONFIG_ESPTOOLPY_FLASHSIZE_2MB 1 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1 +#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10 #define CONFIG_LOG_DEFAULT_LEVEL_INFO 1 #define CONFIG_BT_RESERVE_DRAM 0x10000 #define CONFIG_ESP32_PANIC_PRINT_REBOOT 1 @@ -28,6 +30,7 @@ #define CONFIG_INT_WDT_CHECK_CPU1 1 #define CONFIG_ESPTOOLPY_AFTER_RESET 1 #define CONFIG_TOOLPREFIX "xtensa-esp32-elf-" +#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 @@ -46,8 +49,10 @@ #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_ESP32_PHY_MAX_WIFI_TX_POWER 20 +#define CONFIG_ESP32_WIFI_NVS_ENABLED 1 #define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_TCP_SYNMAXRTX 6 @@ -57,16 +62,20 @@ #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_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000 +#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 #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_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_MONITOR_BAUD_115200B 1 #define CONFIG_LOG_BOOTLOADER_LEVEL 3 @@ -88,11 +97,9 @@ #define CONFIG_FREERTOS_ISR_STACKSIZE 1536 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1 -#define CONFIG_ESP32_PHY_AUTO_INIT 1 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32 -#define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25 #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_MEMMAP_SMP 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 -#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" \ No newline at end of file +#define CONFIG_ESPTOOLPY_PORT "/dev/ttyUSB0" diff --git a/examples/pumbaa-blink/.travis.yml b/examples/pumbaa-blink/.travis.yml index 72c6e43..2c4ff5c 100755 --- a/examples/pumbaa-blink/.travis.yml +++ b/examples/pumbaa-blink/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/pumbaa-blink/README.rst b/examples/pumbaa-blink/README.rst index e6ef98a..68035fd 100755 --- a/examples/pumbaa-blink/README.rst +++ b/examples/pumbaa-blink/README.rst @@ -12,7 +12,7 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/pumbaa-blink/lib/readme.txt b/examples/pumbaa-blink/lib/readme.txt index a3271c7..6581e73 100755 --- a/examples/pumbaa-blink/lib/readme.txt +++ b/examples/pumbaa-blink/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/pumbaa-blink/platformio.ini b/examples/pumbaa-blink/platformio.ini index fc5acc9..da2c58b 100755 --- a/examples/pumbaa-blink/platformio.ini +++ b/examples/pumbaa-blink/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/examples/simba-blink/.travis.yml b/examples/simba-blink/.travis.yml index 72c6e43..2c4ff5c 100755 --- a/examples/simba-blink/.travis.yml +++ b/examples/simba-blink/.travis.yml @@ -1,6 +1,6 @@ # Continuous Integration (CI) is the practice, in software # engineering, of merging all developer working copies with a shared mainline -# several times a day < http://docs.platformio.org/en/stable/ci/index.html > +# several times a day < http://docs.platformio.org/page/ci/index.html > # # Documentation: # @@ -8,10 +8,10 @@ # < https://docs.travis-ci.com/user/integration/platformio/ > # # * PlatformIO integration with Travis CI -# < http://docs.platformio.org/en/stable/ci/travis.html > +# < http://docs.platformio.org/page/ci/travis.html > # # * User Guide for `platformio ci` command -# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html > +# < http://docs.platformio.org/page/userguide/cmd_ci.html > # # # Please choice one of the following templates (proposed below) and uncomment diff --git a/examples/simba-blink/README.rst b/examples/simba-blink/README.rst index 5ef2ab7..62ded60 100755 --- a/examples/simba-blink/README.rst +++ b/examples/simba-blink/README.rst @@ -12,7 +12,7 @@ How to build PlatformIO based project ===================================== -1. `Install PlatformIO `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/simba-blink/lib/readme.txt b/examples/simba-blink/lib/readme.txt index a3271c7..6581e73 100755 --- a/examples/simba-blink/lib/readme.txt +++ b/examples/simba-blink/lib/readme.txt @@ -34,5 +34,5 @@ include paths and build them. See additional options for PlatformIO Library Dependency Finder `lib_*`: -http://docs.platformio.org/en/stable/projectconf.html#lib-install +http://docs.platformio.org/page/projectconf.html#lib-install diff --git a/examples/simba-blink/platformio.ini b/examples/simba-blink/platformio.ini index 25c8e94..802ec51 100755 --- a/examples/simba-blink/platformio.ini +++ b/examples/simba-blink/platformio.ini @@ -5,7 +5,7 @@ ; Library options: dependencies, extra library storages ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/en/stable/projectconf.html +; http://docs.platformio.org/page/projectconf.html [env:nano32] platform = espressif32 diff --git a/platform.json b/platform.json index c0f2fb7..6f11744 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "0.6.0", + "version": "0.7.0", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download", @@ -51,7 +51,7 @@ "framework-espidf": { "type": "framework", "optional": true, - "version": "~1.200.0" + "version": "~2.200.0" }, "framework-simba": { "type": "framework",