Skip to content

Commit 15d2a34

Browse files
Jason2866Jason2866
authored
changes from upstream
2 parents 7d316e7 + 40fa72d commit 15d2a34

File tree

770 files changed

+19814
-4850
lines changed

Some content is hidden

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

770 files changed

+19814
-4850
lines changed

‎boards.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26048,7 +26048,6 @@ nano_nora.debug.additional_config=debug_config.nano_nora
2604826048
nano_nora.tools.esptool_py.program.pattern_args=--chip {build.mcu} --port "{serial.port}" --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0xf70000 "{build.variant.path}/extra/nora_recovery/nora_recovery.ino.bin" 0x10000 "{build.path}/{build.project_name}.bin"
2604926049
nano_nora.tools.esptool_py.erase.pattern_args=--chip {build.mcu} --port "{serial.port}" --before default_reset --after hard_reset erase_flash
2605026050

26051-
nano_nora.programmer.default=esptool
2605226051
nano_nora.debug.executable=
2605326052

2605426053
nano_nora.menu.PartitionScheme.default=With FAT partition (default)

‎libraries/BLE/examples/BLE5_extended_scan/BLE5_extended_scan.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ uint32_t scanTime = 100; //In 10ms (1000ms)
1919
BLEScan* pBLEScan;
2020

2121
class MyBLEExtAdvertisingCallbacks: public BLEExtAdvertisingCallbacks {
22-
void onResult(esp_ble_gap_ext_adv_reprot_t report) {
22+
void onResult(esp_ble_gap_ext_adv_report_t report) {
2323
if(report.event_type & ESP_BLE_GAP_SET_EXT_ADV_PROP_LEGACY){
2424
// here we can receive regular advertising data from BLE4.x devices
2525
Serial.println("BLE4.2");

‎libraries/BLE/examples/BLE5_periodic_sync/BLE5_periodic_sync.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static esp_ble_gap_periodic_adv_sync_params_t periodic_adv_sync_params = {
2727

2828
class MyBLEExtAdvertisingCallbacks : public BLEExtAdvertisingCallbacks
2929
{
30-
void onResult(esp_ble_gap_ext_adv_reprot_t params)
30+
void onResult(esp_ble_gap_ext_adv_report_t params)
3131
{
3232
uint8_t *adv_name = NULL;
3333
uint8_t adv_name_len = 0;

‎libraries/BLE/src/BLEAdvertisedDevice.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class BLEExtAdvertisingCallbacks {
135135
* As we are scanning, we will find new devices. When found, this call back is invoked with a reference to the
136136
* device that was found. During any individual scan, a device will only be detected one time.
137137
*/
138-
virtual void onResult(esp_ble_gap_ext_adv_reprot_t report) = 0;
138+
virtual void onResult(esp_ble_gap_ext_adv_report_t report) = 0;
139139
};
140140
#endif // CONFIG_BT_BLE_50_FEATURES_SUPPORTED
141141

‎package/package_esp32_index.template.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{
7373
"packager": "esp32",
7474
"name": "openocd-esp32",
75-
"version": "v0.12.0-esp32-20230921"
75+
"version": "v0.12.0-esp32-20240318"
7676
},
7777
{
7878
"packager": "esp32",
@@ -472,56 +472,56 @@
472472
},
473473
{
474474
"name": "openocd-esp32",
475-
"version": "v0.12.0-esp32-20230921",
475+
"version": "v0.12.0-esp32-20240318",
476476
"systems": [
477477
{
478478
"host": "x86_64-pc-linux-gnu",
479-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
480-
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
481-
"checksum": "SHA-256:61e38e0a13a5c1664624ec1c397d7f7d6868554b0d345d3fb1f7294cce38cc4b",
482-
"size": 2193783
479+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz",
480+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz",
481+
"checksum": "SHA-256:cf26c5cef4f6b04aa23cd2778675604e5a74a4ce4d8d17b854d05fbcb782d52c",
482+
"size": 2252682
483483
},
484484
{
485485
"host": "aarch64-linux-gnu",
486-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
487-
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
488-
"checksum": "SHA-256:6430315dc1b926541c93cef63d2b08982543ad3f9fe6e0d7107c8a518ef20432",
489-
"size": 2062058
486+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-arm64-0.12.0-esp32-20240318.tar.gz",
487+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20240318.tar.gz",
488+
"checksum": "SHA-256:9b97a37aa2cab94424a778c25c0b4aa0f90d6ef9cda764a1d9289d061305f4b7",
489+
"size": 2132904
490490
},
491491
{
492492
"host": "arm-linux-gnueabihf",
493-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
494-
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
495-
"checksum": "SHA-256:5df16d8a91f013a547f6b3b914c655a9d267996a3b6503031b335ac04a4f8d15",
496-
"size": 2206666
493+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-armel-0.12.0-esp32-20240318.tar.gz",
494+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20240318.tar.gz",
495+
"checksum": "SHA-256:b7e82776ec374983807d3389df09c632ad9bc8341f2075690b6b500319dfeaf4",
496+
"size": 2271761
497497
},
498498
{
499499
"host": "x86_64-apple-darwin",
500-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
501-
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
502-
"checksum": "SHA-256:0a4f764934f488af18cdac2a0d152dd36b4870f3bec1a2d4e25b6b3b7a5258a0",
503-
"size": 2305832
500+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-macos-0.12.0-esp32-20240318.tar.gz",
501+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20240318.tar.gz",
502+
"checksum": "SHA-256:b16c3082c94df1079367c44d99f7a8605534cd48aabc18898e46e94a2c8c57e7",
503+
"size": 2365588
504504
},
505505
{
506506
"host": "arm64-apple-darwin",
507-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
508-
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
509-
"checksum": "SHA-256:6dce89048f642eb0559a915b6e514f90feb2a95afe21b84f0b0ebf2b27824816",
510-
"size": 2341406
507+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-macos-arm64-0.12.0-esp32-20240318.tar.gz",
508+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20240318.tar.gz",
509+
"checksum": "SHA-256:534ec925ae6e35e869e4e4e6e4d2c4a1eb081f97ebcc2dd5efdc52d12f4c2f86",
510+
"size": 2406377
511511
},
512512
{
513513
"host": "i686-mingw32",
514-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
515-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
516-
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
517-
"size": 2710475
514+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-win32-0.12.0-esp32-20240318.zip",
515+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20240318.zip",
516+
"checksum": "SHA-256:d379329eba052435173ab0d69c9b15bc164a6ce489e2a67cd11169d2dabff633",
517+
"size": 2783915
518518
},
519519
{
520520
"host": "x86_64-mingw32",
521-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
522-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
523-
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
524-
"size": 2710475
521+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-win32-0.12.0-esp32-20240318.zip",
522+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20240318.zip",
523+
"checksum": "SHA-256:d379329eba052435173ab0d69c9b15bc164a6ce489e2a67cd11169d2dabff633",
524+
"size": 2783915
525525
}
526526
]
527527
},

‎platform.txt‎

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)