Darian Leung
35511d0e87
can: Fix semaphore take in critical section
...
This commit fixes can_reconfigure_alerts() which
could lead to a call to xSemaphoreTake() whilst
inside a critical section.
2020-12-02 21:41:47 +08:00
Darian Leung
540b401e95
CAN: Fix size of RX msg count field on the esp32
...
This commit fixes the size of the RX message count register field
on the esp32.
2020-12-02 21:40:17 +08:00
Angus Gratton
42f4fa4de6
Merge branch 'bugfix/blecent_example_test_v3.3' into 'release/v3.3'
...
Fix CI blecent example test (backport v3.3)
See merge request espressif/esp-idf!11320
2020-12-02 15:44:39 +08:00
Shivani Tipnis
cbabe5bacc
ci: Fix blecent example test
...
(cherry picked from commit fc146a98e4
)
2020-11-30 22:49:31 +05:30
Angus Gratton
c33fc7821a
Merge branch 'ci/fix_annotated_tag_check_v3.3' into 'release/v3.3'
...
ci: Fix annotated tag check (v3.3)
See merge request espressif/esp-idf!11334
2020-11-24 06:32:17 +08:00
Jiang Jiang Jian
31f5334ae1
Merge branch 'bugfix/btdm_spp_null_ptr_with_dynamic_memory_v3.3' into 'release/v3.3'
...
components/bt: Fix SPP using NULL point with dynamic memory
See merge request espressif/esp-idf!11330
2020-11-23 15:49:20 +08:00
Angus Gratton
7e2c75fae7
ci: Fix annotated tag check
...
Regression in 1612f84
2020-11-23 17:33:52 +11:00
liqigan
b9bf3f7cc9
components/bt: Fix SPP using NULL point with dynamic memory
2020-11-23 11:48:34 +08:00
Jiang Jiang Jian
fea21b8e44
Merge branch 'bugfix/backport_v3.3_fix_pthread_priority_inheritance' into 'release/v3.3'
...
pthread: fix the priority inheritance (backport v3.3)
See merge request espressif/esp-idf!11293
2020-11-21 17:51:42 +08:00
Jiang Jiang Jian
025b8c3f21
Merge branch 'feature/mqtt_submodule_update_23c8e1ec_v3.3' into 'release/v3.3'
...
MQTT: Update submodule reference to da850b (config, error flags, minor fixes) (v3.3)
See merge request espressif/esp-idf!11315
2020-11-21 17:26:18 +08:00
Jiang Jiang Jian
e8a0ecddd8
Merge branch 'bugfix/att_buffer_count_fixed_v3.3' into 'release/v3.3'
...
Bugfix/att buffer count fixed v3.3
See merge request espressif/esp-idf!9164
2020-11-21 17:05:47 +08:00
Jiang Jiang Jian
dc4856e292
Merge branch 'bugfix/backport_v3.3_fix_websocket_issue' into 'release/v3.3'
...
websocket_client: fix some issues for websocket client(backport v3.3)
See merge request espressif/esp-idf!11295
2020-11-21 16:20:28 +08:00
David Čermák
a19f58355a
Merge branch 'bugfix/fix_transport_ssl_blocking_v3.3' into 'release/v3.3'
...
transport_ssl: Fix a bug in transport_ssl (backport v3.3)
See merge request espressif/esp-idf!11294
2020-11-20 17:43:41 +08:00
David Cermak
e846274e59
MQTT: Update submodule reference: config, error handle, minor fixes
...
Updates esp-mqtt reference to include fixes below related mainly to:
* configuration update (disable keepalive, network timeout)
* minor fixes (size_t for all sizes, unbalanced lock, api for
outbox-size)
* extended error handle to include socket's errno
Closes https://github.com/espressif/esp-idf/issues/5906
Config: Added config value to disable keepalive mechanism
esp-mqtt commit: 8562437c8a
Related https://github.com/espressif/esp-mqtt/issues/179
Added esp_mqtt_client_get_outbox_size API
esp-mqtt commit: 0a1d9d0300
Related https://github.com/espressif/esp-mqtt/pull/178
mqtt_outbox: Removed unused retry_count field from outbox_item_t
esp-mqtt commit: 673086e13a
config: Fixed typo for configuring OUTBOX_EXPIRED_TIMEOUT_MS
esp-mqtt commit: 259baaec96
Fixed missing MQTT_API_UNLOCK in esp_mqtt_client_stop error path
esp-mqtt commit: 845c2a3a1e
Related https://github.com/espressif/esp-mqtt/issues/173
Related https://github.com/espressif/esp-mqtt/pull/174
Extended mqtt error handle to capture transport's socket errno (IDF
v4.3+)
esp-mqtt commit: 23c8e1ecf5
Config: Added configuration value to set network timeout
esp-mqtt commit: a03228ac46
Related https://github.com/espressif/esp-mqtt/pull/166
Used size_t for all lengths to allow for other architectures
esp-mqtt commit: b9db8d9020
2020-11-20 10:25:59 +01:00
xutao
9da4c47e74
websocket_client: fix some issues for websocket client(backport v3.3)
2020-11-19 15:54:36 +08:00
xutao
cf4eba2f5d
pthread: fix the priority inheritance (backport v3.3)
2020-11-19 15:30:49 +08:00
Island
2c6eb0bd74
Merge branch 'optimize/ble_mesh_gattc_conn_param_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Update connection parameters used by Central (v3.3)
See merge request espressif/esp-idf!11285
2020-11-19 11:23:21 +08:00
Island
adcab65d7d
Merge branch 'feat/ble_mesh_node_local_data_func_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Add node local netkey/appkey func (v3.3)
See merge request espressif/esp-idf!11282
2020-11-19 11:23:12 +08:00
lly
1a36790014
ble_mesh: stack: Update connection interval to 15ms
2020-11-18 20:25:26 +08:00
lly
a9ac3e87db
ble_mesh: stack: Update connection parameters used by Central
2020-11-18 20:25:14 +08:00
lly
d2a99ec816
ble_mesh: stack: Fix wrong declaration of node bind AppKey func
2020-11-18 20:16:25 +08:00
lly
42bdf7ecc2
ble_mesh: stack: Add node local netkey/appkey func
2020-11-18 20:16:06 +08:00
Island
f62e92c35f
Merge branch 'optimize/ble_mesh_reduce_code_size_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Optimization introduced to reduce code size (v3.3)
See merge request espressif/esp-idf!11250
2020-11-18 20:08:44 +08:00
Mahavir Jain
77119a793e
Merge branch 'fix/protocomm_simple_ble_v3.3' into 'release/v3.3'
...
Protocomm/simple_ble: Fix gatt table map size to number of handles received (v3.3)
See merge request espressif/esp-idf!11268
2020-11-18 12:14:35 +08:00
Prasad Alatkar
c8354f0231
Protocomm/simple_ble: Make gatt table map size equal to number of handles received (v3.3)
...
- Fixes memcpy failure observed while adding 2 or more endpoints in
wifi_provisioning.
Closes IDF-2250
Closes https://github.com/espressif/esp-idf/issues/6121
2020-11-17 16:27:29 +05:30
lly
c6f809ec03
ble_mesh: example: Update sdkconfig test files for disabling Health Server model
2020-11-17 11:40:52 +08:00
lly
2c66a82434
ble_mesh: stack: Add a Kconfig option to make Health Server model optional
2020-11-17 11:40:31 +08:00
lly
f1def7f24e
ble_mesh: stack: Split model Kconfig menu into foundation and others
2020-11-17 11:39:07 +08:00
lly
aecb897fb8
ble_mesh: example: Fix fast provisioning compile error
2020-11-17 11:37:32 +08:00
lly
10a396d17c
ble_mesh: ci: Add disabling mesh model sdkconfig test files
2020-11-17 11:36:37 +08:00
lly
d9ffe54991
ble_mesh: stack: Add Kconfig options to make server models optional
2020-11-17 11:33:10 +08:00
lly
c90def0992
ble_mesh: stack: Use Kconfig option to make client models optional
2020-11-17 11:30:15 +08:00
lly
4c7a021acd
ble_mesh: stack: Make some internal static functions inline
2020-11-17 11:29:28 +08:00
lly
841a015d6c
ble_mesh: ci: Add disabling mesh deinit sdkconfig test files
2020-11-17 11:28:54 +08:00
lly
09ac1b596d
ble_mesh: stack: Add a Kconfig option to make deinit optional
2020-11-17 11:19:49 +08:00
lly
bc4ebea32c
ble_mesh: stack: Introduce a new header file mesh_config.h
2020-11-17 11:18:14 +08:00
Jiang Jiang Jian
68b237fe53
Merge branch 'bugfix/customer_baidu_psram_stack_backtrace_v3.3' into 'release/v3.3'
...
backport v3.3: added psram stack check in backtrace
See merge request espressif/esp-idf!8460
2020-11-12 21:01:12 +08:00
Angus Gratton
c823b14802
Merge branch 'bugfix/doc_remove_cmake_defconfig_v3.3' into 'release/v3.3'
...
Remove defconfig from idf.py (v3.3)
See merge request espressif/esp-idf!10086
2020-11-11 10:44:17 +08:00
Angus Gratton
7a08ec735f
Merge branch 'bugfix/ci_use_local_mirror_for_getting_submodules_v3.3' into 'release/v3.3'
...
ci: Use local git mirror for getting submodules v3.3
See merge request espressif/esp-idf!10383
2020-11-11 08:05:52 +08:00
Island
53bbc94ced
Merge branch 'bugfix/fix_node_test_func_not_set_role_v3.3' into 'release/v3.3'
...
ble_mesh: test: Fix node test function not update role flag (v3.3)
See merge request espressif/esp-idf!11043
2020-11-10 16:44:18 +08:00
lly
330f39ee23
ble_mesh: test: Fix node test function not update role flag
2020-11-09 02:42:36 +00:00
Jiang Jiang Jian
44ec7972bd
Merge branch 'bugfix/fix_16mbit_psram_id_read_error_v3.3' into 'release/v3.3'
...
psram: fix 16mbit psram id read error (backport v3.3)
See merge request espressif/esp-idf!9441
2020-11-05 23:02:09 +08:00
Michael (XIAO Xufeng)
49ace4968f
spiram: fix the read id failure
...
The issue is caused by:
1. The disable_qio_mode inside read_id may have side effects.
2. read_id twice may have side effects.
Fix this issue by moving disable_qio_mode out of read_id and only do it
once before read_id. And retry read_id only when the first one is
failed.
Issue introduced in 3ecbb59c15
.
2020-11-05 06:11:29 +00:00
chenjianqiang
1903c05d53
psram: fix 16mbit psram id read error
2020-11-05 06:11:29 +00:00
Jiang Jiang Jian
5d42f3075e
Merge branch 'feature/toolchain_gcc52_revert_PSRAM_fixes_2020r3_v3.3' into 'release/v3.3'
...
Update toolchain to 1.22.0-97-gc752ad5 (v3.3)
See merge request espressif/esp-idf!10348
2020-11-05 14:08:47 +08:00
Jiang Jiang Jian
8667591004
Merge branch 'bugfix/lwip_netdb_cpp_guards_v3.3' into 'release/v3.3'
...
lw-IP: Changed to C linkage in netdb.h for fixing bug when using mixed C/C++ code (v3.3)
See merge request espressif/esp-idf!11092
2020-11-05 14:00:42 +08:00
Jiang Jiang Jian
e0a8eb60dd
Merge branch 'feature/lwip_tcp_isn_hook_v3.3' into 'release/v3.3'
...
lw-ip: enable TCP ISN hook (v3.3)
See merge request espressif/esp-idf!11065
2020-11-05 12:10:59 +08:00
Jiang Jiang Jian
25781e7c88
Merge branch 'mesh/bugfix_1023_backport_v3.3' into 'release/v3.3'
...
esp_wifi_mesh: update wifi mesh libs(Backport v3.3)
See merge request espressif/esp-idf!11081
2020-11-05 12:08:19 +08:00
Anton Maklakov
d429fd7031
ci: Use a local mirror for getting submodules
2020-11-04 10:19:57 +07:00
Anton Maklakov
1f78540cbb
windows: Update the prebuilt MSYS2 environment to use then new toolchain
...
No other changes in the environment contents.
2020-11-04 10:08:00 +07:00