alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,430 Commits 20 Branches 148 Tags 384 MiB
d7c8dd270f
Commit Graph

11430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Island
ab055d2421 Merge branch 'bugfix/ble_mesh_node_deinit_v4.0' into 'release/v4.0' 
ble_mesh: stack: Persistent storage misc fixes (v4.0)

See merge request espressif/esp-idf!11336
 2020-11-23 20:01:28 +08:00
Mahavir Jain
7f76f57b29 Merge branch 'fix/protocomm_simple_ble_v4.0' into 'release/v4.0' 
Protocomm/simple_ble: Fix gatt table map size to number of handles received (v4.0)

See merge request espressif/esp-idf!11267
 2020-11-23 18:44:52 +08:00
Jiang Jiang Jian
1e3eed8265 Merge branch 'bugfix/fix_spp_read_flow_control_v4.0' into 'release/v4.0' 
component_bt/fix spp flow control and vfs write [backport 4.0]

See merge request espressif/esp-idf!11074
 2020-11-23 15:49:54 +08:00
zhangyanjiao
0a8abf6ffe esp_wifi: 
1. Modify LR for esp32
2. Optimize some debug logs for probe response
3. Optimize phy and soc files
4. Fix the bug that no event for connect
5. Fix the bug that set_channel doesn't work for softAP
6. Add sta connect again ap sent disconnect event
7. Add set/get inactive time api
8. Fix connect hidden AP doesn't update information
9. Add rf test long short support
 2020-11-23 15:08:40 +08:00
lly
5c7960de0d ble_mesh: stack: Store kr phase after value changed [Zephyr] 2020-11-23 15:07:14 +08:00
lly
613616b445 ble_mesh: stack: Fix rpl not check by proxy cfg [Zephyr] 2020-11-23 15:07:14 +08:00
lly
97a54a9818 ble_mesh: stack: Persistent storage misc fixes 
* Fix the issue that deinit node with "erase_flash"
  set to true, but info is not erased from nvs
* Reuse bt_mesh_cfg_reset() when deinit node
* Optimize Provisioner related erase operations
* No store pending timeout will be used when Node
  is not provisioned OR Provisioner is disabled
  and erase operation is performed
* Change the default timeout for settings operation
  to 0, and rpl store rate to 0
 2020-11-23 15:01:50 +08:00
Island
39d213378c Merge branch 'bugfix/ble_mesh_settings_fix_v4.0' into 'release/v4.0' 
Bugfix/ble mesh settings fix (v4.0)

See merge request espressif/esp-idf!11326
 2020-11-23 14:42:18 +08:00
Island
5f58e32f34 Merge branch 'optimize/ble_mesh_gattc_conn_param_v4.0' into 'release/v4.0' 
ble_mesh: stack: Update connection parameters used by Central (v4.0)

See merge request espressif/esp-idf!11327
 2020-11-23 14:42:13 +08:00
Angus Gratton
42ffc348a6 ci: Fix annotated tag check 
Regression in 1612f84
 2020-11-23 17:29:46 +11:00
Prasad Alatkar
7adfe57302 Protocomm/simple_ble: Make gatt table map size equal to number of handles received (v4.0) 
- Fixes memcpy failure observed while adding 2 or more endpoints in
  wifi_provisioning.

 Closes IDF-2250
 2020-11-23 05:34:22 +00:00
liqigan
023f44e348 replace list and ringbuffer with fixed queue 
use eventgroup to sync spp_vfs_write

each connection has a switch_delay_timer not sharing a one

revert functions like spp_find_slot_by_xxx

fix vfs read bug when peer close
 2020-11-23 12:22:30 +08:00
liqigan
2765d5b829 move flow control to btc layer 
defer free slot in btc layer when receive BTA_JV_RFCOMM_CLOSE_EVT
 2020-11-23 12:22:30 +08:00
