8000 Update IDF to f586f5e (#1296) · bochko/arduino-esp32@69f72ec · GitHub
[go: up one dir, main page]
Skip to content

Commit 69f72ec

Browse files
me-no-devme-no-dev
authored
Update IDF to f586f5e (espressif#1296)
* Update BLE lib * Update IDF to f586f5e * Restructure Bluetooth Serial includes * Update esptool and gen_esp32part * Add partition scheme selection for menuconfig * Add partition scheme selection for Arduino IDE * Fix BLE example * Second attempt BLE fix * Add exceptions to PIO
1 parent 1cf4270 commit 69f72ec
  • bta_gatt_api.h
  • bta_gattc_int.h
  • bta_gatts_int.h
  • bta_hh_int.h
  • bta_jv_int.h
  • bta_sdp_int.h
  • bta_sys.h
  • btc_blufi_prf.h
  • btc_gap_ble.h
  • btc_gatt_common.h
  • btc_gattc.h
  • btc_main.h
  • btc_task.h
  • btm_api.h
  • btm_ble_api.h
  • btm_ble_int.h
  • btm_int.h
  • btu.h
  • dyn_mem.h
  • esp_a2dp_api.h
  • esp_blufi_api.h
  • esp_gap_ble_api.h
  • esp_gattc_api.h
  • esp_gatts_api.h
  • gatt_api.h
  • gatt_int.h
  • hcidefs.h
  • l2c_api.h
  • l2c_int.h
  • rfc_int.h
  • sdpint.h
  • smp_api.h
  • thread.h
  • bt
  • config
  • console
  • driver/driver
  • esp32
  • esp_adc_cal
  • fatfs
  • freertos/freertos
  • heap
  • json
  • log
  • lwip
  • openssl/internal
  • soc/soc
  • spi_flash
  • spiffs
  • tcpip_adapter
  • ld
  • lib
  • sdkconfig

    • Some content is hidden

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

    168 files changed

    +6275
    -662
    lines changed

    ‎Kconfig renamed to ‎Kconfig.projbuild

    Lines changed: 21 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -78,6 +78,27 @@ config ARDUHAL_ESP_LOG
    7878

    7979
    endmenu
    8080

    81+
    choice ARDUHAL_PARTITION_SCHEME
    82+
    bool "Used partition scheme"
    83+
    default ARDUHAL_PARTITION_SCHEME_DEFAULT
    84+
    help
    85+
    Specify which partition scheme to be used.
    86+
    87+
    config ARDUHAL_PARTITION_SCHEME_DEFAULT
    88+
    bool "Default"
    89+
    config ARDUHAL_PARTITION_SCHEME_MINIMAL
    90+
    bool "Minimal (for 2MB FLASH)"
    91+
    config ARDUHAL_PARTITION_SCHEME_NO_OTA
    92+
    bool "No OTA (for large apps)"
    93+
    endchoice
    94+
    95+
    config ARDUHAL_PARTITION_SCHEME
    96+
    string
    97+
    default "default" if ARDUHAL_PARTITION_SCHEME_DEFAULT
    98+
    default "minimal" if ARDUHAL_PARTITION_SCHEME_MINIMAL
    99+
    default "no_ota" if ARDUHAL_PARTITION_SCHEME_NO_OTA
    100+
    101+
    81102
    config AUTOCONNECT_WIFI
    82103
    bool "Autoconnect WiFi on boot"
    83104
    default "n"

    ‎Makefile.projbuild

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -3,7 +3,7 @@ BOOT_APP_BIN_ROOT := $(call dequote,$(COMPONENT_PATH))
    33
    BOOT_APP_BIN_PATH := $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/boot_app0.bin)))
    44

    55
    ifndef CONFIG_PARTITION_TABLE_CUSTOM
    6-
    PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/default.csv)))
    6+
    PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/$(CONFIG_ARDUHAL_PARTITION_SCHEME).csv)))
    77
    endif
    88

    99
    BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)

    ‎boards.txt

    Lines changed: 8 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,6 +2,7 @@ menu.UploadSpeed=Upload Speed
    22
    menu.FlashFreq=Flash Frequency
    33
    menu.FlashMode=Flash Mode
    44
    menu.FlashSize=Flash Size
    5+
    menu.PartitionScheme=Partition Scheme
    56
    menu.DebugLevel=Core Debug Level
    67

    78
    ##############################################################
    @@ -28,6 +29,13 @@ esp32.build.flash_mode=dio
    2829
    esp32.build.boot=dio
    2930
    esp32.build.partitions=default
    3031

    32+
    esp32.menu.PartitionScheme.default=Default
    33+
    esp32.menu.PartitionScheme.default.build.partitions=default
    34+
    esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
    35+
    esp32.menu.PartitionScheme.minimal.build.partitions=minimal
    36+
    esp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
    37+
    esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
    38+
    3139
    esp32.menu.FlashMode.qio=QIO
    3240
    esp32.menu.FlashMode.qio.build.flash_mode=dio
    3341
    esp32.menu.FlashMode.qio.build.boot=qio

    ‎libraries/BLE

    ‎libraries/BluetoothSerial/src/BluetoothSerial.cpp

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,13 @@
    1313
    // limitations under the License.
    1414

    1515
    #include "sdkconfig.h"
    16+
    #include <cstdint>
    17+
    #include <cstdio>
    18+
    #include <cstdlib>
    19+
    #include <cstring>
    20+
    #include "freertos/FreeRTOS.h"
    21+
    #include "freertos/task.h"
    22+
    1623

    1724
    #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
    1825

    ‎libraries/BluetoothSerial/src/BluetoothSerial.h

    Lines changed: 0 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -19,14 +19,6 @@
    1919

    2020
    #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
    2121

    22-
    #include <cstdint>
    23-
    #include <cstdio>
    24-
    #include <cstdlib>
    25-
    #include <cstring>
    26-
    #include "freertos/FreeRTOS.h"
    27-
    #include "freertos/task.h"
    28-
    #include "esp_bt.h"
    29-
    3022
    #include "Arduino.h"
    3123
    #include "Stream.h"
    3224

    ‎package/package_esp32_index.template.json

    Lines changed: 10 additions & 10 deletions
    Original file line numberDiff line numberDiff line change
    @@ -38,7 +38,7 @@
    3838
    {
    3939
    "packager": "esp32",
    4040
    "name": "esptool",
    41-
    "version": "4dab24e"
    41+
    "version": "da31d9d"
    4242
    },
    4343
    {
    4444
    "packager": "esp32",
    @@ -85,21 +85,21 @@
    8585
    },
    8686
    {
    8787
    "name": "esptool",
    88-
    "version": "4dab24e",
    88+
    "version": "da31d9d",
    8989
    "systems": [
    9090
    {
    9191
    "host": "i686-mingw32",
    92-
    "url": "https://dl.espressif.com/dl/esptool-4dab24e-windows.zip",
    93-
    "archiveFileName": "esptool-4dab24e-windows.zip",
    94-
    "checksum": "SHA-256:604014edbd79616470ecda20d623bac3a8d916b1147d37f7a66a83959eff066c",
    95-
    "size": "3462819"
    92+
    "url": "https://dl.espressif.com/dl/esptool-da31d9d-windows.zip",
    93+
    "archiveFileName": "esptool-da31d9d-windows.zip",
    94+
    "checksum": "SHA-256:6476f4d6e33a59167dea364e177d97167316253d2c9ac75f81b469ecb3ed3875",
    95+
    "size": "3395925"
    9696
    },
    9797
    {
    9898
    "host": "x86_64-apple-darwin",
    99-
    "url": "https://dl.espressif.com/dl/esptool-4dab24e-macos.tar.gz",
    100-
    "archiveFileName": "esptool-4dab24e-macos.tar.gz",
    101-
    "checksum": "SHA-256:92fe2f0505ed93051681bd4d5d766664eacfa32745976dda695c728b529dcc8f",
    102-
    "size": "3869525"
    99+
    "url": "https://dl.espressif.com/dl/esptool-da31d9d-macos.tar.gz",
    100+
    "archiveFileName": "esptool-da31d9d-macos.tar.gz",
    101+
    "checksum": "SHA-256:76d53298366a294235356bb8d197a81b2afbfd62642851bfbaee252cc593faa9",
    102+
    "size": "3810904"
    103103
    }
    104104
    ]
    105105
    },

    ‎platform.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -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.common.ld -T esp32.rom.ld -T esp32.peripherals.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 -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lhal -lnewlib -ldriver -lbootloader_support -lpp -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lcxx -lxtensa-debug-module -lmdns -lvfs -lsoc -lcore -lsdmmc -lcoap -ltcpip_adapter -lc_nano -lrtc -lspi_flash -lwpa2 -lesp32 -lapp_update -lnghttp -lspiffs -lespnow -lnvs_flash -lesp_adc_cal -llog -lexpat -lm -lc -lheap -lmbedtls -llwip -lnet80211 -lpthread -ljson -lstdc++
    38+
    compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lhal -lnewlib -ldriver -lbootloader_support -lpp -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lcxx -lxtensa-debug-module -lmdns -lvfs -lsoc -lcore -lsdmmc -lcoap -ltcpip_adapter -lc_nano -lrtc -lspi_flash -lwpa2 -lesp32 -lapp_update -lnghttp -lspiffs -lespnow -lnvs_flash -lesp_adc_cal -llog -lexpat -lm -lc -lheap -lmbedtls -llwip -lnet80211 -lpthread -ljson -lstdc++
    3939

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

    0 commit comments

    Comments
     (0)
    0