Island
88937185ac
Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check_v3.3' into 'release/v3.3'
...
ble_mesh: Rework prov pdu length check (v3.3)
See merge request espressif/esp-idf!9005
2020-06-03 15:11:11 +08:00
Jiang Jiang Jian
a94842d8f7
Merge branch 'bugfix/fix_some_wifi_bugs_0525_v3.3' into 'release/v3.3'
...
feature: optimize some wifi API (backport v3.3)
See merge request espressif/esp-idf!8893
2020-06-02 17:39:23 +08:00
Michael (XIAO Xufeng)
13154fe5c6
Merge branch 'bugfix/fix_gpio_wake_up_disable_invalid_for_rtc_io_v3.3' into 'release/v3.3'
...
bugfix (GPIO): fixed gpio_wake_up_disable not working for RTC IO (release/3.3)
See merge request espressif/esp-idf!7997
2020-06-02 11:16:59 +08:00
Island
bce064e655
Merge branch 'bugfix/ble_mesh_local_model_sub_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh local model sub (v3.3)
See merge request espressif/esp-idf!8985
2020-06-02 10:58:50 +08:00
lly
a96e1b80ac
ble_mesh: Rework prov pdu length check
2020-06-02 10:17:20 +08:00
Mahavir Jain
3f57aecabd
Merge branch 'bugfix/httpd_lru_purge_v3.3' into 'release/v3.3'
...
esp_http_server: Fixed a bug which could cause issues with LRU purge (v3.3)
See merge request espressif/esp-idf!8834
2020-06-01 11:23:53 +08:00
houwenxiang
eab88f51e7
driver(GPIO): fixed gpio_wake_up_disable not working for RTC IO (release/3.3)
2020-06-01 11:16:07 +08:00
lly
6abdc9e542
ble_mesh: Local model (un)subscribes group address
2020-06-01 09:13:57 +08:00
lly
0ee9227b45
ble_mesh: Define a macro for invalid company id
2020-06-01 09:13:43 +08:00
ronghulin
8f3209b7b7
feature: optimize some wifi API
...
1. optimization esp_wifi_set_max_tx_power description
2. add API esp_wifi_ap_get_sta_aid
2020-05-29 12:02:24 +08:00
Jiang Jiang Jian
d7e6eecd66
Merge branch 'bufix/fix_v3.3_bluedroid_bugs_mr' into 'release/v3.3'
...
component/bt: fix notify malloc failed , fix no BLE_AUTH_CMPL_EVT and fix bluedroid btc deinit crash(backport 3.3)
See merge request espressif/esp-idf!8754
2020-05-29 11:25:41 +08:00
zwj
38e98acca1
:add congest direct callback and modify congest evt triger threshold
2020-05-28 12:06:10 +00:00
wangcheng
340e40abbe
master missing BLE_AUTH_CMPL_EVT after restart
2020-05-28 12:06:10 +00:00
wangcheng
ed3a172df7
fix bta_dm_deinit_cb
2020-05-28 12:06:10 +00:00
Jiang Jiang Jian
27f03b4ac0
Merge branch 'bugfix/ble_mesh_check_timer_init_v3.3' into 'release/v3.3'
...
ble_mesh: Check the result of creating timer (v3.3)
See merge request espressif/esp-idf!8960
2020-05-28 15:26:53 +08:00
Jiang Jiang Jian
706d704c08
Merge branch 'nimble/update_nimble_submodule_v3.3' into 'release/v3.3'
...
NimBLE: Include upstream fixes and use macros for log level filtering (backport v3.3)
See merge request espressif/esp-idf!8798
2020-05-28 15:23:31 +08:00
lly
b5f3f79716
ble_mesh: Check the result of creating timer
2020-05-28 10:28:36 +08:00
Island
5f43d69d21
Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh sync zephyr fixes (v3.3)
See merge request espressif/esp-idf!8950
2020-05-28 10:17:29 +08:00
Island
a70c956a75
Merge branch 'bugfix/ble_mesh_not_use_same_private_key_v3.3' into 'release/v3.3'
...
ble_mesh: Not using pre-initialized private key (v3.3)
See merge request espressif/esp-idf!8947
2020-05-28 10:15:40 +08:00
Island
6d9b618a2d
Merge branch 'bugfix/ble_mesh_comp_data_store_restore_v3.3' into 'release/v3.3'
...
ble_mesh: Same func for storing/restoring comp data (v3.3)
See merge request espressif/esp-idf!8944
2020-05-28 10:14:01 +08:00
Piyush Shah
8890fa98c8
esp_http_server: Fixed a bug which could cause issues with LRU purge
...
LRU counter should be started from 1, and not 0, so that all checks
work fine.
Closes https://github.com/espressif/esp-idf/issues/4753
2020-05-27 17:14:12 +00:00
He Yin Ling
4fa5f9d1a6
Merge branch 'bugfix/ci_push_to_github_on_label_v3.3' into 'release/v3.3'
...
ci: Don't push to Github or deploy docs on customized pipelines (v3.3)
See merge request espressif/esp-idf!8939
2020-05-27 18:16:13 +08:00
lly
822b20eb40
ble_mesh: Transport tx fields overflow [Zephyr]
...
The transport segmented TX nack and seg_pending fields must be at least
6 bits to avoid overflow for 32 segment messages. This change rearranges
the seg_tx fields to gather all state flag fields in one byte, while
making the counter fields whole bytes.
2020-05-27 17:45:12 +08:00
lly
b381998a23
ble_mesh: Friend with unknown appkey [Zephyr]
...
Ensures that friend messages are enqueued, even if the packet is
received with an appkey is unknown to the friend. Previously, sdu_recv
would return EINVAL if the appkey was unknown, which would prevent the
lower transport layer from adding the packet to the friend queue. This
is irrelevant for the logic in lower transport, and should not be
returned as an error.
2020-05-27 17:44:58 +08:00
lly
393e4e9007
ble_mesh: Not using pre-initialized private key
2020-05-27 17:38:41 +08:00
lly
4b191ac6fb
ble_mesh: Same func for storing/restoring comp data
2020-05-27 17:32:56 +08:00
Island
322f461439
Merge branch 'example/ble_mesh_structural_adjust_v3.3' into 'release/v3.3'
...
Example/ble mesh structural adjust (v3.3)
See merge request espressif/esp-idf!8866
2020-05-27 17:22:30 +08:00
Angus Gratton
7b8cd22a46
ci: Don't push to Github or deploy docs on customized pipelines
...
BOT_TRIGGER_WITH_LABEL must be empty (meaning all tests are running).
2020-05-27 19:08:22 +10:00
Jiang Jiang Jian
221ca4b1e5
Merge branch 'bugfix/fix_some_wifi_bugs_0427_v3.3' into 'release/v3.3'
...
Bugfix/fix some wifi bugs 0427 (v3.3)
See merge request espressif/esp-idf!8573
2020-05-26 18:57:43 +08:00
David Čermák
0a558ea3c4
Merge branch 'bugfix/ws_client_fragmented_send_v3.3' into 'release/v3.3'
...
ws_client: fix fragmented send setting proper opcodes (v3.3)
See merge request espressif/esp-idf!8692
2020-05-25 17:22:02 +08:00
Jiang Jiang Jian
19736dbedc
Merge branch 'bugfix/supplicant_general_fixes_33' into 'release/v3.3'
...
wpa_supplicant: Fix some memleaks and invalid memory access(backport V3.3)
See merge request espressif/esp-idf!8741
2020-05-22 21:18:36 +08:00
Island
a809cdba76
Merge branch 'bugfix/ble_mesh_provisioner_fail_to_pub_v3.3' into 'release/v3.3'
...
ble_mesh: Fix Provisioner failed to publish (v3.3)
See merge request espressif/esp-idf!8875
2020-05-22 19:14:42 +08:00
lly
879bfc608c
ble_mesh: Fix Provisioner failed to publish
2020-05-22 15:49:30 +08:00
David Cermak
612b9e4a58
ws_client: fix fragmented send setting proper opcodes
...
Previous implementation violated the RFC by having both the actual opcode and WS_FIN flag set for all fragments of a message.
Fixed by setting the opcode only for the first fragment and WS_FIN for the last one
Closes IDFGH-2938
Closes https://github.com/espressif/esp-idf/issues/4974
2020-05-22 06:16:29 +00:00
lly
8bc195db3b
ble_mesh: Fix tutorial links in examples README.md
2020-05-22 14:09:21 +08:00
lly
af4ca47300
ble_mesh: Rename esp_fast_prov_* to ble_mesh_fast_prov_*
2020-05-22 14:09:21 +08:00
lly
b98eee2445
ble_mesh: Rename the folders ble_mesh_fast_prov_* to fast_prov_*
2020-05-22 14:09:21 +08:00
lly
0e4faac0ee
ble_mesh: Rename ble mesh example main & init files
...
- Rename ble_mesh_demo_main.c to main.c
- Rename ble_mesh_demo_init.* to ble_mesh_example_init.*
2020-05-22 14:09:21 +08:00
lly
6149b640c9
ble_mesh: Move the example init to the components
2020-05-22 14:08:53 +08:00
lly
bdaf56b17a
ble_mesh: Move the button component to components
2020-05-22 10:56:26 +08:00
lly
b6ed032e1d
ble_mesh: Change the EXTRA_COMPONENT_DIRS used by examples
2020-05-22 10:56:26 +08:00
lly
ecf7ea897e
ble_mesh: Rename common_vendor_models to components
...
Since the scripts of CI will bypass components when trying
to get EXAMPLE_PATHS, and these BLE Mesh components will
only be used by other mesh examples, i.e. no need to be
compiled as a single example, so we rename the folder
to componnets.
2020-05-22 10:56:26 +08:00
Island
796dc4bb35
Merge branch 'bugfix/ble_mesh_friend_init_flag_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh friend init flag (v3.3)
See merge request espressif/esp-idf!8849
2020-05-22 10:50:55 +08:00
Island
2ae27a9ae1
Merge branch 'doc/ble_mesh_fix_v3.3' into 'release/v3.3'
...
ble_mesh: Doc miscellaneous fixes (v3.3)
See merge request espressif/esp-idf!8860
2020-05-22 10:49:27 +08:00
lly
6e8529c08d
ble_mesh: Doc miscellaneous fixes
...
- Update ble mesh architecture
2020-05-21 17:49:58 +08:00
Island
6046e7b26f
Merge branch 'bugfix/ble_mesh_node_old_version_to_new_v3.3' into 'release/v3.3'
...
ble_mesh: Fix mesh node device role restore (v3.3)
See merge request espressif/esp-idf!8725
2020-05-21 15:10:29 +08:00
lly
1b1aea24f0
ble_mesh: Clear two more vars during proxy server deinit
2020-05-21 14:29:04 +08:00
lly
e55c65562c
ble_mesh: Add missing sdkconfig.h
2020-05-21 14:28:57 +08:00
lly
1ad9de1131
ble_mesh: Init device name during proxy server init
...
Device name will be reset when deinit mesh stack. If not
initializing device name during the next mesh stack init,
it will fail to set the device name when using bluedroid.
2020-05-21 14:28:49 +08:00
lly
8e4399bf29
ble_mesh: Add init flag for friend init/deinit
...
Since bt_mesh_friend_init() will only be invoked when
a device is provisioned or Provisioner is enabled, so
we add a flag to indicate if the friend functionality
is initialized in case deinit before initialization.
2020-05-21 14:28:40 +08:00