liqigan
ba3f69feea add event when calling spp API failed 2020-11-23 12:22:30 +08:00
lly
004393ec5f ble_mesh: stack: Update connection interval to 15ms 2020-11-23 08:53:37 +08:00
lly
b1383f5c0f ble_mesh: stack: Update connection parameters used by Central 2020-11-23 08:53:37 +08:00
lly
4fa39cae98 ble_mesh: stack: Use settings_core_erase when deinit 2020-11-23 08:45:04 +08:00
lly
666488a940 ble_mesh: stack: Fix storing next net_idx and app_idx 2020-11-23 08:45:04 +08:00
lly
3421336d66 ble_mesh: stack: Continue restore even if failure happens 
Previously we have used this solution for node info
restore. Here use the same solution for other mesh
information restore.
 2020-11-23 08:45:04 +08:00
lly
ad1d5764e2 ble_mesh: stack: Split model settings store and clear 2020-11-23 08:45:04 +08:00
lly
db4a344a33 ble_mesh: stack: Erase netkey and appkey with key index 2020-11-23 08:45:04 +08:00
lly
29c7645093 ble_mesh: stack: Add clear hb_pub in settings 2020-11-23 08:45:04 +08:00
lly
692ccf774b ble_mesh: stack: Transport rx reset settings update 
When reset the rx info of transport layer, the
rpl list will always cleared, and rpl stored
in the nvs will only be erased when erase flag
is true and BLE_MESH_SETTINGS is enabled.
Compared with the previous solution, it should
be more clear.
 2020-11-23 08:45:04 +08:00
lly
034906c6a8 ble_mesh: stack: Use erase settings functions 2020-11-23 08:45:04 +08:00
lly
69131a11ed ble_mesh: stack: Use mutex for settings operation 
Also expose the settings functions with the parameter
bt_mesh_nvs_handle_t, which will be used for further
updates.
 2020-11-23 08:45:04 +08:00
lly
8cbc93101e ble_mesh: stack: Add role check before enabling device 2020-11-23 08:45:03 +08:00
lly
c39097a601 ble_mesh: stack: Define a type for mesh nvs handle 2020-11-23 08:45:03 +08:00
lly
b4131cb6a9 ble_mesh: ci: Enable settings in sdkconfig.ci.xxx 2020-11-23 08:45:03 +08:00
Jiang Jiang Jian
a6db1162e8 Merge branch 'feat/ble_mesh_use_model_c_v4.0' into 'release/v4.0' 
ble_mesh: stack: Use model callback for operations [Zephyr] (v4.0)

See merge request espressif/esp-idf!10364
 2020-11-22 18:57:11 +08:00
Jiang Jiang Jian
e0c22867b9 Merge branch 'bugfix/ble_mesh_sensor_example_fix_v4.0' into 'release/v4.0' 
ble_mesh: example: Fix sensor data wrong iteration (v4.0)

See merge request espressif/esp-idf!10275
 2020-11-22 18:56:57 +08:00
lly
d9033cfeec ble_mesh: example: Fix sensor data wrong iteration 2020-11-22 09:27:44 +00:00
lly
8d9b0909a3 ble_mesh: stack: Use model callback for operations [Zephyr] 
- Previously when a model is initialized or deinitialized, in the
  access layer, we need to check the model id with the ids in the
  table in order to find the proper model operation function.
- Currently all the operation functions of each model will be set
  during the mesh initialization. When the model is found, we can
  directly use the corresponding callback for different operations.
- Currently only init/deinit operations are registered, later we
  will add more operations.
 2020-11-22 09:26:41 +00:00
Jiang Jiang Jian
d6f697e113 Merge branch 'bugfix/cxx_flag_operators_v4.0' into 'release/v4.0' 
esp_eth: moved extern "C" after includes (v4.0)

See merge request espressif/esp-idf!11219
 2020-11-22 15:35:22 +08:00
Jiang Jiang Jian
7a55981dca Merge branch 'feature/esp_tls_for_supplicant_v4.0' into 'release/v4.0' 
wpa_supplicant: Support for mbedtls tls handshake(backport v4.0)

See merge request espressif/esp-idf!9860
 2020-11-21 22:43:33 +08:00
