Skip to content

[pull] master from espressif:master #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 20, 2020
Merged

[pull] master from espressif:master #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
579e04b
Cleanup SPI_Multiple_Buses (#3527)
muman613 Jan 20, 2020
2f13a96
Add WIFI_REASON_CONNECTION_FAIL in WiFiGeneric.cpp (#3529)
felixstorm-c4a8 Jan 20, 2020
c2b37d9
Updated BLERemoteCharacteristic to exposre esp_gatt_auth_req_t parame…
cipherz Jan 20, 2020
915d45d
Defined BLE setAdvertisementType (#3535)
syonbori Jan 20, 2020
6e77f7f
Setting loging level to VERBOSE on Semaphore::take (#3545)
I-Connect Jan 20, 2020
0607d36
HardwareSerial::write(const char*, ...) API compatibility to AVR, ESP…
dok-net Jan 20, 2020
dd78794
Update CaptivePortal.ino (#3628)
DanielLester83 Jan 20, 2020
e7c9813
Added Piranha ESP-32 and Metro ESP-32 boards (#3542)
drondistortion Jan 20, 2020
82e208c
Fixed incorrect board name for TinyPICO - You can now use this to det…
UnexpectedMaker Jan 20, 2020
5960cd3
update coreESP32 boards.txt (#3569)
radiumray Jan 20, 2020
86de90f
Added partition and flash size menus for VintLabs boards (#3602)
pvint Jan 20, 2020
89351e3
Update WiFiClient.cpp (#3608)
Vigeant Jan 20, 2020
cb005fc
Extend BLEDevice::setPower() to include powerType parameter. It's opt…
robert-alfaro Jan 20, 2020
8d938c8
Add HONEYLemon board (#3640)
jackrobotics Jan 20, 2020
2195109
Added the channel parameter to the scan fucntion in order to select w…
ingframin Jan 20, 2020
ac9d04a
Add BLEDevice::stopAdvertising() helper method to compliment startAdv…
robert-alfaro Jan 20, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 254 additions & 3 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ tinypico.serial.disableRTS=true
tinypico.build.mcu=esp32
tinypico.build.core=esp32
tinypico.build.variant=pico32
tinypico.build.board=ESP32_PICO
tinypico.build.board=TINYPICO

tinypico.build.f_cpu=240000000L
tinypico.build.flash_size=4MB
Expand Down Expand Up @@ -3116,8 +3116,8 @@ CoreESP32.upload.maximum_size=1310720
CoreESP32.upload.maximum_data_size=327680
CoreESP32.upload.wait_for_upload_port=true

CoreESP32.serial.disableDTR=true
CoreESP32.serial.disableRTS=true
CoreESP32.serial.disableDTR=false
CoreESP32.serial.disableRTS=false

CoreESP32.build.mcu=esp32
CoreESP32.build.core=esp32
Expand All @@ -3131,6 +3131,24 @@ CoreESP32.build.boot=dio
CoreESP32.build.partitions=default
CoreESP32.build.defines=

CoreESP32.menu.PSRAM.disabled=Disabled
CoreESP32.menu.PSRAM.disabled.build.defines=
CoreESP32.menu.PSRAM.enabled=Enabled
CoreESP32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue

CoreESP32.menu.PartitionScheme.default=Default
CoreESP32.menu.PartitionScheme.default.build.partitions=default
CoreESP32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
CoreESP32.menu.PartitionScheme.minimal.build.partitions=minimal
CoreESP32.menu.PartitionScheme.no_ota=No OTA (Large APP)
CoreESP32.menu.PartitionScheme.no_ota.build.partitions=no_ota
CoreESP32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
CoreESP32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
CoreESP32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
CoreESP32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
CoreESP32.menu.PartitionScheme.fatflash=16M Fat
CoreESP32.menu.PartitionScheme.fatflash.build.partitions=ffat

CoreESP32.menu.FlashFreq.80=80MHz
CoreESP32.menu.FlashFreq.80.build.flash_freq=80m
CoreESP32.menu.FlashFreq.40=40MHz
Expand All @@ -3151,6 +3169,19 @@ CoreESP32.menu.UploadSpeed.460800.upload.speed=460800
CoreESP32.menu.UploadSpeed.512000.windows=512000
CoreESP32.menu.UploadSpeed.512000.upload.speed=512000

CoreESP32.menu.DebugLevel.none=None
CoreESP32.menu.DebugLevel.none.build.code_debug=0
CoreESP32.menu.DebugLevel.error=Error
CoreESP32.menu.DebugLevel.error.build.code_debug=1
CoreESP32.menu.DebugLevel.warn=Warn
CoreESP32.menu.DebugLevel.warn.build.code_debug=2
CoreESP32.menu.DebugLevel.info=Info
CoreESP32.menu.DebugLevel.info.build.code_debug=3
CoreESP32.menu.DebugLevel.debug=Debug
CoreESP32.menu.DebugLevel.debug.build.code_debug=4
CoreESP32.menu.DebugLevel.verbose=Verbose
CoreESP32.menu.DebugLevel.verbose.build.code_debug=5

##############################################################


Expand Down Expand Up @@ -4235,6 +4266,51 @@ vintlabs-devkit-v1.menu.UploadSpeed.460800.upload.speed=460800
vintlabs-devkit-v1.menu.UploadSpeed.512000.windows=512000
vintlabs-devkit-v1.menu.UploadSpeed.512000.upload.speed=512000

vintlabs-devkit-v1.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.default.build.partitions=default
vintlabs-devkit-v1.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
vintlabs-devkit-v1.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
vintlabs-devkit-v1.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
vintlabs-devkit-v1.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
vintlabs-devkit-v1.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
vintlabs-devkit-v1.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.minimal.build.partitions=minimal
vintlabs-devkit-v1.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.no_ota.build.partitions=no_ota
vintlabs-devkit-v1.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
vintlabs-devkit-v1.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
vintlabs-devkit-v1.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
vintlabs-devkit-v1.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
vintlabs-devkit-v1.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
vintlabs-devkit-v1.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
vintlabs-devkit-v1.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
vintlabs-devkit-v1.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
vintlabs-devkit-v1.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
vintlabs-devkit-v1.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.huge_app.build.partitions=huge_app
vintlabs-devkit-v1.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
vintlabs-devkit-v1.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
vintlabs-devkit-v1.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
vintlabs-devkit-v1.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
vintlabs-devkit-v1.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
vintlabs-devkit-v1.menu.PartitionScheme.fatflash.build.partitions=ffat
vintlabs-devkit-v1.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
vintlabs-devkit-v1.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
vintlabs-devkit-v1.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
vintlabs-devkit-v1.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728

vintlabs-devkit-v1.menu.FlashSize.4M=4MB (32Mb)
vintlabs-devkit-v1.menu.FlashSize.4M.build.flash_size=4MB
vintlabs-devkit-v1.menu.FlashSize.8M=8MB (64Mb)
vintlabs-devkit-v1.menu.FlashSize.8M.build.flash_size=8MB
vintlabs-devkit-v1.menu.FlashSize.8M.build.partitions=default_8MB
vintlabs-devkit-v1.menu.FlashSize.2M=2MB (16Mb)
vintlabs-devkit-v1.menu.FlashSize.2M.build.flash_size=2MB
vintlabs-devkit-v1.menu.FlashSize.2M.build.partitions=minimal
vintlabs-devkit-v1.menu.FlashSize.16M=16MB (128Mb)
vintlabs-devkit-v1.menu.FlashSize.16M.build.flash_size=16MB

vintlabs-devkit-v1.menu.DebugLevel.none=None
vintlabs-devkit-v1.menu.DebugLevel.none.build.code_debug=0
vintlabs-devkit-v1.menu.DebugLevel.error=Error
Expand All @@ -4248,6 +4324,50 @@ vintlabs-devkit-v1.menu.DebugLevel.debug.build.code_debug=4

##############################################################

honeylemon.name=HONEYLemon

honeylemon.upload.tool=esptool_py
honeylemon.upload.maximum_size=1310720
honeylemon.upload.maximum_data_size=327680
honeylemon.upload.wait_for_upload_port=true

honeylemon.serial.disableDTR=true
honeylemon.serial.disableRTS=true

honeylemon.build.mcu=esp32
honeylemon.build.core=esp32
honeylemon.build.variant=honeylemon
honeylemon.build.board=HONEYLEMON

honeylemon.build.f_cpu=240000000L
honeylemon.build.flash_mode=dio
honeylemon.build.flash_size=4MB
honeylemon.build.boot=dio
honeylemon.build.partitions=default
honeylemon.build.defines=

honeylemon.menu.FlashFreq.80=80MHz
honeylemon.menu.FlashFreq.80.build.flash_freq=80m
honeylemon.menu.FlashFreq.40=40MHz
honeylemon.menu.FlashFreq.40.build.flash_freq=40m

honeylemon.menu.UploadSpeed.921600=921600
honeylemon.menu.UploadSpeed.921600.upload.speed=921600
honeylemon.menu.UploadSpeed.115200=115200
honeylemon.menu.UploadSpeed.115200.upload.speed=115200
honeylemon.menu.UploadSpeed.256000.windows=256000
honeylemon.menu.UploadSpeed.256000.upload.speed=256000
honeylemon.menu.UploadSpeed.230400.windows.upload.speed=256000
honeylemon.menu.UploadSpeed.230400=230400
honeylemon.menu.UploadSpeed.230400.upload.speed=230400
honeylemon.menu.UploadSpeed.460800.linux=460800
honeylemon.menu.UploadSpeed.460800.macosx=460800
honeylemon.menu.UploadSpeed.460800.upload.speed=460800
honeylemon.menu.UploadSpeed.512000.windows=512000
honeylemon.menu.UploadSpeed.512000.upload.speed=512000

##############################################################

mgbot-iotik32a.name=MGBOT IOTIK 32A

mgbot-iotik32a.upload.tool=esptool_py
Expand Down Expand Up @@ -4523,3 +4643,134 @@ mgbot-iotik32b.menu.DebugLevel.verbose=Verbose
mgbot-iotik32b.menu.DebugLevel.verbose.build.code_debug=5

##############################################################
piranha_esp-32.name=Piranha ESP-32

piranha_esp-32.upload.tool=esptool_py
piranha_esp-32.upload.maximum_size=1310720
piranha_esp-32.upload.maximum_data_size=327680
piranha_esp-32.upload.wait_for_upload_port=true

piranha_esp-32.serial.disableDTR=true
piranha_esp-32.serial.disableRTS=true

piranha_esp-32.build.mcu=esp32
piranha_esp-32.build.core=esp32
piranha_esp-32.build.variant=piranha_esp-32
piranha_esp-32.build.board=Piranha

piranha_esp-32.build.f_cpu=240000000L
piranha_esp-32.build.flash_mode=dio
piranha_esp-32.build.flash_size=4MB
piranha_esp-32.build.boot=dio
piranha_esp-32.build.partitions=default
piranha_esp-32.build.defines=

piranha_esp-32.menu.PartitionScheme.default=Default
piranha_esp-32.menu.PartitionScheme.default.build.partitions=default
piranha_esp-32.menu.PartitionScheme.no_ota=No OTA (Large APP)
piranha_esp-32.menu.PartitionScheme.no_ota.build.partitions=no_ota
piranha_esp-32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
piranha_esp-32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
piranha_esp-32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
piranha_esp-32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080

piranha_esp-32.menu.FlashFreq.80=80MHz
piranha_esp-32.menu.FlashFreq.80.build.flash_freq=80m
piranha_esp-32.menu.FlashFreq.40=40MHz
piranha_esp-32.menu.FlashFreq.40.build.flash_freq=40m

piranha_esp-32.menu.UploadSpeed.921600=921600
piranha_esp-32.menu.UploadSpeed.921600.upload.speed=921600
piranha_esp-32.menu.UploadSpeed.115200=115200
piranha_esp-32.menu.UploadSpeed.115200.upload.speed=115200
piranha_esp-32.menu.UploadSpeed.256000.windows=256000
piranha_esp-32.menu.UploadSpeed.256000.upload.speed=256000
piranha_esp-32.menu.UploadSpeed.230400.windows.upload.speed=256000
piranha_esp-32.menu.UploadSpeed.230400=230400
piranha_esp-32.menu.UploadSpeed.230400.upload.speed=230400
piranha_esp-32.menu.UploadSpeed.460800.linux=460800
piranha_esp-32.menu.UploadSpeed.460800.macosx=460800
piranha_esp-32.menu.UploadSpeed.460800.upload.speed=460800
piranha_esp-32.menu.UploadSpeed.512000.windows=512000
piranha_esp-32.menu.UploadSpeed.512000.upload.speed=512000

piranha_esp-32.menu.DebugLevel.none=None
piranha_esp-32.menu.DebugLevel.none.build.code_debug=0
piranha_esp-32.menu.DebugLevel.error=Error
piranha_esp-32.menu.DebugLevel.error.build.code_debug=1
piranha_esp-32.menu.DebugLevel.warn=Warn
piranha_esp-32.menu.DebugLevel.warn.build.code_debug=2
piranha_esp-32.menu.DebugLevel.info=Info
piranha_esp-32.menu.DebugLevel.info.build.code_debug=3
piranha_esp-32.menu.DebugLevel.debug=Debug
piranha_esp-32.menu.DebugLevel.debug.build.code_debug=4
piranha_esp-32.menu.DebugLevel.verbose=Verbose
piranha_esp-32.menu.DebugLevel.verbose.build.code_debug=5

##############################################################

metro_esp-32.name=Metro ESP-32

metro_esp-32.upload.tool=esptool_py
metro_esp-32.upload.maximum_size=1310720
metro_esp-32.upload.maximum_data_size=327680
metro_esp-32.upload.wait_for_upload_port=true

metro_esp-32.serial.disableDTR=true
metro_esp-32.serial.disableRTS=true

metro_esp-32.build.mcu=esp32
metro_esp-32.build.core=esp32
metro_esp-32.build.variant=metro_esp-32
metro_esp-32.build.board=Metro

metro_esp-32.build.f_cpu=240000000L
metro_esp-32.build.flash_mode=dio
metro_esp-32.build.flash_size=4MB
metro_esp-32.build.boot=dio
metro_esp-32.build.partitions=default
metro_esp-32.build.defines=

metro_esp-32.menu.PartitionScheme.default=Default
metro_esp-32.menu.PartitionScheme.default.build.partitions=default
metro_esp-32.menu.PartitionScheme.no_ota=No OTA (Large APP)
metro_esp-32.menu.PartitionScheme.no_ota.build.partitions=no_ota
metro_esp-32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
metro_esp-32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
metro_esp-32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
metro_esp-32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080

metro_esp-32.menu.FlashFreq.80=80MHz
metro_esp-32.menu.FlashFreq.80.build.flash_freq=80m
metro_esp-32.menu.FlashFreq.40=40MHz
metro_esp-32.menu.FlashFreq.40.build.flash_freq=40m

metro_esp-32.menu.UploadSpeed.921600=921600
metro_esp-32.menu.UploadSpeed.921600.upload.speed=921600
metro_esp-32.menu.UploadSpeed.115200=115200
metro_esp-32.menu.UploadSpeed.115200.upload.speed=115200
metro_esp-32.menu.UploadSpeed.256000.windows=256000
metro_esp-32.menu.UploadSpeed.256000.upload.speed=256000
metro_esp-32.menu.UploadSpeed.230400.windows.upload.speed=256000
metro_esp-32.menu.UploadSpeed.230400=230400
metro_esp-32.menu.UploadSpeed.230400.upload.speed=230400
metro_esp-32.menu.UploadSpeed.460800.linux=460800
metro_esp-32.menu.UploadSpeed.460800.macosx=460800
metro_esp-32.menu.UploadSpeed.460800.upload.speed=460800
metro_esp-32.menu.UploadSpeed.512000.windows=512000
metro_esp-32.menu.UploadSpeed.512000.upload.speed=512000

metro_esp-32.menu.DebugLevel.none=None
metro_esp-32.menu.DebugLevel.none.build.code_debug=0
metro_esp-32.menu.DebugLevel.error=Error
metro_esp-32.menu.DebugLevel.error.build.code_debug=1
metro_esp-32.menu.DebugLevel.warn=Warn
metro_esp-32.menu.DebugLevel.warn.build.code_debug=2
metro_esp-32.menu.DebugLevel.info=Info
metro_esp-32.menu.DebugLevel.info.build.code_debug=3
metro_esp-32.menu.DebugLevel.debug=Debug
metro_esp-32.menu.DebugLevel.debug.build.code_debug=4
metro_esp-32.menu.DebugLevel.verbose=Verbose
metro_esp-32.menu.DebugLevel.verbose.build.code_debug=5

##############################################################
18 changes: 18 additions & 0 deletions cores/esp32/HardwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,24 @@ int HardwareSerial::read(void)
return -1;
}

// read characters into buffer
// terminates if size characters have been read, or no further are pending
// returns the number of characters placed in the buffer
// the buffer is NOT null terminated.
size_t HardwareSerial::read(uint8_t *buffer, size_t size)
{
size_t avail = available();
if (size < avail) {
avail = size;
}
size_t count = 0;
while(count < avail) {
*buffer++ = uartRead(_uart);
count++;
}
return count;
}

void HardwareSerial::flush(void)
{
uartFlush(_uart);
Expand Down
10 changes: 9 additions & 1 deletion cores/esp32/HardwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,19 @@ class HardwareSerial: public Stream
int availableForWrite(void);
int peek(void);
int read(void);
size_t read(uint8_t *buffer, size_t size);
inline size_t read(char * buffer, size_t size)
{
return read((uint8_t*) buffer, size);
}
void flush(void);
void flush( bool txOnly);
size_t write(uint8_t);
size_t write(const uint8_t *buffer, size_t size);

inline size_t write(const char * buffer, size_t size)
{
return write((uint8_t*) buffer, size);
}
inline size_t write(const char * s)
{
return write((uint8_t*) s, strlen(s));
Expand Down
1 change: 1 addition & 0 deletions libraries/BLE/examples/BLE_iBeacon/BLE_iBeacon.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ void setBeacon() {

pAdvertising->setAdvertisementData(oAdvertisementData);
pAdvertising->setScanResponseData(oScanResponseData);
pAdvertising->setAdvertisementType(ADV_TYPE_NONCONN_IND);

}

Expand Down
4 changes: 4 additions & 0 deletions libraries/BLE/src/BLEAdvertising.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ void BLEAdvertising::setAppearance(uint16_t appearance) {
m_advData.appearance = appearance;
} // setAppearance

void BLEAdvertising::setAdvertisementType(esp_ble_adv_type_t adv_type){
m_advParams.adv_type = adv_type;
} // setAdvertisementType

void BLEAdvertising::setMinInterval(uint16_t mininterval) {
m_advParams.adv_int_min = mininterval;
} // setMinInterval
Expand Down
3 changes: 2 additions & 1 deletion libraries/BLE/src/BLEAdvertising.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class BLEAdvertising {
void start();
void stop();
void setAppearance(uint16_t appearance);
void setAdvertisementType(esp_ble_adv_type_t adv_type);
void setMaxInterval(uint16_t maxinterval);
void setMinInterval(uint16_t mininterval);
void setAdvertisementData(BLEAdvertisementData& advertisementData);
Expand All @@ -76,4 +77,4 @@ class BLEAdvertising {

};
#endif /* CONFIG_BT_ENABLED */
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */
#endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */
Loading