espressif · me-no-dev · Apr 7, 2018 · Apr 6, 2018 · Apr 6, 2018 · Apr 6, 2018
diff --git a/Kconfig → Kconfig.projbuild b/Kconfig → Kconfig.projbuild
@@ -78,6 +78,27 @@ config ARDUHAL_ESP_LOG
 
 endmenu
 
+choice ARDUHAL_PARTITION_SCHEME
+    bool "Used partition scheme"
+    default ARDUHAL_PARTITION_SCHEME_DEFAULT
+    help
+        Specify which partition scheme to be used.
+
+config ARDUHAL_PARTITION_SCHEME_DEFAULT
+    bool "Default"
+config ARDUHAL_PARTITION_SCHEME_MINIMAL
+    bool "Minimal (for 2MB FLASH)"
+config ARDUHAL_PARTITION_SCHEME_NO_OTA
+    bool "No OTA (for large apps)"
+endchoice
+
+config ARDUHAL_PARTITION_SCHEME
+    string
+    default "default" if ARDUHAL_PARTITION_SCHEME_DEFAULT
+    default "minimal" if ARDUHAL_PARTITION_SCHEME_MINIMAL
+    default "no_ota" if ARDUHAL_PARTITION_SCHEME_NO_OTA
+
+
 config AUTOCONNECT_WIFI
     bool "Autoconnect WiFi on boot"
     default "n"

diff --git a/Makefile.projbuild b/Makefile.projbuild
@@ -3,7 +3,7 @@ BOOT_APP_BIN_ROOT := $(call dequote,$(COMPONENT_PATH))
 BOOT_APP_BIN_PATH := $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/boot_app0.bin)))
 
 ifndef CONFIG_PARTITION_TABLE_CUSTOM
-PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/default.csv)))
+PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/$(CONFIG_ARDUHAL_PARTITION_SCHEME).csv)))
 endif
 
 BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)

diff --git a/boards.txt b/boards.txt
@@ -2,6 +2,7 @@ menu.UploadSpeed=Upload Speed
 menu.FlashFreq=Flash Frequency
 menu.FlashMode=Flash Mode
 menu.FlashSize=Flash Size
+menu.PartitionScheme=Partition Scheme
 menu.DebugLevel=Core Debug Level
 
 ##############################################################
@@ -28,6 +29,13 @@ esp32.build.flash_mode=dio
 esp32.build.boot=dio
 esp32.build.partitions=default
 
+esp32.menu.PartitionScheme.default=Default
+esp32.menu.PartitionScheme.default.build.partitions=default
+esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
+esp32.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
+esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+
 esp32.menu.FlashMode.qio=QIO
 esp32.menu.FlashMode.qio.build.flash_mode=dio
 esp32.menu.FlashMode.qio.build.boot=qio

diff --git a/libraries/BLE b/libraries/BLE
diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.cpp b/libraries/BluetoothSerial/src/BluetoothSerial.cpp
@@ -13,6 +13,13 @@
 // limitations under the License.
 
 #include "sdkconfig.h"
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
 
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 

diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.h b/libraries/BluetoothSerial/src/BluetoothSerial.h
@@ -19,14 +19,6 @@
 
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_bt.h"
-
 #include "Arduino.h"
 #include "Stream.h"
 

diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
@@ -38,7 +38,7 @@
             {
               "packager": "esp32",
               "name": "esptool",
-              "version": "4dab24e"
+              "version": "da31d9d"
             },
             {
               "packager": "esp32",
@@ -85,21 +85,21 @@
         },
         {
           "name": "esptool",
-          "version": "4dab24e",
+          "version": "da31d9d",
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://dl.espressif.com/dl/esptool-4dab24e-windows.zip",
-              "archiveFileName": "esptool-4dab24e-windows.zip",
-              "checksum": "SHA-256:604014edbd79616470ecda20d623bac3a8d916b1147d37f7a66a83959eff066c",
-              "size": "3462819"
+              "url": "https://dl.espressif.com/dl/esptool-da31d9d-windows.zip",
+              "archiveFileName": "esptool-da31d9d-windows.zip",
+              "checksum": "SHA-256:6476f4d6e33a59167dea364e177d97167316253d2c9ac75f81b469ecb3ed3875",
+              "size": "3395925"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://dl.espressif.com/dl/esptool-4dab24e-macos.tar.gz",
-              "archiveFileName": "esptool-4dab24e-macos.tar.gz",
-              "checksum": "SHA-256:92fe2f0505ed93051681bd4d5d766664eacfa32745976dda695c728b529dcc8f",
-              "size": "3869525"
+              "url": "https://dl.espressif.com/dl/esptool-da31d9d-macos.tar.gz",
+              "archiveFileName": "esptool-da31d9d-macos.tar.gz",
+              "checksum": "SHA-256:76d53298366a294235356bb8d197a81b2afbfd62642851bfbaee252cc593faa9",
+              "size": "3810904"
             }
           ]
         },

diff --git a/platform.txt b/platform.txt
@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 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
-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++
+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++
 
 compiler.as.cmd=xtensa-esp32-elf-as
+1 −1		README.md
+104 −0		examples/BLE_iBeacon/BLE_iBeacon.ino
+23 −11		examples/BLE_notify/BLE_notify.ino
+33 −19		examples/BLE_uart/BLE_uart.ino
+1 −1		library.properties
+10 −0		src/BLEAdvertising.cpp
+4 −3		src/BLEAdvertising.h
+1 −0		src/BLEClient.cpp
+1 −1		src/BLEDescriptor.cpp
+24 −0		src/BLEDevice.cpp
+1 −0		src/BLEDevice.h
+2 −1		src/BLEService.cpp
+1 −1		src/BLEUtils.cpp