Jiang Jiang Jian
eb9520fdb0 Merge branch 'bugfix/backport_some_lwip_bugs_1120_v4.0' into 'release/v4.0' 
lw-ip:backport bugfix lwip for v4.0(backport 4.0)

See merge request espressif/esp-idf!11309
 2020-11-21 22:34:27 +08:00
Jiang Jiang Jian
747f281325 Merge branch 'component/seperate_bta_jv_l2c_4.0' into 'release/v4.0' 
component_bt:/ seperate bta jv l2c  [backport v4.0]

See merge request espressif/esp-idf!9646
 2020-11-21 22:34:00 +08:00
Jiang Jiang Jian
ba4fc9c803 Merge branch 'bugfix/backport_v4.0_fix_pthread_priority_inheritance' into 'release/v4.0' 
bugfix/ pthread priority inheritance(backport v4.0)

See merge request espressif/esp-idf!11256
 2020-11-21 22:33:37 +08:00
Jiang Jiang Jian
4e9de58779 Merge branch 'optimize/ble_mesh_provisioner_delete_dev_v4.0' into 'release/v4.0' 
ble_mesh: stack: Optimize Provisioner delete device function (v4.0)

See merge request espressif/esp-idf!10605
 2020-11-21 17:54:25 +08:00
Jiang Jiang Jian
2fa70c8aed Merge branch 'feat/ble_mesh_device_properties_v2_v4.0' into 'release/v4.0' 
Feat/ble mesh device properties v2 (v4.0)

See merge request espressif/esp-idf!10789
 2020-11-21 17:54:14 +08:00
Jiang Jiang Jian
2a93a30c42 Merge branch 'bugfix/ble_mesh_check_stack_init_v4.0' into 'release/v4.0' 
ble_mesh: stack: Check if mesh stack initialized before init vendor client (v4.0)

See merge request espressif/esp-idf!10483
 2020-11-21 17:53:11 +08:00
Jiang Jiang Jian
d101748448 Merge branch 'bugfix/ble_mesh_prov_iv_index_v4.0' into 'release/v4.0' 
ble_mesh: stack: Using the latest iv_index for provisioning (v4.0)

See merge request espressif/esp-idf!10418
 2020-11-21 17:52:20 +08:00
weitianhua
a353e1d235 Fix tsk watchdog when running spp vfs demo 2020-11-21 09:38:46 +00:00
weitianhua
ca00390174 Seperate BTA_JV_L2CAP for less bin size 2020-11-21 09:38:46 +00:00
Jakob Hasse
940f2bc108 esp_eth: moved extern "C" after includes 2020-11-21 09:37:34 +00:00
Jiang Jiang Jian
b06fe45fde Merge branch 'feature/mqtt_submodule_update_23c8e1ec_v4.0' into 'release/v4.0' 
MQTT: Update submodule reference to da850b (config, error flags, minor fixes) (v4.0)

See merge request espressif/esp-idf!11314
 2020-11-21 17:32:18 +08:00
xutao
d2173ba1e8 pthread: fix the priority inheritance 
When `pthread_mutex_destroy` is used to release mutex, `pthread_mutex_lock_internal` is used,
     which results in the increase of `uxmutexehold` and no recovery base priority
 2020-11-21 08:21:57 +00:00
David Čermák
c8902cddc7 Merge branch 'bugfix/backport_v4.0_fix_websocket_issue' into 'release/v4.0' 
websocket_client : fix some issues for websocket client (backport v4.0)

See merge request espressif/esp-idf!11261
 2020-11-20 17:46:35 +08:00
David Čermák
aef8a36c99 Merge branch 'bugfix/backport_v4.0_fix_transport_ssl_blocking' into 'release/v4.0' 
transport_ssl: Fix a bug in transport_ssl (backport v4.0)

See merge request espressif/esp-idf!11277
 2020-11-20 17:45:03 +08:00
David Cermak
c4e22a3925 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:40 +01:00
xueyunfei
df23bbe8e1 backport bugfix lwip for v4.0 2020-11-20 16:36:37 +08:00