Angus Gratton
471d79edae
Merge branch 'bugfix/ci_auto_checkout_revision_of_project_used_in_ci_v3.3' into 'release/v3.3'
...
CI: get git describe from annotated tags (v3.3)
See merge request espressif/esp-idf!10676
2020-10-08 16:44:49 +08:00
Mahavir Jain
1ffeff5948
Merge branch 'bugfix/bootloader_anti_rollback_mmap_v3.3' into 'release/v3.3'
...
bootloader_support: fix issue in memory mapping for getting app descriptor (v3.3)
See merge request espressif/esp-idf!10737
2020-10-08 16:31:35 +08:00
Angus Gratton
0f6b7ad3cf
Merge branch 'bugfix/bootloader_common_get_sha256_of_partition_v3.3' into 'release/v3.3'
...
bootloader_support: Fix bootloader_common_get_sha256_of_partition(), can handle a long image (v3.3)
See merge request espressif/esp-idf!9955
2020-10-08 13:11:46 +08:00
Angus Gratton
111e0361c9
ci: Check version tags are always annotated
...
Closes https://github.com/espressif/esp-idf/issues/3114
2020-10-07 13:53:45 +11:00
Angus Gratton
6c2bffe53c
build system: Also get IDF version from annotated tags only
...
Builds on previous commit.
Note: Getting the project version still pases --tags so still works with plain
tags, to keep compatibility for existing projects
2020-10-07 13:53:45 +11:00
Mahavir Jain
0167a5e96d
bootloader_support: fix issue in memory mapping for getting app descriptor
...
For getting secure_version field in anti rollback case, bootloader tries
to map whole firmware partition but fails for cases where partition size
is beyond available MMU free pages capacity.
Fix here ensures to map only required length upto application descriptor
size in firmware partition.
Closes https://github.com/espressif/esp-idf/issues/5911
2020-10-06 14:43:12 +05:30
Michael (XIAO Xufeng)
021e1189c5
Merge branch 'bugfix/mcpwm_fault_init_copypaste_typo_bp3.3' into 'release/v3.3'
...
MCPWM: Fix PWM-fault init function that read config incorrectly (backport v3.3)
See merge request espressif/esp-idf!9550
2020-10-02 14:20:12 +08:00
He Yin Ling
936c803ccb
CI: get git describe from annotated tags:
...
we should only parse IDF version from annotated tags
2020-09-30 11:34:28 +08:00
Jiang Jiang Jian
cd86bc9d8d
Merge branch 'bugfix/confirmed_bugfix_from_baidu_proj_3.3' into 'release/v3.3'
...
Confirmed bugfix from Baidu Project 3.3
See merge request espressif/esp-idf!10548
2020-09-29 20:48:50 +08:00
Jiang Jiang Jian
9401c59f89
Merge branch 'bugfix/customer_baidu_int_wdt_v3.3' into 'release/v3.3'
...
backport v3.3: add soft solution for esp32 eco3 live lock issue
See merge request espressif/esp-idf!9217
2020-09-29 14:04:00 +08:00
Jiang Jiang Jian
a55f0ebbd5
Merge branch 'bugfix/wifi_spin_lock_allocation_in_PSRAM_v3.3' into 'release/v3.3'
...
wifi: Fix spin lock allocation in PSRAM bug(v3.3)
See merge request espressif/esp-idf!10550
2020-09-27 12:49:32 +08:00
Jiang Jiang Jian
e49a6b95ed
Merge branch 'bugfix/fix_ipv6_nd6_max_queue_num_v3.3' into 'release/v3.3'
...
lw-ip: fix IPv6 ND6 queue too much pkts cause no mem issue(backport v3.3)
See merge request espressif/esp-idf!10177
2020-09-27 12:47:30 +08:00
Jiang Jiang Jian
4a037fa911
Merge branch 'bugfix/can_mmap_after_get_enough_free_mmu_pages_v3.3' into 'release/v3.3'
...
flash_mmap: can mmap after get enough free MMU pages (backport v3.3)
See merge request espressif/esp-idf!10587
2020-09-27 12:46:42 +08:00
Island
0b792c44eb
Merge branch 'optimize/ble_mesh_provisioner_delete_dev_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Optimize Provisioner delete device function (v3.3)
See merge request espressif/esp-idf!10606
2020-09-27 10:53:19 +08:00
lly
81354cf24f
ble_mesh: stack: Optimize Provisioner delete device function
...
Since we have provided separate functions for deleting node
information with node's unicast address, device uuid, etc.
So we update the behavior of this function, which will only
be used to delete device information which is not provisioned
or just under provisioning.
2020-09-25 14:04:58 +08:00
Angus Gratton
fcadbaf97c
Merge branch 'update/release_v3.3.4' into 'release/v3.3'
...
v3.3: Update to v3.3.4
See merge request espressif/esp-idf!10520
2020-09-25 10:21:30 +08:00
ChenJianxing
186ad2f6aa
lwip: fix IPv6 ND6 queue too much pkts cause no mem issue and add menuconfig item for this params.
2020-09-24 10:43:23 +08:00
jiangguangming
4f3ddbb299
flash_mmap: restore interrupt and cache before err return
2020-09-24 10:06:18 +08:00
jiangguangming
9debc7248a
flash_mmap: can mmap after get enough free MMU pages
2020-09-24 10:06:18 +08:00
Jiang Jiang Jian
fb18b12efe
Merge branch 'bugfix/bt_linkup_fallback_event_v3.3' into 'release/v3.3'
...
Bluedroid: Fixes cases having fallback to link up event. (v3.3)
See merge request espressif/esp-idf!9805
2020-09-22 16:44:07 +08:00
Jiang Jiang Jian
251676181a
Merge branch 'bugfix/backport_some_lwip_bugs_0910_v3.3' into 'release/v3.3'
...
lw-ip:backport bugfix lw-ip for v3.3
See merge request espressif/esp-idf!10409
2020-09-22 14:18:30 +08:00
dongyou
e12593a79f
Fix spin lock allocation in PSRAM bug
2020-09-22 14:11:25 +08:00
weitianhua
7f9a4d25ef
Confirmed bugfix from Baidu Project
2020-09-22 11:57:00 +08:00
Michael (XIAO Xufeng)
4afc8facde
Merge branch 'fixbug/sdmmc_spi_highspeed_v3.3' into 'release/v3.3'
...
sdmmc: fix the probe issue that forbid sdspi working in highspeed mode(backport v3.3)
See merge request espressif/esp-idf!9838
2020-09-21 11:10:09 +08:00
Angus Gratton
c73a00e073
Merge branch 'bugfix/espcoredump_fix_error_reported_for_blank_partition_v33' into 'release/v3.3'
...
Bugfix/espcoredump fix error reported for blank partition (backport v3.3)
See merge request espressif/esp-idf!9625
2020-09-21 10:45:05 +08:00
Michael (XIAO Xufeng)
f2f13eb8e8
Merge branch 'bugfix/spi_master_multiple_dev_with_diff_cs_lvl_3.3' into 'release/v3.3'
...
spi_master: correctly set cs polarity (3.3)
See merge request espressif/esp-idf!10406
2020-09-21 10:21:22 +08:00
aleks
c9f4b0aba8
espcoredump: fix error reported for blank partition
2020-09-21 01:29:24 +00:00
Ivan Grokhotkov
6e284ea84b
Merge branch 'bugfix/parttool_example_test_fail_v3.3' into 'release/v3.3'
...
examples/parttool: fix the test to work on parallel test runner (backport v3.3)
See merge request espressif/esp-idf!10376
2020-09-18 23:30:58 +08:00
Angus Gratton
34961db9c1
Merge branch 'release/v3.3' into update/release_v3.3.4
2020-09-18 19:44:26 +10:00
Angus Gratton
b64b375234
version: Update to v3.3.4
2020-09-18 19:42:21 +10:00
xueyunfei
315cbe05cf
backport bugfix lwip for v3.3
2020-09-18 02:28:13 +00:00
Island
f54f776905
Merge branch 'bugfix/ble_mesh_check_stack_init_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Check if mesh stack initialized before init vendor client (v3.3)
See merge request espressif/esp-idf!10484
2020-09-18 09:40:14 +08:00
Michael (XIAO Xufeng)
c7a9851de0
Merge branch 'bugfix/fix_bugs_in_gpio_unit_test_v3.3' into 'release/v3.3'
...
bugfix(ut): fix gpio output and input mode test(backport v3.3)
See merge request espressif/esp-idf!10023
2020-09-18 02:17:42 +08:00
lly
1f32a8d95e
ble_mesh: stack: Check if mesh stack initialized before init vendor client
2020-09-17 11:28:02 +08:00
Ivan Grokhotkov
c3e8fb73c7
Merge branch 'bugfix/missing_regex_error_stub' into 'release/v3.3'
...
Add missing regex_error stub
See merge request espressif/esp-idf!8852
2020-09-16 04:50:54 +08:00
Ivan Grokhotkov
9dda741a99
Merge branch 'bugfix/nvs_no_throw_v3.3' into 'release/v3.3'
...
NVS: Changed all new to new (nothrow) (backport v3.3)
See merge request espressif/esp-idf!7858
2020-09-16 02:49:09 +08:00
Jakob Hasse
a7e1c144e2
Add missing regex_error stub
...
Closes IDFGH-3153
* avoids linker error
2020-09-15 18:20:09 +00:00
Angus Gratton
8a79415c2e
Merge branch 'bugfix/ulp_as_version_v3.3' into 'release/v3.3'
...
ulp: fix ULP assembler version detection for localized systems (v3.3)
See merge request espressif/esp-idf!10396
2020-09-15 15:09:30 +08:00
Angus Gratton
1d8bf5356b
Merge branch 'bugfix/eclipse_make_py3_v3.3' into 'release/v3.3'
...
tools: Fix Python 3 incompatibility for building with Eclipse on Windows (v3.3)
See merge request espressif/esp-idf!10401
2020-09-15 15:06:54 +08:00
Angus Gratton
d7ea1b0a08
Merge branch 'bugfix/ut_ext_win_open_file_v3.3' into 'release/v3.3'
...
Tools: Close temporary file before invoking external tools accessing it (v3.3)
See merge request espressif/esp-idf!9858
2020-09-15 14:27:34 +08:00
Ivan Grokhotkov
65d829826e
Merge branch 'feature/ci_fix_docker_build_v3.3' into 'release/v3.3'
...
ci: Use git mirror for docker image (v3.3)
See merge request espressif/esp-idf!10448
2020-09-15 01:47:56 +08:00
Wielebny666
bca1beb3f0
spi_master: correctly set cs polarity
...
All devices must be added to the same spi line before use.
2020-09-14 11:58:10 +00:00
Sergei Silnov
4f11ecebbc
ci: Use git mirror for docker image
2020-09-14 13:11:44 +02:00
Island
64adabfd3a
Merge branch 'bugfix/ble_mesh_prov_iv_index_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Using the latest iv_index for provisioning (v3.3)
See merge request espressif/esp-idf!10419
2020-09-14 14:17:53 +08:00
Michael (XIAO Xufeng)
cbcb218418
Merge branch 'bugfix/fix_i2s_reset_issue_v3.3' into 'release/v3.3'
...
driver(I2S): Fix I2S reset issue for release/v3.3
See merge request espressif/esp-idf!9586
2020-09-14 10:45:50 +08:00
Jiang Jiang Jian
cec88e11ed
Merge branch 'component/seperate_bta_jv_l2c_3.3' into 'release/v3.3'
...
Component/seperate bta jv l2c 3.3
See merge request espressif/esp-idf!9651
2020-09-11 19:38:36 +08:00
lly
34f30a878e
ble_mesh: stack: Using the latest iv_index for provisioning
...
Provisioner should always uses the latest IV Index for provisioning.
For example, if the current IV Index is 0x00000001, but prov->iv_index
is still initialized with 0x00000000, and if Provisioner uses prov->
iv_index for provisioning, this will cause the Provisioner failing to
control the node.
So here bt_mesh.iv_index is used instead of prov->iv_index.
2020-09-11 07:58:20 +00:00
Jiang Jiang Jian
908938bc3c
Merge branch 'bugfix/fix_some_wifi_bugs_0907_v3.3' into 'release/v3.3'
...
bugfix: fix some wifi bugs (backport v3.3)
See merge request espressif/esp-idf!10318
2020-09-10 22:33:18 +08:00
Roland Dobai
518e1da637
tools: Fix Python 3 incompatibility for building with Eclipse on Windows
2020-09-10 09:47:29 +02:00
Roland Dobai
cccdd13937
ulp: fix ULP assembler version detection for localized systems
2020-09-10 09:36:22 +02:00