From bf51fb965b048b8ef4f87d1043e64061cb46f606 Mon Sep 17 00:00:00 2001 From: Liu Linyan Date: Fri, 25 Aug 2023 14:28:44 +0800 Subject: [PATCH 1/4] feat(ble_mesh): Bluetooth Mesh folder and file misc updates --- components/bt/CMakeLists.txt | 140 +++++++++--------- .../bt/esp_ble_mesh/api/esp_ble_mesh_defs.h | 6 +- .../bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c | 2 +- .../btc/btc_ble_mesh_config_model.c | 2 +- .../btc/btc_ble_mesh_generic_model.c | 2 +- .../btc/btc_ble_mesh_health_model.c | 4 +- .../btc/btc_ble_mesh_lighting_model.c | 2 +- .../bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c | 32 ++-- .../btc/btc_ble_mesh_sensor_model.c | 2 +- .../btc/btc_ble_mesh_time_scene_model.c | 2 +- .../btc/include/btc_ble_mesh_ble.h | 2 +- .../btc/include/btc_ble_mesh_prov.h | 8 +- .../mesh_atomic.c => common/atomic.c} | 4 +- .../{mesh_common/mesh_buf.c => common/buf.c} | 2 +- .../mesh_common.c => common/common.c} | 6 +- .../include/mesh/atomic.h} | 2 +- .../mesh_buf.h => common/include/mesh/buf.h} | 8 +- .../include/mesh/byteorder.h} | 4 +- .../include/mesh/common.h} | 10 +- .../include/mesh/compiler.h} | 0 .../include/mesh/config.h} | 0 .../include/mesh/dlist.h} | 2 +- .../mesh_ffs.h => common/include/mesh/ffs.h} | 4 +- .../include/mesh/kernel.h} | 4 +- .../include/mesh/mutex.h} | 6 +- .../include/mesh/slist.h} | 2 +- .../include/mesh/timer.h} | 6 +- .../include/mesh/trace.h} | 2 +- .../include/mesh/types.h} | 0 .../include/mesh/utils.h} | 8 +- .../mesh_kernel.c => common/kernel.c} | 2 +- .../mesh_mutex.c => common/mutex.c} | 2 +- .../mesh_timer.c => common/timer.c} | 4 +- .../tinycrypt/include/tinycrypt/aes.h | 0 .../tinycrypt/include/tinycrypt/cbc_mode.h | 0 .../tinycrypt/include/tinycrypt/ccm_mode.h | 0 .../tinycrypt/include/tinycrypt/cmac_mode.h | 0 .../tinycrypt/include/tinycrypt/constants.h | 0 .../tinycrypt/include/tinycrypt/ctr_mode.h | 0 .../tinycrypt/include/tinycrypt/ctr_prng.h | 0 .../tinycrypt/include/tinycrypt/ecc.h | 0 .../tinycrypt/include/tinycrypt/ecc_dh.h | 0 .../tinycrypt/include/tinycrypt/ecc_dsa.h | 0 .../include/tinycrypt/ecc_platform_specific.h | 0 .../tinycrypt/include/tinycrypt/hmac.h | 0 .../tinycrypt/include/tinycrypt/hmac_prng.h | 0 .../tinycrypt/include/tinycrypt/sha256.h | 0 .../tinycrypt/include/tinycrypt/utils.h | 0 .../tinycrypt/src/aes_decrypt.c | 0 .../tinycrypt/src/aes_encrypt.c | 0 .../tinycrypt/src/cbc_mode.c | 0 .../tinycrypt/src/ccm_mode.c | 0 .../tinycrypt/src/cmac_mode.c | 0 .../tinycrypt/src/ctr_mode.c | 0 .../tinycrypt/src/ctr_prng.c | 0 .../tinycrypt/src/ecc.c | 0 .../tinycrypt/src/ecc_dh.c | 0 .../tinycrypt/src/ecc_dsa.c | 0 .../tinycrypt/src/ecc_platform_specific.c | 0 .../tinycrypt/src/hmac.c | 0 .../tinycrypt/src/hmac_prng.c | 0 .../tinycrypt/src/sha256.c | 0 .../tinycrypt/src/utils.c | 0 .../mesh_util.c => common/utils.c} | 6 +- .../esp_ble_mesh/{mesh_core => core}/access.c | 6 +- .../esp_ble_mesh/{mesh_core => core}/access.h | 0 .../bt/esp_ble_mesh/{mesh_core => core}/adv.c | 12 +- .../bt/esp_ble_mesh/{mesh_core => core}/adv.h | 4 +- .../esp_ble_mesh/{mesh_core => core}/beacon.c | 8 +- .../esp_ble_mesh/{mesh_core => core}/beacon.h | 0 .../bluedroid_host/adapter.c} | 8 +- .../{mesh_core => core}/cfg_cli.c | 6 +- .../{mesh_core => core}/cfg_srv.c | 6 +- .../esp_ble_mesh/{mesh_core => core}/crypto.c | 4 +- .../esp_ble_mesh/{mesh_core => core}/crypto.h | 2 +- .../{mesh_core => core}/fast_prov.c | 6 +- .../{mesh_core => core}/fast_prov.h | 0 .../{mesh_core => core}/foundation.h | 2 +- .../esp_ble_mesh/{mesh_core => core}/friend.c | 4 +- .../esp_ble_mesh/{mesh_core => core}/friend.h | 0 .../{mesh_core => core}/health_cli.c | 6 +- .../{mesh_core => core}/health_srv.c | 4 +- .../include/mesh/access.h} | 6 +- .../include/mesh/adapter.h} | 16 +- .../include => core/include/mesh}/cfg_cli.h | 2 +- .../include => core/include/mesh}/cfg_srv.h | 2 +- .../mesh_hci.h => core/include/mesh/hci.h} | 4 +- .../include/mesh}/health_cli.h | 2 +- .../include/mesh}/health_srv.h | 2 +- .../mesh_main.h => core/include/mesh/main.h} | 2 +- .../include/mesh/proxy.h} | 0 .../mesh_uuid.h => core/include/mesh/uuid.h} | 2 +- .../local_operation.c => core/local.c} | 2 +- .../local_operation.h => core/local.h} | 8 +- .../bt/esp_ble_mesh/{mesh_core => core}/lpn.c | 4 +- .../bt/esp_ble_mesh/{mesh_core => core}/lpn.h | 0 .../esp_ble_mesh/{mesh_core => core}/main.c | 10 +- .../esp_ble_mesh/{mesh_core => core}/mesh.h | 0 .../bt/esp_ble_mesh/{mesh_core => core}/net.c | 4 +- .../bt/esp_ble_mesh/{mesh_core => core}/net.h | 2 +- .../nimble_host/adapter.c} | 6 +- .../{mesh_core/prov.c => core/prov_node.c} | 6 +- .../{mesh_core/prov.h => core/prov_node.h} | 10 +- .../provisioner_prov.c => core/prov_pvnr.c} | 6 +- .../provisioner_prov.h => core/prov_pvnr.h} | 10 +- .../{mesh_core => core}/proxy_client.c | 8 +- .../{mesh_core => core}/proxy_client.h | 2 +- .../{mesh_core => core}/proxy_server.c | 4 +- .../{mesh_core => core}/proxy_server.h | 2 +- .../provisioner_main.c => core/pvnr_mgmt.c} | 6 +- .../provisioner_main.h => core/pvnr_mgmt.h} | 8 +- .../esp_ble_mesh/{mesh_core => core}/scan.c | 14 +- .../esp_ble_mesh/{mesh_core => core}/scan.h | 2 +- .../{mesh_core => core/storage}/settings.c | 8 +- .../{mesh_core => core/storage}/settings.h | 2 +- .../storage/settings_nvs.c | 2 +- .../storage/settings_nvs.h | 2 +- .../storage}/settings_uid.c | 6 +- .../storage}/settings_uid.h | 2 +- .../esp_ble_mesh/{mesh_core => core}/test.c | 2 +- .../esp_ble_mesh/{mesh_core => core}/test.h | 2 +- .../{mesh_core => core}/transport.c | 6 +- .../{mesh_core => core}/transport.h | 0 .../client/client_common.c | 6 +- .../client/generic_client.c | 6 +- .../client/include/mesh}/client_common.h | 2 +- .../client/include/mesh}/generic_client.h | 2 +- .../client/include/mesh}/lighting_client.h | 2 +- .../client/include/mesh}/sensor_client.h | 2 +- .../client/include/mesh}/time_scene_client.h | 2 +- .../client/lighting_client.c | 6 +- .../client/sensor_client.c | 6 +- .../client/time_scene_client.c | 6 +- .../common/device_property.c | 6 +- .../common/include/mesh}/device_property.h | 2 +- .../common/include/mesh}/model_opcode.h | 2 +- .../server/generic_server.c | 8 +- .../server/include/mesh}/generic_server.h | 2 +- .../server/include/mesh}/lighting_server.h | 2 +- .../server/include/mesh}/sensor_server.h | 2 +- .../server/include/mesh}/server_common.h | 2 +- .../server/include/mesh}/state_binding.h | 2 +- .../server/include/mesh}/state_transition.h | 10 +- .../server/include/mesh}/time_scene_server.h | 2 +- .../server/lighting_server.c | 8 +- .../server/sensor_server.c | 8 +- .../server/server_common.c | 8 +- .../server/state_binding.c | 10 +- .../server/state_transition.c | 6 +- .../server/time_scene_server.c | 6 +- .../esp-ble-mesh/ble-mesh-architecture.rst | 66 ++++----- .../esp-ble-mesh/ble-mesh-architecture.rst | 66 ++++----- .../vendor_model/include/genie_slist.h | 2 +- .../ble_mesh_coex_test/components/case/sync.h | 2 +- .../main/ble_mesh_register_cmd.c | 2 +- tools/ci/check_copyright_ignore.txt | 60 ++++---- 156 files changed, 437 insertions(+), 437 deletions(-) rename components/bt/esp_ble_mesh/{mesh_common/mesh_atomic.c => common/atomic.c} (98%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_buf.c => common/buf.c} (99%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_common.c => common/common.c} (97%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_atomic.h => common/include/mesh/atomic.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_buf.h => common/include/mesh/buf.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_byteorder.h => common/include/mesh/byteorder.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_common.h => common/include/mesh/common.h} (92%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_compiler.h => common/include/mesh/compiler.h} (100%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_config.h => common/include/mesh/config.h} (100%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_dlist.h => common/include/mesh/dlist.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_ffs.h => common/include/mesh/ffs.h} (96%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_kernel.h => common/include/mesh/kernel.h} (96%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_mutex.h => common/include/mesh/mutex.h} (92%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_slist.h => common/include/mesh/slist.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_timer.h => common/include/mesh/timer.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_trace.h => common/include/mesh/trace.h} (99%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_types.h => common/include/mesh/types.h} (100%) rename components/bt/esp_ble_mesh/{mesh_common/include/mesh_util.h => common/include/mesh/utils.h} (97%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_kernel.c => common/kernel.c} (92%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_mutex.c => common/mutex.c} (99%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_timer.c => common/timer.c} (98%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/aes.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/cbc_mode.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ccm_mode.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/cmac_mode.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/constants.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ctr_mode.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ctr_prng.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ecc.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ecc_dh.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ecc_dsa.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/ecc_platform_specific.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/hmac.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/hmac_prng.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/sha256.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/include/tinycrypt/utils.h (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/aes_decrypt.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/aes_encrypt.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/cbc_mode.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ccm_mode.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/cmac_mode.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ctr_mode.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ctr_prng.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ecc.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ecc_dh.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ecc_dsa.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/ecc_platform_specific.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/hmac.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/hmac_prng.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/sha256.c (100%) rename components/bt/esp_ble_mesh/{mesh_common => common}/tinycrypt/src/utils.c (100%) rename components/bt/esp_ble_mesh/{mesh_common/mesh_util.c => common/utils.c} (96%) rename components/bt/esp_ble_mesh/{mesh_core => core}/access.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/access.h (100%) rename components/bt/esp_ble_mesh/{mesh_core => core}/adv.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/adv.h (98%) rename components/bt/esp_ble_mesh/{mesh_core => core}/beacon.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/beacon.h (100%) rename components/bt/esp_ble_mesh/{mesh_core/bluedroid_host/mesh_bearer_adapt.c => core/bluedroid_host/adapter.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/cfg_cli.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/cfg_srv.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/crypto.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/crypto.h (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/fast_prov.c (98%) rename components/bt/esp_ble_mesh/{mesh_core => core}/fast_prov.h (100%) rename components/bt/esp_ble_mesh/{mesh_core => core}/foundation.h (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/friend.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/friend.h (100%) rename components/bt/esp_ble_mesh/{mesh_core => core}/health_cli.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/health_srv.c (99%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_access.h => core/include/mesh/access.h} (99%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_bearer_adapt.h => core/include/mesh/adapter.h} (99%) rename components/bt/esp_ble_mesh/{mesh_core/include => core/include/mesh}/cfg_cli.h (99%) rename components/bt/esp_ble_mesh/{mesh_core/include => core/include/mesh}/cfg_srv.h (99%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_hci.h => core/include/mesh/hci.h} (98%) rename components/bt/esp_ble_mesh/{mesh_core/include => core/include/mesh}/health_cli.h (98%) rename components/bt/esp_ble_mesh/{mesh_core/include => core/include/mesh}/health_srv.h (99%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_main.h => core/include/mesh/main.h} (99%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_proxy.h => core/include/mesh/proxy.h} (100%) rename components/bt/esp_ble_mesh/{mesh_core/include/mesh_uuid.h => core/include/mesh/uuid.h} (99%) rename components/bt/esp_ble_mesh/{mesh_core/local_operation.c => core/local.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core/local_operation.h => core/local.h} (90%) rename components/bt/esp_ble_mesh/{mesh_core => core}/lpn.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/lpn.h (100%) rename components/bt/esp_ble_mesh/{mesh_core => core}/main.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/mesh.h (100%) rename components/bt/esp_ble_mesh/{mesh_core => core}/net.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/net.h (99%) rename components/bt/esp_ble_mesh/{mesh_core/nimble_host/mesh_bearer_adapt.c => core/nimble_host/adapter.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core/prov.c => core/prov_node.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core/prov.h => core/prov_node.h} (89%) rename components/bt/esp_ble_mesh/{mesh_core/provisioner_prov.c => core/prov_pvnr.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core/provisioner_prov.h => core/prov_pvnr.h} (98%) rename components/bt/esp_ble_mesh/{mesh_core => core}/proxy_client.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/proxy_client.h (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/proxy_server.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/proxy_server.h (98%) rename components/bt/esp_ble_mesh/{mesh_core/provisioner_main.c => core/pvnr_mgmt.c} (99%) rename components/bt/esp_ble_mesh/{mesh_core/provisioner_main.h => core/pvnr_mgmt.h} (97%) rename components/bt/esp_ble_mesh/{mesh_core => core}/scan.c (98%) rename components/bt/esp_ble_mesh/{mesh_core => core}/scan.h (95%) rename components/bt/esp_ble_mesh/{mesh_core => core/storage}/settings.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core/storage}/settings.h (98%) rename components/bt/esp_ble_mesh/{mesh_core => core}/storage/settings_nvs.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/storage/settings_nvs.h (99%) rename components/bt/esp_ble_mesh/{mesh_core => core/storage}/settings_uid.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core/storage}/settings_uid.h (97%) rename components/bt/esp_ble_mesh/{mesh_core => core}/test.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/test.h (97%) rename components/bt/esp_ble_mesh/{mesh_core => core}/transport.c (99%) rename components/bt/esp_ble_mesh/{mesh_core => core}/transport.h (100%) rename components/bt/esp_ble_mesh/{mesh_models => models}/client/client_common.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/client/generic_client.c (99%) rename components/bt/esp_ble_mesh/{mesh_models/client/include => models/client/include/mesh}/client_common.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/client/include => models/client/include/mesh}/generic_client.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/client/include => models/client/include/mesh}/lighting_client.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/client/include => models/client/include/mesh}/sensor_client.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/client/include => models/client/include/mesh}/time_scene_client.h (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/client/lighting_client.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/client/sensor_client.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/client/time_scene_client.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/common/device_property.c (99%) rename components/bt/esp_ble_mesh/{mesh_models/common/include => models/common/include/mesh}/device_property.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/common/include => models/common/include/mesh}/model_opcode.h (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/generic_server.c (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/generic_server.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/lighting_server.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/sensor_server.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/server_common.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/state_binding.h (99%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/state_transition.h (95%) rename components/bt/esp_ble_mesh/{mesh_models/server/include => models/server/include/mesh}/time_scene_server.h (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/lighting_server.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/sensor_server.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/server_common.c (98%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/state_binding.c (98%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/state_transition.c (99%) rename components/bt/esp_ble_mesh/{mesh_models => models}/server/time_scene_server.c (99%) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 0377caebc0e..1ec32112da9 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -372,22 +372,22 @@ if(CONFIG_BT_ENABLED) list(APPEND srcs "common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c") if(CONFIG_BLE_MESH) - list(APPEND srcs "esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c") + list(APPEND srcs "esp_ble_mesh/core/bluedroid_host/adapter.c") endif() endif() if(CONFIG_BLE_MESH) list(APPEND include_dirs - "esp_ble_mesh/mesh_common/include" - "esp_ble_mesh/mesh_common/tinycrypt/include" - "esp_ble_mesh/mesh_core" - "esp_ble_mesh/mesh_core/include" - "esp_ble_mesh/mesh_core/storage" + "esp_ble_mesh/common/include" + "esp_ble_mesh/common/tinycrypt/include" + "esp_ble_mesh/core" + "esp_ble_mesh/core/include" + "esp_ble_mesh/core/storage" "esp_ble_mesh/btc/include" - "esp_ble_mesh/mesh_models/common/include" - "esp_ble_mesh/mesh_models/client/include" - "esp_ble_mesh/mesh_models/server/include" + "esp_ble_mesh/models/common/include" + "esp_ble_mesh/models/client/include" + "esp_ble_mesh/models/server/include" "esp_ble_mesh/api/core/include" "esp_ble_mesh/api/models/include" "esp_ble_mesh/api") @@ -413,66 +413,66 @@ if(CONFIG_BT_ENABLED) "esp_ble_mesh/btc/btc_ble_mesh_prov.c" "esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c" "esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c" - "esp_ble_mesh/mesh_common/tinycrypt/src/utils.c" - "esp_ble_mesh/mesh_common/mesh_atomic.c" - "esp_ble_mesh/mesh_common/mesh_buf.c" - "esp_ble_mesh/mesh_common/mesh_common.c" - "esp_ble_mesh/mesh_common/mesh_kernel.c" - "esp_ble_mesh/mesh_common/mesh_mutex.c" - "esp_ble_mesh/mesh_common/mesh_timer.c" - "esp_ble_mesh/mesh_common/mesh_util.c" - "esp_ble_mesh/mesh_core/storage/settings_nvs.c" - "esp_ble_mesh/mesh_core/access.c" - "esp_ble_mesh/mesh_core/adv.c" - "esp_ble_mesh/mesh_core/beacon.c" - "esp_ble_mesh/mesh_core/cfg_cli.c" - "esp_ble_mesh/mesh_core/cfg_srv.c" - "esp_ble_mesh/mesh_core/crypto.c" - "esp_ble_mesh/mesh_core/fast_prov.c" - "esp_ble_mesh/mesh_core/friend.c" - "esp_ble_mesh/mesh_core/health_cli.c" - "esp_ble_mesh/mesh_core/health_srv.c" - "esp_ble_mesh/mesh_core/local_operation.c" - "esp_ble_mesh/mesh_core/lpn.c" - "esp_ble_mesh/mesh_core/main.c" - "esp_ble_mesh/mesh_core/net.c" - "esp_ble_mesh/mesh_core/prov.c" - "esp_ble_mesh/mesh_core/provisioner_main.c" - "esp_ble_mesh/mesh_core/provisioner_prov.c" - "esp_ble_mesh/mesh_core/proxy_client.c" - "esp_ble_mesh/mesh_core/proxy_server.c" - "esp_ble_mesh/mesh_core/settings_uid.c" - "esp_ble_mesh/mesh_core/settings.c" - "esp_ble_mesh/mesh_core/scan.c" - "esp_ble_mesh/mesh_core/test.c" - "esp_ble_mesh/mesh_core/transport.c" - "esp_ble_mesh/mesh_models/common/device_property.c" - "esp_ble_mesh/mesh_models/client/client_common.c" - "esp_ble_mesh/mesh_models/client/generic_client.c" - "esp_ble_mesh/mesh_models/client/lighting_client.c" - "esp_ble_mesh/mesh_models/client/sensor_client.c" - "esp_ble_mesh/mesh_models/client/time_scene_client.c" - "esp_ble_mesh/mesh_models/server/generic_server.c" - "esp_ble_mesh/mesh_models/server/lighting_server.c" - "esp_ble_mesh/mesh_models/server/sensor_server.c" - "esp_ble_mesh/mesh_models/server/server_common.c" - "esp_ble_mesh/mesh_models/server/state_binding.c" - "esp_ble_mesh/mesh_models/server/state_transition.c" - "esp_ble_mesh/mesh_models/server/time_scene_server.c") + "esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c" + "esp_ble_mesh/common/tinycrypt/src/aes_encrypt.c" + "esp_ble_mesh/common/tinycrypt/src/cbc_mode.c" + "esp_ble_mesh/common/tinycrypt/src/ccm_mode.c" + "esp_ble_mesh/common/tinycrypt/src/cmac_mode.c" + "esp_ble_mesh/common/tinycrypt/src/ctr_mode.c" + "esp_ble_mesh/common/tinycrypt/src/ctr_prng.c" + "esp_ble_mesh/common/tinycrypt/src/ecc_dh.c" + "esp_ble_mesh/common/tinycrypt/src/ecc_dsa.c" + "esp_ble_mesh/common/tinycrypt/src/ecc_platform_specific.c" + "esp_ble_mesh/common/tinycrypt/src/ecc.c" + "esp_ble_mesh/common/tinycrypt/src/hmac_prng.c" + "esp_ble_mesh/common/tinycrypt/src/hmac.c" + "esp_ble_mesh/common/tinycrypt/src/sha256.c" + "esp_ble_mesh/common/tinycrypt/src/utils.c" + "esp_ble_mesh/common/atomic.c" + "esp_ble_mesh/common/buf.c" + "esp_ble_mesh/common/common.c" + "esp_ble_mesh/common/kernel.c" + "esp_ble_mesh/common/mutex.c" + "esp_ble_mesh/common/timer.c" + "esp_ble_mesh/common/utils.c" + "esp_ble_mesh/core/storage/settings_nvs.c" + "esp_ble_mesh/core/storage/settings_uid.c" + "esp_ble_mesh/core/storage/settings.c" + "esp_ble_mesh/core/access.c" + "esp_ble_mesh/core/adv.c" + "esp_ble_mesh/core/beacon.c" + "esp_ble_mesh/core/cfg_cli.c" + "esp_ble_mesh/core/cfg_srv.c" + "esp_ble_mesh/core/crypto.c" + "esp_ble_mesh/core/fast_prov.c" + "esp_ble_mesh/core/friend.c" + "esp_ble_mesh/core/health_cli.c" + "esp_ble_mesh/core/health_srv.c" + "esp_ble_mesh/core/local.c" + "esp_ble_mesh/core/lpn.c" + "esp_ble_mesh/core/main.c" + "esp_ble_mesh/core/net.c" + "esp_ble_mesh/core/prov_node.c" + "esp_ble_mesh/core/prov_pvnr.c" + "esp_ble_mesh/core/proxy_client.c" + "esp_ble_mesh/core/proxy_server.c" + "esp_ble_mesh/core/pvnr_mgmt.c" + "esp_ble_mesh/core/scan.c" + "esp_ble_mesh/core/test.c" + "esp_ble_mesh/core/transport.c" + "esp_ble_mesh/models/common/device_property.c" + "esp_ble_mesh/models/client/client_common.c" + "esp_ble_mesh/models/client/generic_client.c" + "esp_ble_mesh/models/client/lighting_client.c" + "esp_ble_mesh/models/client/sensor_client.c" + "esp_ble_mesh/models/client/time_scene_client.c" + "esp_ble_mesh/models/server/generic_server.c" + "esp_ble_mesh/models/server/lighting_server.c" + "esp_ble_mesh/models/server/sensor_server.c" + "esp_ble_mesh/models/server/server_common.c" + "esp_ble_mesh/models/server/state_binding.c" + "esp_ble_mesh/models/server/state_transition.c" + "esp_ble_mesh/models/server/time_scene_server.c") endif() @@ -645,7 +645,7 @@ if(CONFIG_BT_ENABLED) "common/btc/profile/esp/blufi/nimble_host/esp_blufi.c") if(CONFIG_BLE_MESH) - list(APPEND srcs "esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c") + list(APPEND srcs "esp_ble_mesh/core/nimble_host/adapter.c") endif() if(CONFIG_BT_NIMBLE_MESH) diff --git a/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h b/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h index 21348313063..98677395a24 100644 --- a/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h +++ b/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h @@ -9,10 +9,10 @@ #include -#include "mesh_config.h" -#include "mesh_common.h" +#include "mesh/config.h" +#include "mesh/common.h" #include "proxy_server.h" -#include "provisioner_main.h" +#include "pvnr_mgmt.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c index 01d0ece0109..ead6c2cc022 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c @@ -10,7 +10,7 @@ #include "btc_ble_mesh_ble.h" #include "adv.h" #include "scan.h" -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #include "esp_ble_mesh_ble_api.h" #if CONFIG_BLE_MESH_BLE_COEX_SUPPORT diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c index 1057d867faf..2f6115f6e44 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c @@ -12,7 +12,7 @@ #include "esp_ble_mesh_config_model_api.h" #if CONFIG_BLE_MESH_CFG_CLI -#include "cfg_cli.h" +#include "mesh/cfg_cli.h" /* Configuration Client Model related functions */ diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c index ea64584b19d..f36074a6e77 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c @@ -11,7 +11,7 @@ #include "esp_ble_mesh_generic_model_api.h" #if CONFIG_BLE_MESH_GENERIC_CLIENT -#include "generic_client.h" +#include "mesh/generic_client.h" /* Generic Client Models related functions */ diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c index 62a9b7fd526..49f90d930b2 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c @@ -12,7 +12,7 @@ #include "esp_ble_mesh_health_model_api.h" #if CONFIG_BLE_MESH_HEALTH_CLI -#include "health_cli.h" +#include "mesh/health_cli.h" /* Health Client Model related functions */ @@ -453,7 +453,7 @@ void btc_ble_mesh_health_client_cb_handler(btc_msg_t *msg) #endif /* CONFIG_BLE_MESH_HEALTH_CLI */ #if CONFIG_BLE_MESH_HEALTH_SRV -#include "health_srv.h" +#include "mesh/health_srv.h" /* Health Server Model related functions */ diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c index 8c96ef82869..ea3d5917e72 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c @@ -11,7 +11,7 @@ #include "esp_ble_mesh_lighting_model_api.h" #if CONFIG_BLE_MESH_LIGHTING_CLIENT -#include "lighting_client.h" +#include "mesh/lighting_client.h" /* Lighting Client Models related functions */ diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c index 59be9f5d873..b29820bec5a 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c @@ -16,42 +16,42 @@ #include "btc_ble_mesh_lighting_model.h" #include "adv.h" -#include "mesh_kernel.h" -#include "mesh_proxy.h" +#include "mesh/kernel.h" +#include "mesh/proxy.h" #include "mesh.h" #include "access.h" -#include "prov.h" +#include "prov_node.h" #include "settings_uid.h" #include "proxy_server.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" #if CONFIG_BLE_MESH_CFG_CLI -#include "cfg_cli.h" +#include "mesh/cfg_cli.h" #endif /* CONFIG_BLE_MESH_CFG_CLI */ #if CONFIG_BLE_MESH_HEALTH_CLI -#include "health_cli.h" +#include "mesh/health_cli.h" #endif /* CONFIG_BLE_MESH_HEALTH_CLI */ -#include "cfg_srv.h" +#include "mesh/cfg_srv.h" #if CONFIG_BLE_MESH_HEALTH_SRV -#include "health_srv.h" +#include "mesh/health_srv.h" #endif /* CONFIG_BLE_MESH_HEALTH_SRV */ #if CONFIG_BLE_MESH_GENERIC_CLIENT -#include "generic_client.h" +#include "mesh/generic_client.h" #endif /* CONFIG_BLE_MESH_GENERIC_CLIENT */ #if CONFIG_BLE_MESH_LIGHTING_CLIENT -#include "lighting_client.h" +#include "mesh/lighting_client.h" #endif /* CONFIG_BLE_MESH_LIGHTING_CLIENT */ #if CONFIG_BLE_MESH_SENSOR_CLI -#include "sensor_client.h" +#include "mesh/sensor_client.h" #endif /* CONFIG_BLE_MESH_SENSOR_CLI */ #if CONFIG_BLE_MESH_TIME_SCENE_CLIENT -#include "time_scene_client.h" +#include "mesh/time_scene_client.h" #endif /* CONFIG_BLE_MESH_TIME_SCENE_CLIENT */ -#include "client_common.h" -#include "state_binding.h" -#include "local_operation.h" +#include "mesh/client_common.h" +#include "mesh/state_binding.h" +#include "local.h" #include "esp_ble_mesh_common_api.h" #include "esp_ble_mesh_provisioning_api.h" diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c index d0df2febdab..ae32c6586a5 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c @@ -11,7 +11,7 @@ #include "esp_ble_mesh_sensor_model_api.h" #if CONFIG_BLE_MESH_SENSOR_CLI -#include "sensor_client.h" +#include "mesh/sensor_client.h" /* Sensor Client Models related functions */ diff --git a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c index dde61d41386..977a42836f1 100644 --- a/components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c +++ b/components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c @@ -11,7 +11,7 @@ #include "esp_ble_mesh_time_scene_model_api.h" #if CONFIG_BLE_MESH_TIME_SCENE_CLIENT -#include "time_scene_client.h" +#include "mesh/time_scene_client.h" /* Time and Scenes Client Models related functions */ diff --git a/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_ble.h b/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_ble.h index 854ca96522d..8c63002a2a9 100644 --- a/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_ble.h +++ b/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_ble.h @@ -9,7 +9,7 @@ #include #include "btc/btc_manage.h" -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #include "esp_ble_mesh_ble_api.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_prov.h b/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_prov.h index b9cd0156d54..e09a454a1ff 100644 --- a/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_prov.h +++ b/components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_prov.h @@ -8,11 +8,11 @@ #define _BTC_BLE_MESH_PROV_H_ #include "btc/btc_manage.h" -#include "mesh_byteorder.h" -#include "mesh_config.h" -#include "mesh_main.h" +#include "mesh/byteorder.h" +#include "mesh/config.h" +#include "mesh/main.h" #include "fast_prov.h" -#include "provisioner_prov.h" +#include "prov_pvnr.h" #include "esp_ble_mesh_defs.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c b/components/bt/esp_ble_mesh/common/atomic.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c rename to components/bt/esp_ble_mesh/common/atomic.c index 67562bcc93b..723ce7e3ac1 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c +++ b/components/bt/esp_ble_mesh/common/atomic.c @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mesh_atomic.h" -#include "mesh_mutex.h" +#include "mesh/atomic.h" +#include "mesh/mutex.h" #ifndef CONFIG_ATOMIC_OPERATIONS_BUILTIN diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c b/components/bt/esp_ble_mesh/common/buf.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/mesh_buf.c rename to components/bt/esp_ble_mesh/common/buf.c index 7b01aa0ae4f..cc240e07c51 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c +++ b/components/bt/esp_ble_mesh/common/buf.c @@ -6,7 +6,7 @@ */ #include -#include "mesh_common.h" +#include "mesh/common.h" int net_buf_id(struct net_buf *buf) { diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_common.c b/components/bt/esp_ble_mesh/common/common.c similarity index 97% rename from components/bt/esp_ble_mesh/mesh_common/mesh_common.c rename to components/bt/esp_ble_mesh/common/common.c index 80c424200a5..60696aa5651 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_common.c +++ b/components/bt/esp_ble_mesh/common/common.c @@ -9,9 +9,9 @@ #include "esp_random.h" -#include "mesh_main.h" -#include "client_common.h" -#include "mesh_common.h" +#include "mesh/main.h" +#include "mesh/client_common.h" +#include "mesh/common.h" IRAM_ATTR void *bt_mesh_malloc(size_t size) { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_atomic.h b/components/bt/esp_ble_mesh/common/include/mesh/atomic.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_atomic.h rename to components/bt/esp_ble_mesh/common/include/mesh/atomic.h index 6d62840e46e..f72834369fc 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_atomic.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/atomic.h @@ -9,7 +9,7 @@ #ifndef _BLE_MESH_ATOMIC_H_ #define _BLE_MESH_ATOMIC_H_ -#include "mesh_types.h" +#include "mesh/types.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h b/components/bt/esp_ble_mesh/common/include/mesh/buf.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h rename to components/bt/esp_ble_mesh/common/include/mesh/buf.h index 33baa8cc81d..4664626a621 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/buf.h @@ -11,10 +11,10 @@ #ifndef _BLE_MESH_BUF_H_ #define _BLE_MESH_BUF_H_ -#include "mesh_config.h" -#include "mesh_types.h" -#include "mesh_slist.h" -#include "mesh_compiler.h" +#include "mesh/config.h" +#include "mesh/types.h" +#include "mesh/slist.h" +#include "mesh/compiler.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_byteorder.h b/components/bt/esp_ble_mesh/common/include/mesh/byteorder.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_byteorder.h rename to components/bt/esp_ble_mesh/common/include/mesh/byteorder.h index 0ccf2b5b9ea..85fe44a47c4 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_byteorder.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/byteorder.h @@ -7,8 +7,8 @@ #ifndef _BLE_MESH_BYTEORDER_H_ #define _BLE_MESH_BYTEORDER_H_ -#include "mesh_types.h" -#include "mesh_trace.h" +#include "mesh/types.h" +#include "mesh/trace.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_common.h b/components/bt/esp_ble_mesh/common/include/mesh/common.h similarity index 92% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_common.h rename to components/bt/esp_ble_mesh/common/include/mesh/common.h index 2f6b7b1d4f8..14f8f78e909 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_common.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/common.h @@ -17,11 +17,11 @@ #include "esp_attr.h" #include "esp_heap_caps.h" -#include "mesh_byteorder.h" -#include "mesh_ffs.h" -#include "mesh_trace.h" -#include "mesh_mutex.h" -#include "mesh_access.h" +#include "mesh/byteorder.h" +#include "mesh/ffs.h" +#include "mesh/trace.h" +#include "mesh/mutex.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_compiler.h b/components/bt/esp_ble_mesh/common/include/mesh/compiler.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_compiler.h rename to components/bt/esp_ble_mesh/common/include/mesh/compiler.h diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h b/components/bt/esp_ble_mesh/common/include/mesh/config.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h rename to components/bt/esp_ble_mesh/common/include/mesh/config.h diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_dlist.h b/components/bt/esp_ble_mesh/common/include/mesh/dlist.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_dlist.h rename to components/bt/esp_ble_mesh/common/include/mesh/dlist.h index e21d08b761d..01e35f407f3 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_dlist.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/dlist.h @@ -21,7 +21,7 @@ #define _BLE_MESH_DLIST_H_ #include -#include "mesh_util.h" +#include "mesh/utils.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_ffs.h b/components/bt/esp_ble_mesh/common/include/mesh/ffs.h similarity index 96% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_ffs.h rename to components/bt/esp_ble_mesh/common/include/mesh/ffs.h index 1173affbb4d..7f512548685 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_ffs.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/ffs.h @@ -8,8 +8,8 @@ #ifndef _BLE_MESH_FFS_H_ #define _BLE_MESH_FFS_H_ -#include "mesh_types.h" -#include "mesh_compiler.h" +#include "mesh/types.h" +#include "mesh/compiler.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h b/components/bt/esp_ble_mesh/common/include/mesh/kernel.h similarity index 96% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h rename to components/bt/esp_ble_mesh/common/include/mesh/kernel.h index b11e144e087..025b269a4bb 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/kernel.h @@ -13,8 +13,8 @@ #include "freertos/queue.h" #include "freertos/semphr.h" -#include "mesh_config.h" -#include "mesh_types.h" +#include "mesh/config.h" +#include "mesh/types.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_mutex.h b/components/bt/esp_ble_mesh/common/include/mesh/mutex.h similarity index 92% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_mutex.h rename to components/bt/esp_ble_mesh/common/include/mesh/mutex.h index 13d405bab09..0b364a65f74 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_mutex.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/mutex.h @@ -7,9 +7,9 @@ #ifndef _BLE_MESH_MUTEX_H_ #define _BLE_MESH_MUTEX_H_ -#include "mesh_kernel.h" -#include "mesh_slist.h" -#include "mesh_atomic.h" +#include "mesh/kernel.h" +#include "mesh/slist.h" +#include "mesh/atomic.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_slist.h b/components/bt/esp_ble_mesh/common/include/mesh/slist.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_slist.h rename to components/bt/esp_ble_mesh/common/include/mesh/slist.h index aaeb5407cb0..6050522de3a 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_slist.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/slist.h @@ -19,7 +19,7 @@ #include #include -#include "mesh_util.h" +#include "mesh/utils.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h b/components/bt/esp_ble_mesh/common/include/mesh/timer.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h rename to components/bt/esp_ble_mesh/common/include/mesh/timer.h index 5399c4e5c73..f29c06fcc52 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/timer.h @@ -8,9 +8,9 @@ #ifndef _BLE_MESH_TIMER_H_ #define _BLE_MESH_TIMER_H_ -#include "mesh_types.h" -#include "mesh_slist.h" -#include "mesh_atomic.h" +#include "mesh/types.h" +#include "mesh/slist.h" +#include "mesh/atomic.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_trace.h b/components/bt/esp_ble_mesh/common/include/mesh/trace.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_trace.h rename to components/bt/esp_ble_mesh/common/include/mesh/trace.h index df53da63783..1ff7be41b20 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_trace.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/trace.h @@ -11,7 +11,7 @@ #include #include "esp_log.h" -#include "mesh_util.h" +#include "mesh/utils.h" #include "esp_rom_sys.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h b/components/bt/esp_ble_mesh/common/include/mesh/types.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h rename to components/bt/esp_ble_mesh/common/include/mesh/types.h diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h b/components/bt/esp_ble_mesh/common/include/mesh/utils.h similarity index 97% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h rename to components/bt/esp_ble_mesh/common/include/mesh/utils.h index c12c8d70a65..f815e527815 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h +++ b/components/bt/esp_ble_mesh/common/include/mesh/utils.h @@ -11,12 +11,12 @@ * Misc utilities usable by the kernel and application code. */ -#ifndef _BLE_MESH_UTIL_H_ -#define _BLE_MESH_UTIL_H_ +#ifndef _BLE_MESH_UTILS_H_ +#define _BLE_MESH_UTILS_H_ #include #include "esp_bit_defs.h" -#include "mesh_types.h" +#include "mesh/types.h" #ifdef __cplusplus extern "C" { @@ -188,4 +188,4 @@ void mem_rcopy(uint8_t *dst, uint8_t const *src, uint16_t len); } #endif -#endif /* _BLE_MESH_UTIL_H_ */ +#endif /* _BLE_MESH_UTILS_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_kernel.c b/components/bt/esp_ble_mesh/common/kernel.c similarity index 92% rename from components/bt/esp_ble_mesh/mesh_common/mesh_kernel.c rename to components/bt/esp_ble_mesh/common/kernel.c index 8d0e8b963df..3db4ed45e12 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_kernel.c +++ b/components/bt/esp_ble_mesh/common/kernel.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mesh_kernel.h" +#include "mesh/kernel.h" void k_sleep(int32_t duration) { diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_mutex.c b/components/bt/esp_ble_mesh/common/mutex.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_common/mesh_mutex.c rename to components/bt/esp_ble_mesh/common/mutex.c index 484e049ab22..18015a99d5a 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_mutex.c +++ b/components/bt/esp_ble_mesh/common/mutex.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mesh_common.h" +#include "mesh/common.h" static bt_mesh_mutex_t alarm_lock; static bt_mesh_mutex_t list_lock; diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_timer.c b/components/bt/esp_ble_mesh/common/timer.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_common/mesh_timer.c rename to components/bt/esp_ble_mesh/common/timer.c index 8b4fc75d2e2..540849e6d42 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_timer.c +++ b/components/bt/esp_ble_mesh/common/timer.c @@ -12,8 +12,8 @@ #include "osi/alarm.h" #include "osi/hash_functions.h" -#include "mesh_common.h" -#include "provisioner_prov.h" +#include "mesh/common.h" +#include "prov_pvnr.h" static hash_map_t *bm_alarm_hash_map; static const size_t BLE_MESH_GENERAL_ALARM_HASH_MAP_SIZE = 20 + CONFIG_BLE_MESH_PBA_SAME_TIME + \ diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/aes.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/aes.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cbc_mode.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cbc_mode.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ccm_mode.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ccm_mode.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cmac_mode.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cmac_mode.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/constants.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/constants.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_mode.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_mode.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_prng.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_prng.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dh.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dh.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dsa.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dsa.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_platform_specific.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_platform_specific.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac_prng.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac_prng.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/sha256.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/sha256.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h b/components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/utils.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h rename to components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/utils.h diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/aes_encrypt.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/aes_encrypt.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/cbc_mode.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/cbc_mode.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ccm_mode.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ccm_mode.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/cmac_mode.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/cmac_mode.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_mode.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_mode.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_prng.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_prng.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ecc.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ecc.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dh.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dh.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dsa.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dsa.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_platform_specific.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_platform_specific.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/hmac.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/hmac.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/hmac_prng.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/hmac_prng.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/sha256.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/sha256.c diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/utils.c b/components/bt/esp_ble_mesh/common/tinycrypt/src/utils.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/utils.c rename to components/bt/esp_ble_mesh/common/tinycrypt/src/utils.c diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_util.c b/components/bt/esp_ble_mesh/common/utils.c similarity index 96% rename from components/bt/esp_ble_mesh/mesh_common/mesh_util.c rename to components/bt/esp_ble_mesh/common/utils.c index 24904023b91..799035e4b30 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_util.c +++ b/components/bt/esp_ble_mesh/common/utils.c @@ -9,9 +9,9 @@ #include #include -#include "mesh_types.h" -#include "mesh_util.h" -#include "mesh_trace.h" +#include "mesh/types.h" +#include "mesh/utils.h" +#include "mesh/trace.h" const char *bt_hex(const void *buf, size_t len) { diff --git a/components/bt/esp_ble_mesh/mesh_core/access.c b/components/bt/esp_ble_mesh/core/access.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/access.c rename to components/bt/esp_ble_mesh/core/access.c index f110862d083..446cb13e8a5 100644 --- a/components/bt/esp_ble_mesh/mesh_core/access.c +++ b/components/bt/esp_ble_mesh/core/access.c @@ -15,10 +15,10 @@ #include "transport.h" #include "access.h" #include "foundation.h" -#include "mesh_main.h" -#include "mesh_common.h" +#include "mesh/main.h" +#include "mesh/common.h" #include "fast_prov.h" -#include "provisioner_main.h" +#include "pvnr_mgmt.h" #define BLE_MESH_SDU_MAX_LEN 384 diff --git a/components/bt/esp_ble_mesh/mesh_core/access.h b/components/bt/esp_ble_mesh/core/access.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/access.h rename to components/bt/esp_ble_mesh/core/access.h diff --git a/components/bt/esp_ble_mesh/mesh_core/adv.c b/components/bt/esp_ble_mesh/core/adv.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/adv.c rename to components/bt/esp_ble_mesh/core/adv.c index b8bcf38966e..2a84e5a1222 100644 --- a/components/bt/esp_ble_mesh/mesh_core/adv.c +++ b/components/bt/esp_ble_mesh/core/adv.c @@ -11,18 +11,18 @@ #include #include -#include "mesh_kernel.h" +#include "mesh/kernel.h" #include "mesh.h" -#include "mesh_hci.h" -#include "mesh_common.h" +#include "mesh/hci.h" +#include "mesh/common.h" #include "adv.h" #include "beacon.h" -#include "prov.h" +#include "prov_node.h" #include "foundation.h" #include "proxy_server.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "mesh_bearer_adapt.h" +#include "prov_pvnr.h" +#include "mesh/adapter.h" /* Convert from ms to 0.625ms units */ #define ADV_SCAN_UNIT(_ms) ((_ms) * 8 / 5) diff --git a/components/bt/esp_ble_mesh/mesh_core/adv.h b/components/bt/esp_ble_mesh/core/adv.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/adv.h rename to components/bt/esp_ble_mesh/core/adv.h index 27108c203a0..16c3f15918d 100644 --- a/components/bt/esp_ble_mesh/mesh_core/adv.h +++ b/components/bt/esp_ble_mesh/core/adv.h @@ -10,8 +10,8 @@ #ifndef _ADV_H_ #define _ADV_H_ -#include "mesh_access.h" -#include "mesh_bearer_adapt.h" +#include "mesh/access.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/beacon.c b/components/bt/esp_ble_mesh/core/beacon.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/beacon.c rename to components/bt/esp_ble_mesh/core/beacon.c index 981f88edcde..ac0a5593085 100644 --- a/components/bt/esp_ble_mesh/mesh_core/beacon.c +++ b/components/bt/esp_ble_mesh/core/beacon.c @@ -12,15 +12,15 @@ #include "adv.h" #include "mesh.h" -#include "prov.h" +#include "prov_node.h" #include "crypto.h" #include "beacon.h" #include "access.h" #include "foundation.h" #include "proxy_client.h" -#include "mesh_main.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "mesh/main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" #if defined(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL) #define UNPROVISIONED_INTERVAL K_SECONDS(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL) diff --git a/components/bt/esp_ble_mesh/mesh_core/beacon.h b/components/bt/esp_ble_mesh/core/beacon.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/beacon.h rename to components/bt/esp_ble_mesh/core/beacon.h diff --git a/components/bt/esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c rename to components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c index 45c4d12fe64..c9abf821ad3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c +++ b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c @@ -23,10 +23,10 @@ #include #include -#include "mesh_hci.h" -#include "mesh_bearer_adapt.h" -#include "mesh_common.h" -#include "provisioner_prov.h" +#include "mesh/hci.h" +#include "mesh/adapter.h" +#include "mesh/common.h" +#include "prov_pvnr.h" struct bt_mesh_dev bt_mesh_dev; diff --git a/components/bt/esp_ble_mesh/mesh_core/cfg_cli.c b/components/bt/esp_ble_mesh/core/cfg_cli.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/cfg_cli.c rename to components/bt/esp_ble_mesh/core/cfg_cli.c index 331c2296df7..023fe43ea65 100644 --- a/components/bt/esp_ble_mesh/mesh_core/cfg_cli.c +++ b/components/bt/esp_ble_mesh/core/cfg_cli.c @@ -14,10 +14,10 @@ #include "btc_ble_mesh_config_model.h" #include "mesh.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "foundation.h" -#include "mesh_common.h" -#include "cfg_cli.h" +#include "mesh/common.h" +#include "mesh/cfg_cli.h" #if CONFIG_BLE_MESH_CFG_CLI diff --git a/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c b/components/bt/esp_ble_mesh/core/cfg_srv.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/cfg_srv.c rename to components/bt/esp_ble_mesh/core/cfg_srv.c index 1cbb569ee66..33d0c8f395e 100644 --- a/components/bt/esp_ble_mesh/mesh_core/cfg_srv.c +++ b/components/bt/esp_ble_mesh/core/cfg_srv.c @@ -23,10 +23,10 @@ #include "foundation.h" #include "friend.h" #include "settings.h" -#include "cfg_srv.h" +#include "mesh/cfg_srv.h" #include "proxy_server.h" -#include "mesh_main.h" -#include "mesh_common.h" +#include "mesh/main.h" +#include "mesh/common.h" #define DEFAULT_TTL 7 diff --git a/components/bt/esp_ble_mesh/mesh_core/crypto.c b/components/bt/esp_ble_mesh/core/crypto.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/crypto.c rename to components/bt/esp_ble_mesh/core/crypto.c index df3de5a2e7c..3f1d18b703a 100644 --- a/components/bt/esp_ble_mesh/mesh_core/crypto.c +++ b/components/bt/esp_ble_mesh/core/crypto.c @@ -16,8 +16,8 @@ #include #include "crypto.h" -#include "mesh_common.h" -#include "mesh_bearer_adapt.h" +#include "mesh/common.h" +#include "mesh/adapter.h" #define NET_MIC_LEN(pdu) (((pdu)[1] & 0x80) ? 8 : 4) #define APP_MIC_LEN(aszmic) ((aszmic) ? 8 : 4) diff --git a/components/bt/esp_ble_mesh/mesh_core/crypto.h b/components/bt/esp_ble_mesh/core/crypto.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/crypto.h rename to components/bt/esp_ble_mesh/core/crypto.h index f07ce2e6383..2039a3e3125 100644 --- a/components/bt/esp_ble_mesh/mesh_core/crypto.h +++ b/components/bt/esp_ble_mesh/core/crypto.h @@ -11,7 +11,7 @@ #define _CRYPTO_H_ #include -#include "mesh_buf.h" +#include "mesh/buf.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/fast_prov.c b/components/bt/esp_ble_mesh/core/fast_prov.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/fast_prov.c rename to components/bt/esp_ble_mesh/core/fast_prov.c index 04b4db784a7..d00cd2aa1f2 100644 --- a/components/bt/esp_ble_mesh/mesh_core/fast_prov.c +++ b/components/bt/esp_ble_mesh/core/fast_prov.c @@ -8,13 +8,13 @@ #include #include "mesh.h" -#include "mesh_common.h" +#include "mesh/common.h" #include "access.h" #include "beacon.h" #include "foundation.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" #if CONFIG_BLE_MESH_FAST_PROV diff --git a/components/bt/esp_ble_mesh/mesh_core/fast_prov.h b/components/bt/esp_ble_mesh/core/fast_prov.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/fast_prov.h rename to components/bt/esp_ble_mesh/core/fast_prov.h diff --git a/components/bt/esp_ble_mesh/mesh_core/foundation.h b/components/bt/esp_ble_mesh/core/foundation.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/foundation.h rename to components/bt/esp_ble_mesh/core/foundation.h index 3855d93fb6f..1d764aa9596 100644 --- a/components/bt/esp_ble_mesh/mesh_core/foundation.h +++ b/components/bt/esp_ble_mesh/core/foundation.h @@ -8,7 +8,7 @@ #ifndef _FOUNDATION_H_ #define _FOUNDATION_H_ -#include "mesh_byteorder.h" +#include "mesh/byteorder.h" #include "net.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/mesh_core/friend.c b/components/bt/esp_ble_mesh/core/friend.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/friend.c rename to components/bt/esp_ble_mesh/core/friend.c index b2f57dcccd5..0637b17d1f3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/friend.c +++ b/components/bt/esp_ble_mesh/core/friend.c @@ -17,8 +17,8 @@ #include "access.h" #include "friend.h" #include "foundation.h" -#include "mesh_main.h" -#include "provisioner_main.h" +#include "mesh/main.h" +#include "pvnr_mgmt.h" #ifdef CONFIG_BLE_MESH_FRIEND diff --git a/components/bt/esp_ble_mesh/mesh_core/friend.h b/components/bt/esp_ble_mesh/core/friend.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/friend.h rename to components/bt/esp_ble_mesh/core/friend.h diff --git a/components/bt/esp_ble_mesh/mesh_core/health_cli.c b/components/bt/esp_ble_mesh/core/health_cli.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/health_cli.c rename to components/bt/esp_ble_mesh/core/health_cli.c index f6ab7b7ebac..6ddedef55f5 100644 --- a/components/bt/esp_ble_mesh/mesh_core/health_cli.c +++ b/components/bt/esp_ble_mesh/core/health_cli.c @@ -12,12 +12,12 @@ #include "btc_ble_mesh_health_model.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "foundation.h" -#include "mesh_common.h" +#include "mesh/common.h" #if CONFIG_BLE_MESH_HEALTH_CLI -#include "health_cli.h" +#include "mesh/health_cli.h" static const bt_mesh_client_op_pair_t health_op_pair[] = { { OP_HEALTH_FAULT_GET, OP_HEALTH_FAULT_STATUS }, diff --git a/components/bt/esp_ble_mesh/mesh_core/health_srv.c b/components/bt/esp_ble_mesh/core/health_srv.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/health_srv.c rename to components/bt/esp_ble_mesh/core/health_srv.c index 742948d5f9d..70a3e3fbfc8 100644 --- a/components/bt/esp_ble_mesh/mesh_core/health_srv.c +++ b/components/bt/esp_ble_mesh/core/health_srv.c @@ -14,10 +14,10 @@ #include "access.h" #include "foundation.h" -#include "mesh_common.h" +#include "mesh/common.h" #if CONFIG_BLE_MESH_HEALTH_SRV -#include "health_srv.h" +#include "mesh/health_srv.h" #define HEALTH_TEST_STANDARD 0x00 diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h b/components/bt/esp_ble_mesh/core/include/mesh/access.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h rename to components/bt/esp_ble_mesh/core/include/mesh/access.h index 66fbb7e43fb..3e826cea263 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/access.h @@ -11,9 +11,9 @@ #ifndef _BLE_MESH_ACCESS_H_ #define _BLE_MESH_ACCESS_H_ -#include "mesh_config.h" -#include "mesh_buf.h" -#include "mesh_timer.h" +#include "mesh/config.h" +#include "mesh/buf.h" +#include "mesh/timer.h" /** * @brief Bluetooth Mesh Access Layer diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h b/components/bt/esp_ble_mesh/core/include/mesh/adapter.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h rename to components/bt/esp_ble_mesh/core/include/mesh/adapter.h index 7bd95c78e0b..47d4b550d09 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/adapter.h @@ -6,15 +6,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _BLE_MESH_BEARER_ADAPT_H_ -#define _BLE_MESH_BEARER_ADAPT_H_ +#ifndef _BLE_MESH_ADAPTER_H_ +#define _BLE_MESH_ADAPTER_H_ #include -#include "mesh_config.h" -#include "mesh_types.h" -#include "mesh_util.h" -#include "mesh_uuid.h" -#include "mesh_buf.h" +#include "mesh/config.h" +#include "mesh/types.h" +#include "mesh/utils.h" +#include "mesh/uuid.h" +#include "mesh/buf.h" #ifdef __cplusplus extern "C" { @@ -803,4 +803,4 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info) } #endif -#endif /* _BLE_MESH_BEARER_ADAPT_H_ */ +#endif /* _BLE_MESH_ADAPTER_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_core/include/cfg_cli.h b/components/bt/esp_ble_mesh/core/include/mesh/cfg_cli.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/cfg_cli.h rename to components/bt/esp_ble_mesh/core/include/mesh/cfg_cli.h index 02ff566dd92..9928cfdcfd3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/cfg_cli.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/cfg_cli.h @@ -11,7 +11,7 @@ #ifndef _BLE_MESH_CFG_CLI_H_ #define _BLE_MESH_CFG_CLI_H_ -#include "client_common.h" +#include "mesh/client_common.h" /** * @brief Bluetooth Mesh diff --git a/components/bt/esp_ble_mesh/mesh_core/include/cfg_srv.h b/components/bt/esp_ble_mesh/core/include/mesh/cfg_srv.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/cfg_srv.h rename to components/bt/esp_ble_mesh/core/include/mesh/cfg_srv.h index 41b9a6236f5..99c67eab497 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/cfg_srv.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/cfg_srv.h @@ -10,7 +10,7 @@ #ifndef _BLE_MESH_CFG_SRV_H_ #define _BLE_MESH_CFG_SRV_H_ -#include "mesh_access.h" +#include "mesh/access.h" /** * @brief Bluetooth Mesh diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_hci.h b/components/bt/esp_ble_mesh/core/include/mesh/hci.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_hci.h rename to components/bt/esp_ble_mesh/core/include/mesh/hci.h index 860d575c2bd..c48ffe4db50 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_hci.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/hci.h @@ -7,8 +7,8 @@ #ifndef _BLE_MESH_HCI_H_ #define _BLE_MESH_HCI_H_ -#include "mesh_atomic.h" -#include "mesh_bearer_adapt.h" +#include "mesh/atomic.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/include/health_cli.h b/components/bt/esp_ble_mesh/core/include/mesh/health_cli.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/include/health_cli.h rename to components/bt/esp_ble_mesh/core/include/mesh/health_cli.h index 239e14cbede..e91ad893186 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/health_cli.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/health_cli.h @@ -11,7 +11,7 @@ #ifndef _BLE_MESH_HEALTH_CLI_H_ #define _BLE_MESH_HEALTH_CLI_H_ -#include "client_common.h" +#include "mesh/client_common.h" /** * @brief Bluetooth Mesh diff --git a/components/bt/esp_ble_mesh/mesh_core/include/health_srv.h b/components/bt/esp_ble_mesh/core/include/mesh/health_srv.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/health_srv.h rename to components/bt/esp_ble_mesh/core/include/mesh/health_srv.h index 35a61b8258f..f9d4637b1d3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/health_srv.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/health_srv.h @@ -10,7 +10,7 @@ #ifndef _BLE_MESH_HEALTH_SRV_H_ #define _BLE_MESH_HEALTH_SRV_H_ -#include "mesh_access.h" +#include "mesh/access.h" /** * @brief Bluetooth Mesh Health Server Model diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_main.h b/components/bt/esp_ble_mesh/core/include/mesh/main.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_main.h rename to components/bt/esp_ble_mesh/core/include/mesh/main.h index ff41994a8e7..bc04033732e 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_main.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/main.h @@ -11,7 +11,7 @@ #ifndef _BLE_MESH_MAIN_H_ #define _BLE_MESH_MAIN_H_ -#include "mesh_access.h" +#include "mesh/access.h" /** * @brief Bluetooth Mesh Provisioning diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_proxy.h b/components/bt/esp_ble_mesh/core/include/mesh/proxy.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_proxy.h rename to components/bt/esp_ble_mesh/core/include/mesh/proxy.h diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_uuid.h b/components/bt/esp_ble_mesh/core/include/mesh/uuid.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/include/mesh_uuid.h rename to components/bt/esp_ble_mesh/core/include/mesh/uuid.h index b3d207cbe88..986d7f1dde1 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_uuid.h +++ b/components/bt/esp_ble_mesh/core/include/mesh/uuid.h @@ -17,7 +17,7 @@ * @{ */ -#include "mesh_util.h" +#include "mesh/utils.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/local_operation.c b/components/bt/esp_ble_mesh/core/local.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/local_operation.c rename to components/bt/esp_ble_mesh/core/local.c index 10f985f609b..e3367e93eb3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/local_operation.c +++ b/components/bt/esp_ble_mesh/core/local.c @@ -15,7 +15,7 @@ #include "access.h" #include "foundation.h" #include "transport.h" -#include "mesh_main.h" +#include "mesh/main.h" #include "settings.h" static struct bt_mesh_model *find_model(uint16_t elem_addr, uint16_t cid, uint16_t mod_id) diff --git a/components/bt/esp_ble_mesh/mesh_core/local_operation.h b/components/bt/esp_ble_mesh/core/local.h similarity index 90% rename from components/bt/esp_ble_mesh/mesh_core/local_operation.h rename to components/bt/esp_ble_mesh/core/local.h index f7f169d1f8c..85b37e64bd6 100644 --- a/components/bt/esp_ble_mesh/mesh_core/local_operation.h +++ b/components/bt/esp_ble_mesh/core/local.h @@ -7,10 +7,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _LOCAL_OPERATION_H_ -#define _LOCAL_OPERATION_H_ +#ifndef _LOCAL_H_ +#define _LOCAL_H_ -#include "mesh_types.h" +#include "mesh/types.h" #ifdef __cplusplus extern "C" { @@ -38,4 +38,4 @@ int bt_mesh_node_bind_app_key_to_model(uint16_t elem_addr, uint16_t mod_id, } #endif -#endif /* _LOCAL_OPERATION_H_ */ +#endif /* _LOCAL_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_core/lpn.c b/components/bt/esp_ble_mesh/core/lpn.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/lpn.c rename to components/bt/esp_ble_mesh/core/lpn.c index 3c400e36897..4de5bebe6b1 100644 --- a/components/bt/esp_ble_mesh/mesh_core/lpn.c +++ b/components/bt/esp_ble_mesh/core/lpn.c @@ -18,8 +18,8 @@ #include "beacon.h" #include "lpn.h" #include "foundation.h" -#include "mesh_main.h" -#include "cfg_srv.h" +#include "mesh/main.h" +#include "mesh/cfg_srv.h" #ifdef CONFIG_BLE_MESH_LOW_POWER diff --git a/components/bt/esp_ble_mesh/mesh_core/lpn.h b/components/bt/esp_ble_mesh/core/lpn.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/lpn.h rename to components/bt/esp_ble_mesh/core/lpn.h diff --git a/components/bt/esp_ble_mesh/mesh_core/main.c b/components/bt/esp_ble_mesh/core/main.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/main.c rename to components/bt/esp_ble_mesh/core/main.c index 1a660260ddd..7b5a3c715ac 100644 --- a/components/bt/esp_ble_mesh/mesh_core/main.c +++ b/components/bt/esp_ble_mesh/core/main.c @@ -12,7 +12,7 @@ #include "adv.h" #include "scan.h" -#include "prov.h" +#include "prov_node.h" #include "beacon.h" #include "lpn.h" #include "friend.h" @@ -21,12 +21,12 @@ #include "foundation.h" #include "settings.h" #include "mesh.h" -#include "mesh_hci.h" -#include "mesh_common.h" +#include "mesh/hci.h" +#include "mesh/common.h" #include "proxy_client.h" #include "proxy_server.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" static bool mesh_init = false; diff --git a/components/bt/esp_ble_mesh/mesh_core/mesh.h b/components/bt/esp_ble_mesh/core/mesh.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/mesh.h rename to components/bt/esp_ble_mesh/core/mesh.h diff --git a/components/bt/esp_ble_mesh/mesh_core/net.c b/components/bt/esp_ble_mesh/core/net.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/net.c rename to components/bt/esp_ble_mesh/core/net.c index 2ca480f1860..89274121ad7 100644 --- a/components/bt/esp_ble_mesh/mesh_core/net.c +++ b/components/bt/esp_ble_mesh/core/net.c @@ -22,10 +22,10 @@ #include "foundation.h" #include "beacon.h" #include "settings.h" -#include "prov.h" +#include "prov_node.h" #include "proxy_client.h" #include "proxy_server.h" -#include "provisioner_main.h" +#include "pvnr_mgmt.h" /* Minimum valid Mesh Network PDU length. The Network headers * themselves take up 9 bytes. After that there is a minumum of 1 byte diff --git a/components/bt/esp_ble_mesh/mesh_core/net.h b/components/bt/esp_ble_mesh/core/net.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/net.h rename to components/bt/esp_ble_mesh/core/net.h index f982c41cee4..b0e34885244 100644 --- a/components/bt/esp_ble_mesh/mesh_core/net.h +++ b/components/bt/esp_ble_mesh/core/net.h @@ -10,7 +10,7 @@ #ifndef _NET_H_ #define _NET_H_ -#include "mesh_access.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c b/components/bt/esp_ble_mesh/core/nimble_host/adapter.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c rename to components/bt/esp_ble_mesh/core/nimble_host/adapter.c index be3a11595db..47f0a7ca56e 100644 --- a/components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c +++ b/components/bt/esp_ble_mesh/core/nimble_host/adapter.c @@ -24,9 +24,9 @@ #include #include -#include "mesh_hci.h" -#include "mesh_common.h" -#include "provisioner_prov.h" +#include "mesh/hci.h" +#include "mesh/common.h" +#include "prov_pvnr.h" /** @def BT_UUID_MESH_PROV * @brief Mesh Provisioning Service diff --git a/components/bt/esp_ble_mesh/mesh_core/prov.c b/components/bt/esp_ble_mesh/core/prov_node.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/prov.c rename to components/bt/esp_ble_mesh/core/prov_node.c index 29c39731524..f5458008fdd 100644 --- a/components/bt/esp_ble_mesh/mesh_core/prov.c +++ b/components/bt/esp_ble_mesh/core/prov_node.c @@ -14,10 +14,10 @@ #include "mesh.h" #include "access.h" #include "foundation.h" -#include "mesh_common.h" -#include "mesh_proxy.h" +#include "mesh/common.h" +#include "mesh/proxy.h" #include "proxy_server.h" -#include "prov.h" +#include "prov_node.h" #if CONFIG_BLE_MESH_NODE diff --git a/components/bt/esp_ble_mesh/mesh_core/prov.h b/components/bt/esp_ble_mesh/core/prov_node.h similarity index 89% rename from components/bt/esp_ble_mesh/mesh_core/prov.h rename to components/bt/esp_ble_mesh/core/prov_node.h index 789d33a3866..e71c12de5b3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/prov.h +++ b/components/bt/esp_ble_mesh/core/prov_node.h @@ -6,11 +6,11 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _PROV_H_ -#define _PROV_H_ +#ifndef _PROV_NODE_H_ +#define _PROV_NODE_H_ -#include "mesh_main.h" -#include "mesh_bearer_adapt.h" +#include "mesh/main.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { @@ -40,4 +40,4 @@ void bt_mesh_prov_reset(void); } #endif -#endif /* _PROV_H_ */ +#endif /* _PROV_NODE_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_core/provisioner_prov.c b/components/bt/esp_ble_mesh/core/prov_pvnr.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/provisioner_prov.c rename to components/bt/esp_ble_mesh/core/prov_pvnr.c index 81e95ac4c4d..e194deb50ce 100644 --- a/components/bt/esp_ble_mesh/mesh_core/provisioner_prov.c +++ b/components/bt/esp_ble_mesh/core/prov_pvnr.c @@ -14,10 +14,10 @@ #include "access.h" #include "settings.h" #include "fast_prov.h" -#include "mesh_common.h" +#include "mesh/common.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" #if CONFIG_BLE_MESH_PROVISIONER diff --git a/components/bt/esp_ble_mesh/mesh_core/provisioner_prov.h b/components/bt/esp_ble_mesh/core/prov_pvnr.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/provisioner_prov.h rename to components/bt/esp_ble_mesh/core/prov_pvnr.h index 66827232ad6..22ca891fa84 100644 --- a/components/bt/esp_ble_mesh/mesh_core/provisioner_prov.h +++ b/components/bt/esp_ble_mesh/core/prov_pvnr.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _PROVISIONER_PROV_H_ -#define _PROVISIONER_PROV_H_ +#ifndef _PROV_PVNR_H_ +#define _PROV_PVNR_H_ -#include "mesh_main.h" -#include "mesh_bearer_adapt.h" +#include "mesh/main.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { @@ -420,4 +420,4 @@ void bt_mesh_set_fast_prov_flags_iv_index(uint8_t flags, uint32_t iv_index); } #endif -#endif /* _PROVISIONER_PROV_H_ */ +#endif /* _PROV_PVNR_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_core/proxy_client.c b/components/bt/esp_ble_mesh/core/proxy_client.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/proxy_client.c rename to components/bt/esp_ble_mesh/core/proxy_client.c index 8241c0c9025..891d8ea45a7 100644 --- a/components/bt/esp_ble_mesh/mesh_core/proxy_client.c +++ b/components/bt/esp_ble_mesh/core/proxy_client.c @@ -11,12 +11,12 @@ #include "access.h" #include "beacon.h" #include "transport.h" -#include "mesh_common.h" +#include "mesh/common.h" #include "foundation.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" -#include "mesh_bearer_adapt.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" +#include "mesh/adapter.h" #define PDU_TYPE(data) (data[0] & BIT_MASK(6)) #define PDU_SAR(data) (data[0] >> 6) diff --git a/components/bt/esp_ble_mesh/mesh_core/proxy_client.h b/components/bt/esp_ble_mesh/core/proxy_client.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/proxy_client.h rename to components/bt/esp_ble_mesh/core/proxy_client.h index 3c25a9b104d..f7a9d509ea8 100644 --- a/components/bt/esp_ble_mesh/mesh_core/proxy_client.h +++ b/components/bt/esp_ble_mesh/core/proxy_client.h @@ -8,7 +8,7 @@ #define _PROXY_CLIENT_H_ #include "net.h" -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/proxy_server.c b/components/bt/esp_ble_mesh/core/proxy_server.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/proxy_server.c rename to components/bt/esp_ble_mesh/core/proxy_server.c index 897c18005b2..bf907303a21 100644 --- a/components/bt/esp_ble_mesh/mesh_core/proxy_server.c +++ b/components/bt/esp_ble_mesh/core/proxy_server.c @@ -11,12 +11,12 @@ #include "mesh.h" #include "adv.h" -#include "prov.h" +#include "prov_node.h" #include "beacon.h" #include "access.h" #include "transport.h" #include "foundation.h" -#include "mesh_common.h" +#include "mesh/common.h" #include "proxy_server.h" #if (CONFIG_BLE_MESH_NODE && CONFIG_BLE_MESH_PB_GATT) || \ diff --git a/components/bt/esp_ble_mesh/mesh_core/proxy_server.h b/components/bt/esp_ble_mesh/core/proxy_server.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/proxy_server.h rename to components/bt/esp_ble_mesh/core/proxy_server.h index d84dbd0ecfa..0de68884605 100644 --- a/components/bt/esp_ble_mesh/mesh_core/proxy_server.h +++ b/components/bt/esp_ble_mesh/core/proxy_server.h @@ -11,7 +11,7 @@ #define _PROXY_H_ #include "net.h" -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/provisioner_main.c b/components/bt/esp_ble_mesh/core/pvnr_mgmt.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/provisioner_main.c rename to components/bt/esp_ble_mesh/core/pvnr_mgmt.c index f5e1354ace2..da3530d745b 100644 --- a/components/bt/esp_ble_mesh/mesh_core/provisioner_main.c +++ b/components/bt/esp_ble_mesh/core/pvnr_mgmt.c @@ -15,10 +15,10 @@ #include "friend.h" #include "transport.h" #include "foundation.h" -#include "mesh_common.h" +#include "mesh/common.h" #include "proxy_client.h" -#include "provisioner_prov.h" -#include "provisioner_main.h" +#include "prov_pvnr.h" +#include "pvnr_mgmt.h" #if CONFIG_BLE_MESH_PROVISIONER diff --git a/components/bt/esp_ble_mesh/mesh_core/provisioner_main.h b/components/bt/esp_ble_mesh/core/pvnr_mgmt.h similarity index 97% rename from components/bt/esp_ble_mesh/mesh_core/provisioner_main.h rename to components/bt/esp_ble_mesh/core/pvnr_mgmt.h index 9b01e31fb73..dbfd7601f4c 100644 --- a/components/bt/esp_ble_mesh/mesh_core/provisioner_main.h +++ b/components/bt/esp_ble_mesh/core/pvnr_mgmt.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _PROVISIONER_MAIN_H_ -#define _PROVISIONER_MAIN_H_ +#ifndef _PVNR_MGMT_H_ +#define _PVNR_MGMT_H_ #include "net.h" -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { @@ -142,4 +142,4 @@ int bt_mesh_provisioner_store_node_info(struct bt_mesh_node *node); } #endif -#endif /* _PROVISIONER_MAIN_H_ */ +#endif /* _PVNR_MGMT_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_core/scan.c b/components/bt/esp_ble_mesh/core/scan.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/scan.c rename to components/bt/esp_ble_mesh/core/scan.c index b840eff9d0d..8bfbcf8fead 100644 --- a/components/bt/esp_ble_mesh/mesh_core/scan.c +++ b/components/bt/esp_ble_mesh/core/scan.c @@ -13,18 +13,18 @@ #include "btc_ble_mesh_ble.h" -#include "mesh_config.h" -#include "mesh_trace.h" -#include "mesh_buf.h" -#include "mesh_uuid.h" +#include "mesh/config.h" +#include "mesh/trace.h" +#include "mesh/buf.h" +#include "mesh/uuid.h" #include "scan.h" #include "beacon.h" #include "net.h" -#include "prov.h" +#include "prov_node.h" #include "proxy_client.h" #include "proxy_server.h" -#include "provisioner_prov.h" -#include "mesh_bearer_adapt.h" +#include "prov_pvnr.h" +#include "mesh/adapter.h" /* Scan Window and Interval are equal for continuous scanning */ #define SCAN_INTERVAL 0x20 diff --git a/components/bt/esp_ble_mesh/mesh_core/scan.h b/components/bt/esp_ble_mesh/core/scan.h similarity index 95% rename from components/bt/esp_ble_mesh/mesh_core/scan.h rename to components/bt/esp_ble_mesh/core/scan.h index 2d999565fad..5b6937f84d2 100644 --- a/components/bt/esp_ble_mesh/mesh_core/scan.h +++ b/components/bt/esp_ble_mesh/core/scan.h @@ -10,7 +10,7 @@ #ifndef _SCAN_H_ #define _SCAN_H_ -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/settings.c b/components/bt/esp_ble_mesh/core/storage/settings.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/settings.c rename to components/bt/esp_ble_mesh/core/storage/settings.c index b93241a7726..ee18e3c6b17 100644 --- a/components/bt/esp_ble_mesh/mesh_core/settings.c +++ b/components/bt/esp_ble_mesh/core/storage/settings.c @@ -14,13 +14,13 @@ #include "access.h" #include "foundation.h" #include "proxy_server.h" -#include "cfg_srv.h" -#include "mesh_common.h" +#include "mesh/cfg_srv.h" +#include "mesh/common.h" #include "settings_nvs.h" #include "settings.h" #include "settings_uid.h" -#include "provisioner_main.h" -#include "provisioner_prov.h" +#include "pvnr_mgmt.h" +#include "prov_pvnr.h" /* BLE Mesh NVS Key and corresponding data struct. * Note: The length of nvs key must be <= 15. diff --git a/components/bt/esp_ble_mesh/mesh_core/settings.h b/components/bt/esp_ble_mesh/core/storage/settings.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_core/settings.h rename to components/bt/esp_ble_mesh/core/storage/settings.h index dd112d70dd9..ebf29132acf 100644 --- a/components/bt/esp_ble_mesh/mesh_core/settings.h +++ b/components/bt/esp_ble_mesh/core/storage/settings.h @@ -9,7 +9,7 @@ #define _SETTINGS_H_ #include "net.h" -#include "provisioner_main.h" +#include "pvnr_mgmt.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.c b/components/bt/esp_ble_mesh/core/storage/settings_nvs.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.c rename to components/bt/esp_ble_mesh/core/storage/settings_nvs.c index cd74ceb075f..155937a0767 100644 --- a/components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.c +++ b/components/bt/esp_ble_mesh/core/storage/settings_nvs.c @@ -7,7 +7,7 @@ #include #include -#include "mesh_common.h" +#include "mesh/common.h" #include "settings_uid.h" #include "settings.h" diff --git a/components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.h b/components/bt/esp_ble_mesh/core/storage/settings_nvs.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.h rename to components/bt/esp_ble_mesh/core/storage/settings_nvs.h index a82392cab61..566cbea0ccc 100644 --- a/components/bt/esp_ble_mesh/mesh_core/storage/settings_nvs.h +++ b/components/bt/esp_ble_mesh/core/storage/settings_nvs.h @@ -8,7 +8,7 @@ #define _BLE_MESH_SETTINGS_NVS_H_ #include "nvs_flash.h" -#include "mesh_buf.h" +#include "mesh/buf.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/settings_uid.c b/components/bt/esp_ble_mesh/core/storage/settings_uid.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/settings_uid.c rename to components/bt/esp_ble_mesh/core/storage/settings_uid.c index 3a475e262f2..81d9ffa61f7 100644 --- a/components/bt/esp_ble_mesh/mesh_core/settings_uid.c +++ b/components/bt/esp_ble_mesh/core/storage/settings_uid.c @@ -9,12 +9,12 @@ #include #include "mesh.h" -#include "mesh_main.h" -#include "mesh_common.h" +#include "mesh/main.h" +#include "mesh/common.h" #include "settings_nvs.h" #include "settings.h" #include "transport.h" -#include "provisioner_prov.h" +#include "prov_pvnr.h" #if CONFIG_BLE_MESH_USE_MULTIPLE_NAMESPACE /* diff --git a/components/bt/esp_ble_mesh/mesh_core/settings_uid.h b/components/bt/esp_ble_mesh/core/storage/settings_uid.h similarity index 97% rename from components/bt/esp_ble_mesh/mesh_core/settings_uid.h rename to components/bt/esp_ble_mesh/core/storage/settings_uid.h index ef7dc93bc29..cfa1f0023d3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/settings_uid.h +++ b/components/bt/esp_ble_mesh/core/storage/settings_uid.h @@ -7,7 +7,7 @@ #ifndef _SETTINGS_UID_H_ #define _SETTINGS_UID_H_ -#include "mesh_types.h" +#include "mesh/types.h" #include "settings_nvs.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/mesh_core/test.c b/components/bt/esp_ble_mesh/core/test.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/test.c rename to components/bt/esp_ble_mesh/core/test.c index 8e8cb68aa3d..233716ed4ab 100644 --- a/components/bt/esp_ble_mesh/mesh_core/test.c +++ b/components/bt/esp_ble_mesh/core/test.c @@ -17,7 +17,7 @@ #include "crypto.h" #include "access.h" #include "foundation.h" -#include "mesh_main.h" +#include "mesh/main.h" #if defined(CONFIG_BLE_MESH_SELF_TEST) diff --git a/components/bt/esp_ble_mesh/mesh_core/test.h b/components/bt/esp_ble_mesh/core/test.h similarity index 97% rename from components/bt/esp_ble_mesh/mesh_core/test.h rename to components/bt/esp_ble_mesh/core/test.h index c02947ac531..4d4e96f2fb4 100644 --- a/components/bt/esp_ble_mesh/mesh_core/test.h +++ b/components/bt/esp_ble_mesh/core/test.h @@ -10,7 +10,7 @@ #ifndef _BLE_MESH_TEST_H_ #define _BLE_MESH_TEST_H_ -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_core/transport.c b/components/bt/esp_ble_mesh/core/transport.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_core/transport.c rename to components/bt/esp_ble_mesh/core/transport.c index 7d3f45310dd..dbf5543e6b3 100644 --- a/components/bt/esp_ble_mesh/mesh_core/transport.c +++ b/components/bt/esp_ble_mesh/core/transport.c @@ -19,9 +19,9 @@ #include "foundation.h" #include "settings.h" #include "transport.h" -#include "mesh_main.h" -#include "mesh_common.h" -#include "cfg_srv.h" +#include "mesh/main.h" +#include "mesh/common.h" +#include "mesh/cfg_srv.h" /* The transport layer needs at least three buffers for itself to avoid * deadlocks. Ensure that there are a sufficient number of advertising diff --git a/components/bt/esp_ble_mesh/mesh_core/transport.h b/components/bt/esp_ble_mesh/core/transport.h similarity index 100% rename from components/bt/esp_ble_mesh/mesh_core/transport.h rename to components/bt/esp_ble_mesh/core/transport.h diff --git a/components/bt/esp_ble_mesh/mesh_models/client/client_common.c b/components/bt/esp_ble_mesh/models/client/client_common.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/client_common.c rename to components/bt/esp_ble_mesh/models/client/client_common.c index 79b0400a238..724087c059b 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/client_common.c +++ b/components/bt/esp_ble_mesh/models/client/client_common.c @@ -8,11 +8,11 @@ #include #include "mesh.h" -#include "mesh_main.h" +#include "mesh/main.h" #include "transport.h" #include "foundation.h" -#include "client_common.h" -#include "mesh_common.h" +#include "mesh/client_common.h" +#include "mesh/common.h" #define HCI_TIME_FOR_START_ADV K_MSEC(5) /* Three adv related hci commands may take 4 ~ 5ms */ diff --git a/components/bt/esp_ble_mesh/mesh_models/client/generic_client.c b/components/bt/esp_ble_mesh/models/client/generic_client.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/generic_client.c rename to components/bt/esp_ble_mesh/models/client/generic_client.c index ded6a2d06e9..1bb1ce131a4 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/generic_client.c +++ b/components/bt/esp_ble_mesh/models/client/generic_client.c @@ -9,11 +9,11 @@ #include "btc_ble_mesh_generic_model.h" -#include "mesh_config.h" -#include "model_opcode.h" +#include "mesh/config.h" +#include "mesh/model_opcode.h" #if CONFIG_BLE_MESH_GENERIC_CLIENT -#include "generic_client.h" +#include "mesh/generic_client.h" /* The followings are the macro definitions of Generic client * model message length, and a message is composed of 3 parts: diff --git a/components/bt/esp_ble_mesh/mesh_models/client/include/client_common.h b/components/bt/esp_ble_mesh/models/client/include/mesh/client_common.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/include/client_common.h rename to components/bt/esp_ble_mesh/models/client/include/mesh/client_common.h index 5d2bc64bec6..973c0053599 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/include/client_common.h +++ b/components/bt/esp_ble_mesh/models/client/include/mesh/client_common.h @@ -7,7 +7,7 @@ #ifndef _CLIENT_COMMON_H_ #define _CLIENT_COMMON_H_ -#include "mesh_access.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/client/include/generic_client.h b/components/bt/esp_ble_mesh/models/client/include/mesh/generic_client.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/include/generic_client.h rename to components/bt/esp_ble_mesh/models/client/include/mesh/generic_client.h index 1e8a45e57f0..b484ef43485 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/include/generic_client.h +++ b/components/bt/esp_ble_mesh/models/client/include/mesh/generic_client.h @@ -11,7 +11,7 @@ #ifndef _GENERIC_CLIENT_H_ #define _GENERIC_CLIENT_H_ -#include "client_common.h" +#include "mesh/client_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/client/include/lighting_client.h b/components/bt/esp_ble_mesh/models/client/include/mesh/lighting_client.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/include/lighting_client.h rename to components/bt/esp_ble_mesh/models/client/include/mesh/lighting_client.h index 4fcd7f31903..c86cbfa99f7 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/include/lighting_client.h +++ b/components/bt/esp_ble_mesh/models/client/include/mesh/lighting_client.h @@ -11,7 +11,7 @@ #ifndef _LIGHTING_CLIENT_H_ #define _LIGHTING_CLIENT_H_ -#include "client_common.h" +#include "mesh/client_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/client/include/sensor_client.h b/components/bt/esp_ble_mesh/models/client/include/mesh/sensor_client.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/include/sensor_client.h rename to components/bt/esp_ble_mesh/models/client/include/mesh/sensor_client.h index 6dfcebdfbb2..f8b0057c5b7 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/include/sensor_client.h +++ b/components/bt/esp_ble_mesh/models/client/include/mesh/sensor_client.h @@ -11,7 +11,7 @@ #ifndef _SENSOR_CLIENT_H_ #define _SENSOR_CLIENT_H_ -#include "client_common.h" +#include "mesh/client_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/client/include/time_scene_client.h b/components/bt/esp_ble_mesh/models/client/include/mesh/time_scene_client.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/include/time_scene_client.h rename to components/bt/esp_ble_mesh/models/client/include/mesh/time_scene_client.h index f7c7f5e58c4..cfb62e052b4 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/include/time_scene_client.h +++ b/components/bt/esp_ble_mesh/models/client/include/mesh/time_scene_client.h @@ -11,7 +11,7 @@ #ifndef _TIME_SCENE_CLIENT_H_ #define _TIME_SCENE_CLIENT_H_ -#include "client_common.h" +#include "mesh/client_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/client/lighting_client.c b/components/bt/esp_ble_mesh/models/client/lighting_client.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/lighting_client.c rename to components/bt/esp_ble_mesh/models/client/lighting_client.c index fc553ef2db0..b83984ecacb 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/lighting_client.c +++ b/components/bt/esp_ble_mesh/models/client/lighting_client.c @@ -9,11 +9,11 @@ #include "btc_ble_mesh_lighting_model.h" -#include "mesh_config.h" -#include "model_opcode.h" +#include "mesh/config.h" +#include "mesh/model_opcode.h" #if CONFIG_BLE_MESH_LIGHTING_CLIENT -#include "lighting_client.h" +#include "mesh/lighting_client.h" /* The followings are the macro definitions of Lighting client * model message length, and a message is composed of 3 parts: diff --git a/components/bt/esp_ble_mesh/mesh_models/client/sensor_client.c b/components/bt/esp_ble_mesh/models/client/sensor_client.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/sensor_client.c rename to components/bt/esp_ble_mesh/models/client/sensor_client.c index 0b67eb3eef3..882d9ce0a00 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/sensor_client.c +++ b/components/bt/esp_ble_mesh/models/client/sensor_client.c @@ -9,11 +9,11 @@ #include "btc_ble_mesh_sensor_model.h" -#include "mesh_config.h" -#include "model_opcode.h" +#include "mesh/config.h" +#include "mesh/model_opcode.h" #if CONFIG_BLE_MESH_SENSOR_CLI -#include "sensor_client.h" +#include "mesh/sensor_client.h" /* The followings are the macro definitions of Sensor client * model message length, and a message is composed of 3 parts: diff --git a/components/bt/esp_ble_mesh/mesh_models/client/time_scene_client.c b/components/bt/esp_ble_mesh/models/client/time_scene_client.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/client/time_scene_client.c rename to components/bt/esp_ble_mesh/models/client/time_scene_client.c index 2379adf1368..1584b5cdbec 100644 --- a/components/bt/esp_ble_mesh/mesh_models/client/time_scene_client.c +++ b/components/bt/esp_ble_mesh/models/client/time_scene_client.c @@ -9,11 +9,11 @@ #include "btc_ble_mesh_time_scene_model.h" -#include "mesh_config.h" -#include "model_opcode.h" +#include "mesh/config.h" +#include "mesh/model_opcode.h" #if CONFIG_BLE_MESH_TIME_SCENE_CLIENT -#include "time_scene_client.h" +#include "mesh/time_scene_client.h" /* The followings are the macro definitions of Time Scene client * model message length, and a message is composed of 3 parts: diff --git a/components/bt/esp_ble_mesh/mesh_models/common/device_property.c b/components/bt/esp_ble_mesh/models/common/device_property.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/common/device_property.c rename to components/bt/esp_ble_mesh/models/common/device_property.c index da6b536d70e..b28fe11b912 100644 --- a/components/bt/esp_ble_mesh/mesh_models/common/device_property.c +++ b/components/bt/esp_ble_mesh/models/common/device_property.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mesh_common.h" -#include "server_common.h" -#include "device_property.h" +#include "mesh/common.h" +#include "mesh/server_common.h" +#include "mesh/device_property.h" static struct bt_mesh_dev_prop { uint16_t prop_id; diff --git a/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h b/components/bt/esp_ble_mesh/models/common/include/mesh/device_property.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h rename to components/bt/esp_ble_mesh/models/common/include/mesh/device_property.h index 74bf76a938f..643387436b5 100644 --- a/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h +++ b/components/bt/esp_ble_mesh/models/common/include/mesh/device_property.h @@ -7,7 +7,7 @@ #ifndef _DEVICE_PROPERTY_H_ #define _DEVICE_PROPERTY_H_ -#include "mesh_types.h" +#include "mesh/types.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/common/include/model_opcode.h b/components/bt/esp_ble_mesh/models/common/include/mesh/model_opcode.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/common/include/model_opcode.h rename to components/bt/esp_ble_mesh/models/common/include/mesh/model_opcode.h index 29294a88990..9ea4f7baf43 100644 --- a/components/bt/esp_ble_mesh/mesh_models/common/include/model_opcode.h +++ b/components/bt/esp_ble_mesh/models/common/include/mesh/model_opcode.h @@ -7,7 +7,7 @@ #ifndef _MODEL_OPCODE_H_ #define _MODEL_OPCODE_H_ -#include "mesh_access.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/generic_server.c b/components/bt/esp_ble_mesh/models/server/generic_server.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/generic_server.c rename to components/bt/esp_ble_mesh/models/server/generic_server.c index 2b04265a5b2..a10e467b28f 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/generic_server.c +++ b/components/bt/esp_ble_mesh/models/server/generic_server.c @@ -10,12 +10,12 @@ #include "btc_ble_mesh_generic_model.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "access.h" #include "transport.h" -#include "model_opcode.h" -#include "state_transition.h" -#include "device_property.h" +#include "mesh/model_opcode.h" +#include "mesh/state_transition.h" +#include "mesh/device_property.h" #if CONFIG_BLE_MESH_GENERIC_SERVER diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/generic_server.h b/components/bt/esp_ble_mesh/models/server/include/mesh/generic_server.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/generic_server.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/generic_server.h index 0e79233f958..2f7ef28f91f 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/generic_server.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/generic_server.h @@ -9,7 +9,7 @@ #ifndef _GENERIC_SERVER_H_ #define _GENERIC_SERVER_H_ -#include "server_common.h" +#include "mesh/server_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/lighting_server.h b/components/bt/esp_ble_mesh/models/server/include/mesh/lighting_server.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/lighting_server.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/lighting_server.h index a3e595a4917..d6ce18ffe45 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/lighting_server.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/lighting_server.h @@ -9,7 +9,7 @@ #ifndef _LIGHTING_SERVER_H_ #define _LIGHTING_SERVER_H_ -#include "server_common.h" +#include "mesh/server_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/sensor_server.h b/components/bt/esp_ble_mesh/models/server/include/mesh/sensor_server.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/sensor_server.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/sensor_server.h index 7946f3b4faf..797b45d7175 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/sensor_server.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/sensor_server.h @@ -7,7 +7,7 @@ #ifndef _SENSOR_SERVER_H_ #define _SENSOR_SERVER_H_ -#include "server_common.h" +#include "mesh/server_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h b/components/bt/esp_ble_mesh/models/server/include/mesh/server_common.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/server_common.h index d56dcbd8433..b8bf52f2dee 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/server_common.h @@ -9,7 +9,7 @@ #include #include -#include "mesh_access.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h b/components/bt/esp_ble_mesh/models/server/include/mesh/state_binding.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/state_binding.h index 3a44f9e0010..92b777565e6 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/state_binding.h @@ -9,7 +9,7 @@ #ifndef _STATE_BINDING_H_ #define _STATE_BINDING_H_ -#include "mesh_access.h" +#include "mesh/access.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h b/components/bt/esp_ble_mesh/models/server/include/mesh/state_transition.h similarity index 95% rename from components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/state_transition.h index 86ca747b5a4..ae0bdcdaacd 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/state_transition.h @@ -9,11 +9,11 @@ #ifndef _STATE_TRANSITION_H_ #define _STATE_TRANSITION_H_ -#include "server_common.h" -#include "generic_server.h" -#include "sensor_server.h" -#include "lighting_server.h" -#include "time_scene_server.h" +#include "mesh/server_common.h" +#include "mesh/generic_server.h" +#include "mesh/sensor_server.h" +#include "mesh/lighting_server.h" +#include "mesh/time_scene_server.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h b/components/bt/esp_ble_mesh/models/server/include/mesh/time_scene_server.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h rename to components/bt/esp_ble_mesh/models/server/include/mesh/time_scene_server.h index 6728e6ff578..a351dd4fef6 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h +++ b/components/bt/esp_ble_mesh/models/server/include/mesh/time_scene_server.h @@ -7,7 +7,7 @@ #ifndef _TIME_SCENE_SERVER_H_ #define _TIME_SCENE_SERVER_H_ -#include "server_common.h" +#include "mesh/server_common.h" #ifdef __cplusplus extern "C" { diff --git a/components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c b/components/bt/esp_ble_mesh/models/server/lighting_server.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c rename to components/bt/esp_ble_mesh/models/server/lighting_server.c index f0f034e5291..57177551166 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c +++ b/components/bt/esp_ble_mesh/models/server/lighting_server.c @@ -10,12 +10,12 @@ #include "btc_ble_mesh_lighting_model.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "access.h" #include "transport.h" -#include "model_opcode.h" -#include "state_transition.h" -#include "device_property.h" +#include "mesh/model_opcode.h" +#include "mesh/state_transition.h" +#include "mesh/device_property.h" #if CONFIG_BLE_MESH_LIGHTING_SERVER diff --git a/components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c b/components/bt/esp_ble_mesh/models/server/sensor_server.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c rename to components/bt/esp_ble_mesh/models/server/sensor_server.c index e5282b5e224..0d3797cc7e3 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c +++ b/components/bt/esp_ble_mesh/models/server/sensor_server.c @@ -8,12 +8,12 @@ #include "btc_ble_mesh_sensor_model.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "access.h" #include "transport.h" -#include "model_opcode.h" -#include "state_transition.h" -#include "device_property.h" +#include "mesh/model_opcode.h" +#include "mesh/state_transition.h" +#include "mesh/device_property.h" #if CONFIG_BLE_MESH_SENSOR_SERVER diff --git a/components/bt/esp_ble_mesh/mesh_models/server/server_common.c b/components/bt/esp_ble_mesh/models/server/server_common.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_models/server/server_common.c rename to components/bt/esp_ble_mesh/models/server/server_common.c index 60f400687b2..8e7879cc4f6 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/server_common.c +++ b/components/bt/esp_ble_mesh/models/server/server_common.c @@ -7,11 +7,11 @@ #include #include "mesh.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "access.h" -#include "mesh_common.h" -#include "generic_server.h" -#include "lighting_server.h" +#include "mesh/common.h" +#include "mesh/generic_server.h" +#include "mesh/lighting_server.h" #if CONFIG_BLE_MESH_SERVER_MODEL diff --git a/components/bt/esp_ble_mesh/mesh_models/server/state_binding.c b/components/bt/esp_ble_mesh/models/server/state_binding.c similarity index 98% rename from components/bt/esp_ble_mesh/mesh_models/server/state_binding.c rename to components/bt/esp_ble_mesh/models/server/state_binding.c index 2bb1ba1950a..3896d6c2519 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/state_binding.c +++ b/components/bt/esp_ble_mesh/models/server/state_binding.c @@ -8,11 +8,11 @@ #include -#include "mesh_config.h" -#include "mesh_common.h" -#include "model_opcode.h" -#include "state_binding.h" -#include "state_transition.h" +#include "mesh/config.h" +#include "mesh/common.h" +#include "mesh/model_opcode.h" +#include "mesh/state_binding.h" +#include "mesh/state_transition.h" #if CONFIG_BLE_MESH_SERVER_MODEL diff --git a/components/bt/esp_ble_mesh/mesh_models/server/state_transition.c b/components/bt/esp_ble_mesh/models/server/state_transition.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/state_transition.c rename to components/bt/esp_ble_mesh/models/server/state_transition.c index 3a819361bc1..8a8d04e06cb 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/state_transition.c +++ b/components/bt/esp_ble_mesh/models/server/state_transition.c @@ -11,9 +11,9 @@ #include "btc_ble_mesh_time_scene_model.h" #include "btc_ble_mesh_sensor_model.h" -#include "mesh_config.h" -#include "model_opcode.h" -#include "state_transition.h" +#include "mesh/config.h" +#include "mesh/model_opcode.h" +#include "mesh/state_transition.h" #if (CONFIG_BLE_MESH_GENERIC_SERVER || \ CONFIG_BLE_MESH_TIME_SCENE_SERVER || \ diff --git a/components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c b/components/bt/esp_ble_mesh/models/server/time_scene_server.c similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c rename to components/bt/esp_ble_mesh/models/server/time_scene_server.c index 1b334383318..4166a087664 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c +++ b/components/bt/esp_ble_mesh/models/server/time_scene_server.c @@ -8,11 +8,11 @@ #include "btc_ble_mesh_time_scene_model.h" -#include "mesh_config.h" +#include "mesh/config.h" #include "access.h" #include "transport.h" -#include "model_opcode.h" -#include "state_transition.h" +#include "mesh/model_opcode.h" +#include "mesh/state_transition.h" #if CONFIG_BLE_MESH_TIME_SCENE_SERVER diff --git a/docs/en/api-guides/esp-ble-mesh/ble-mesh-architecture.rst b/docs/en/api-guides/esp-ble-mesh/ble-mesh-architecture.rst index 2606706c9cb..ec04f47bb9a 100644 --- a/docs/en/api-guides/esp-ble-mesh/ble-mesh-architecture.rst +++ b/docs/en/api-guides/esp-ble-mesh/ble-mesh-architecture.rst @@ -238,13 +238,13 @@ The list of files and the functions implemented in each file in ``Mesh Networkin * - File - Functionality - * - :component_file:`access.c ` + * - :component_file:`access.c ` - ESP-BLE-MESH Access Layer - * - :component_file:`transport.c ` + * - :component_file:`transport.c ` - ESP-BLE-MESH Lower/Upper Transport Layer - * - :component_file:`net.c ` + * - :component_file:`net.c ` - ESP-BLE-MESH Network Layer - * - :component_file:`adv.c ` + * - :component_file:`adv.c ` - A task used to send ESP-BLE-MESH advertising packets, a callback used to handle received advertising packets and APIs used to allocate adv buffers 2.1.2 Mesh Provisioning Implementation @@ -260,11 +260,11 @@ Specific files that provide implementation of provisioning of Node are shown in * - File - Functionality - * - :component_file:`prov.c ` + * - :component_file:`prov_node.c ` - ESP-BLE-MESH Node provisioning (PB-ADV & PB-GATT) - * - :component_file:`proxy_server.c ` + * - :component_file:`proxy_server.c ` - ESP-BLE-MESH Proxy Server related functionalities - * - :component_file:`beacon.c ` + * - :component_file:`beacon.c ` - APIs used to handle ESP-BLE-MESH Beacons Specific files that implement functions of Provisioner are shown in Table 2.3: @@ -275,11 +275,11 @@ Specific files that implement functions of Provisioner are shown in Table 2.3: * - File - Functionality - * - :component_file:`provisioner_prov.c ` + * - :component_file:`prov_pvnr.c ` - ESP-BLE-MESH Provisioner provisioning (PB-ADV & PB-GATT) - * - :component_file:`proxy_client.c ` + * - :component_file:`proxy_client.c ` - ESP-BLE-MESH Proxy Client related functionalities - * - :component_file:`provisioner_main.c ` + * - :component_file:`pvnr_mgmt.c ` - ESP-BLE-MESH Provisioner networking related functionalities 2.1.3 Mesh Models Implementation @@ -293,37 +293,37 @@ Mesh Models are used to implement the specific functions of model in nodes. Serv * - File - Functionality - * - :component_file:`cfg_cli.c ` + * - :component_file:`cfg_cli.c ` - Send Configuration Client messages and receive corresponding response messages - * - :component_file:`cfg_srv.c ` + * - :component_file:`cfg_srv.c ` - Receive Configuration Client messages and send proper response messages - * - :component_file:`health_cli.c ` + * - :component_file:`health_cli.c ` - Send Health Client messages and receive corresponding response messages - * - :component_file:`health_srv.c ` + * - :component_file:`health_srv.c ` - Receive Health Client messages and send proper response messages - * - :component_file:`client_common.c ` + * - :component_file:`client_common.c ` - ESP-BLE-MESH model related operations - * - :component_file:`generic_client.c ` + * - :component_file:`generic_client.c ` - Send ESP-BLE-MESH Generic Client messages and receive corresponding response messages - * - :component_file:`lighting_client.c ` + * - :component_file:`lighting_client.c ` - Send ESP-BLE-MESH Lighting Client messages and receive corresponding response messages - * - :component_file:`sensor_client.c ` + * - :component_file:`sensor_client.c ` - Send ESP-BLE-MESH Sensor Client messages and receive corresponding response messages - * - :component_file:`time_scene_client.c ` + * - :component_file:`time_scene_client.c ` - Send ESP-BLE-MESH Time Scene Client messages and receive corresponding response messages - * - :component_file:`generic_server.c ` + * - :component_file:`generic_server.c ` - Receive ESP-BLE-MESH Generic Client messages and send corresponding response messages - * - :component_file:`lighting_server.c ` + * - :component_file:`lighting_server.c ` - Receive ESP-BLE-MESH Lighting Client messages and send corresponding response messages - * - :component_file:`sensor_server.c ` + * - :component_file:`sensor_server.c ` - Receive ESP-BLE-MESH Sensor Client messages and send corresponding response messages - * - :component_file:`time_scene_server.c ` + * - :component_file:`time_scene_server.c ` - Receive ESP-BLE-MESH Time Scene Client messages and send corresponding response messages 2.2 Mesh Bearers Implementation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Portability is fully considered in the implementation of Mesh Bearers. When the ESP-BLE-MESH protocol stack is being ported to other platforms, users only need to modify :component_file:`mesh_bearer_adapt.c ` (example of :component_file:`NimBLE version `). +Portability is fully considered in the implementation of Mesh Bearers. When the ESP-BLE-MESH protocol stack is being ported to other platforms, users only need to modify :component_file:`adapter.c ` (example of :component_file:`NimBLE version `). .. list-table:: Table 2.5 Mesh Bearers File Description :widths: 40 150 @@ -331,12 +331,12 @@ Portability is fully considered in the implementation of Mesh Bearers. When the * - File - Functionality - * - :component_file:`mesh_bearer_adapt.c ` + * - :component_file:`adapter.c ` - ESP-BLE-MESH Bearer Layer adapter，This file provides the interfaces used to receive and send ESP-BLE-MESH ADV & GATT related packets. .. note:: - :component_file:`mesh_bearer_adapt.c ` is the implementation of ``Advertising Bearer`` and ``GATT Bearer`` in Mesh Networking framework. + :component_file:`adapter.c ` is the implementation of ``Advertising Bearer`` and ``GATT Bearer`` in Mesh Networking framework. 2.3 Mesh Applications Implementation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -380,17 +380,17 @@ When adopting the design of independent module, the two main factors should be c * - File - Functionality - * - :component_file:`lpn.c ` + * - :component_file:`lpn.c ` - ESP-BLE-MESH Low Power functionality - * - :component_file:`friend.c ` + * - :component_file:`friend.c ` - ESP-BLE-MESH Friend functionality - * - :component_file:`net.c ` + * - :component_file:`net.c ` - ESP-BLE-MESH Relay feature, network creation, IV Update procedure, IV Index recovery procedure, Key Refresh procedure related functionalities - * - :component_file:`proxy_server.c ` + * - :component_file:`proxy_server.c ` - ESP-BLE-MESH Proxy Server related functionalities - * - :component_file:`proxy_client.c ` + * - :component_file:`proxy_client.c ` - ESP-BLE-MESH Proxy Client related functionalities - * - :component_file:`settings.c ` + * - :component_file:`settings.c ` - ESP-BLE-MESH NVS storage functionality - * - :component_file:`main.c ` + * - :component_file:`main.c ` - ESP-BLE-MESH stack initialize, stack enable, node removal related functionalities diff --git a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-architecture.rst b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-architecture.rst index 3af7a5a3c8d..90281f0e670 100644 --- a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-architecture.rst +++ b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-architecture.rst @@ -238,13 +238,13 @@ ESP-BLE-MESH 架构采用分层的方式进行设计，数据包的处理所经 * - 文件 - 功能 - * - :component_file:`access.c ` + * - :component_file:`access.c ` - ESP-BLE-MESH 接入层 - * - :component_file:`transport.c ` + * - :component_file:`transport.c ` - ESP-BLE-MESH 底层/上层传输层 - * - :component_file:`net.c ` + * - :component_file:`net.c ` - ESP-BLE-MESH 网络层 - * - :component_file:`adv.c ` + * - :component_file:`adv.c ` - 用于发送 ESP-BLE-MESH 广播包的任务，一个用于处理收到的广播包的回调以及用于分配 adv 缓冲区的 API 2.1.2 Mesh Provisioning 实现 @@ -260,11 +260,11 @@ ESP-BLE-MESH 架构采用分层的方式进行设计，数据包的处理所经 * - 文件 - 功能 - * - :component_file:`prov.c ` + * - :component_file:`prov_node.c ` - ESP-BLE-MESH 节点配网 (PB-ADV & PB-GATT) - * - :component_file:`proxy_server.c ` + * - :component_file:`proxy_server.c ` - ESP-BLE-MESH 节点代理服务器相关功能 - * - :component_file:`beacon.c ` + * - :component_file:`beacon.c ` - 用于处理 ESP-BLE-MESH Beacon 的 API 实现 Provisioner 配置功能的特定文件如表 2.3 所示： @@ -275,11 +275,11 @@ ESP-BLE-MESH 架构采用分层的方式进行设计，数据包的处理所经 * - 文件 - 功能 - * - :component_file:`provisioner_prov.c ` + * - :component_file:`prov_pvnr.c ` - ESP-BLE-MESH Provisioner 配置入网 (PB-ADV & PB-GATT) - * - :component_file:`proxy_client.c ` + * - :component_file:`proxy_client.c ` - ESP-BLE-MESH 代理客户端相关功能 - * - :component_file:`provisioner_main.c ` + * - :component_file:`pvnr_mgmt.c ` - ESP-BLE-MESH Provisioner 网络相关功能 2.1.3 Mesh Models 实现 @@ -293,37 +293,37 @@ Mesh Models 用于实现节点中所包含的模型的具体功能。服务器 * - 文件 - 功能 - * - :component_file:`cfg_cli.c ` + * - :component_file:`cfg_cli.c ` - 发送 Configuration Client 消息，接收相应应答消息 - * - :component_file:`cfg_srv.c ` + * - :component_file:`cfg_srv.c ` - 接收 Configuration Client 消息，发送适当应答消息 - * - :component_file:`health_cli.c ` + * - :component_file:`health_cli.c ` - 发送 Health Client 消息，接收相应应答消息 - * - :component_file:`health_srv.c ` + * - :component_file:`health_srv.c ` - 接收 Health Client 消息，发送适当应答消息 - * - :component_file:`client_common.c ` + * - :component_file:`client_common.c ` - ESP-BLE-MESH 模型相关操作 - * - :component_file:`generic_client.c ` + * - :component_file:`generic_client.c ` - 发送 ESP-BLE-MESH Generic Client 消息，接收相应应答消息 - * - :component_file:`lighting_client.c ` + * - :component_file:`lighting_client.c ` - 发送 ESP-BLE-MESH Lighting Client 消息，接收相应应答消息 - * - :component_file:`sensor_client.c ` + * - :component_file:`sensor_client.c ` - 发送 ESP-BLE-MESH Sensor Client 消息，接收相应应答消息 - * - :component_file:`time_scene_client.c ` + * - :component_file:`time_scene_client.c ` - 发送 ESP-BLE-MESH Time Scene Client 消息，接收相应应答消息 - * - :component_file:`generic_server.c ` + * - :component_file:`generic_server.c ` - 发送 ESP-BLE-MESH Generic Client 消息，发送相应应答消息 - * - :component_file:`lighting_server.c ` + * - :component_file:`lighting_server.c ` - 接收 ESP-BLE-MESH Lighting Client 消息，发送相应应答消息 - * - :component_file:`sensor_server.c ` + * - :component_file:`sensor_server.c ` - 接收 ESP-BLE-MESH Sensor Client 消息，发送相应应答消息 - * - :component_file:`time_scene_server.c ` + * - :component_file:`time_scene_server.c ` - 接收 ESP-BLE-MESH Time Scene Client 消息，发送相应应答消息 2.2 Mesh Bearers 实现 ^^^^^^^^^^^^^^^^^^^^^ -Mesh Bearers 在实现时充分考虑了可移植性。当 ESP-BLE-MESH 协议栈需要移植到其它平台时，用户只需要修改 :component_file:`mesh_bearer_adapt.c ` 就能移植成功。 +Mesh Bearers 在实现时充分考虑了可移植性。当 ESP-BLE-MESH 协议栈需要移植到其它平台时，用户只需要修改 :component_file:`adapter.c ` 就能移植成功。 .. list-table:: 表 2.5 Mesh Bearers 文件描述 :widths: 40 150 @@ -331,12 +331,12 @@ Mesh Bearers 在实现时充分考虑了可移植性。当 ESP-BLE-MESH 协议 * - 文件 - 功能 - * - :component_file:`mesh_bearer_adapt.c ` + * - :component_file:`adapter.c ` - ESP-BLE-MESH 承载层适配文件。此文件提供用于接收和发送 ESP-BLE-MESH ADV 和 GATT 相关数据包的接口。 .. note:: - :component_file:`mesh_bearer_adapt.c ` 是对 Mesh 网络框架中 ``Advertising Bearer`` 和 ``GATT Bearer`` 的实现。 + :component_file:`adapter.c ` 是对 Mesh 网络框架中 ``Advertising Bearer`` 和 ``GATT Bearer`` 的实现。 2.3 Mesh Applications 实现 ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -380,17 +380,17 @@ Mesh Bearers 在实现时充分考虑了可移植性。当 ESP-BLE-MESH 协议 * - 文件 - 功能 - * - :component_file:`lpn.c ` + * - :component_file:`lpn.c ` - ESP-BLE-MESH 低功耗功能 - * - :component_file:`friend.c ` + * - :component_file:`friend.c ` - ESP-BLE-MESH 好友功能 - * - :component_file:`net.c ` + * - :component_file:`net.c ` - ESP-BLE-MESH 中继功能、网络创建、网络索引更新程序、网络索引恢复程序、秘钥更新程序相关功能 - * - :component_file:`proxy_server.c ` + * - :component_file:`proxy_server.c ` - ESP-BLE-MESH 代理服务器相关功能 - * - :component_file:`proxy_client.c ` + * - :component_file:`proxy_client.c ` - ESP-BLE-MESH 代理客户端相关功能 - * - :component_file:`settings.c ` + * - :component_file:`settings.c ` - ESP-BLE-MESH NVS 存储器功能 - * - :component_file:`main.c ` + * - :component_file:`main.c ` - ESP-BLE-MESH 协议栈初始化，协议栈使能，节点移除相关功能 diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/include/genie_slist.h b/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/include/genie_slist.h index 38edb5deffb..d31d3bd433b 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/include/genie_slist.h +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/include/genie_slist.h @@ -19,7 +19,7 @@ #include #include -#include "mesh_util.h" +#include "mesh/utils.h" #ifdef __cplusplus extern "C" { diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.h b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.h index a8b9265d65a..d45325f4486 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.h +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.h @@ -26,7 +26,7 @@ #include "freertos/task.h" #include "freertos/queue.h" -#include "mesh_util.h" +#include "mesh/utils.h" #define PARAM_MAX 7 #define SYNC_TIMEOUT 500000 //500ms diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_cmd.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_cmd.c index 0673794aceb..ed1b535b96d 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_cmd.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_cmd.c @@ -25,7 +25,7 @@ /* We include the internal header file mesh_bearer_adapt.h here just for some specific test purpose, which is not recommended for the other applications. */ -#include "mesh_bearer_adapt.h" +#include "mesh/adapter.h" typedef struct { struct arg_str *static_val; diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 2fb4ddef57a..fcff60d3129 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -24,36 +24,36 @@ components/bt/common/osi/list.c components/bt/common/osi/mutex.c components/bt/common/osi/semaphore.c components/bt/common/osi/thread.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c -components/bt/esp_ble_mesh/mesh_common/tinycrypt/src/utils.c +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/aes.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cbc_mode.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ccm_mode.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/cmac_mode.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/constants.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_mode.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ctr_prng.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dh.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_dsa.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/ecc_platform_specific.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/hmac_prng.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/sha256.h +components/bt/esp_ble_mesh/common/tinycrypt/include/tinycrypt/utils.h +components/bt/esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c +components/bt/esp_ble_mesh/common/tinycrypt/src/aes_encrypt.c +components/bt/esp_ble_mesh/common/tinycrypt/src/cbc_mode.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ccm_mode.c +components/bt/esp_ble_mesh/common/tinycrypt/src/cmac_mode.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_mode.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ctr_prng.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ecc.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dh.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_dsa.c +components/bt/esp_ble_mesh/common/tinycrypt/src/ecc_platform_specific.c +components/bt/esp_ble_mesh/common/tinycrypt/src/hmac.c +components/bt/esp_ble_mesh/common/tinycrypt/src/hmac_prng.c +components/bt/esp_ble_mesh/common/tinycrypt/src/sha256.c +components/bt/esp_ble_mesh/common/tinycrypt/src/utils.c components/bt/host/bluedroid/bta/ar/bta_ar.c components/bt/host/bluedroid/bta/ar/include/bta_ar_int.h components/bt/host/bluedroid/bta/av/bta_av_aact.c From 0e63bfcddcf330656a9a2dc9e1884f01761f1922 Mon Sep 17 00:00:00 2001 From: Liu Linyan Date: Sat, 26 Aug 2023 17:00:37 +0800 Subject: [PATCH 2/4] feat(ble_mesh): Remove ble_mesh_console example --- .../esp-ble-mesh/ble-mesh-feature-list.rst | 2 - .../esp-ble-mesh/ble-mesh-index.rst | 2 - .../esp-ble-mesh/ble-mesh-index.rst | 2 - examples/bluetooth/esp_ble_mesh/README.md | 4 - .../ble_mesh_console/CMakeLists.txt | 8 - .../esp_ble_mesh/ble_mesh_console/README.md | 12 - .../ble_mesh_commands_README.md | 166 --- .../ble_mesh_console/main/CMakeLists.txt | 15 - .../ble_mesh_console/main/ble_mesh_adapter.c | 366 ------ .../ble_mesh_console/main/ble_mesh_adapter.h | 128 -- .../main/ble_mesh_console_decl.h | 40 - .../main/ble_mesh_console_lib.c | 124 -- .../main/ble_mesh_console_lib.h | 28 - .../main/ble_mesh_console_main.c | 89 -- .../main/ble_mesh_console_system.c | 73 -- .../ble_mesh_console/main/ble_mesh_model.c | 117 -- .../ble_mesh_console/main/ble_mesh_model.h | 86 -- .../main/ble_mesh_reg_cfg_client_cmd.c | 405 ------ .../main/ble_mesh_reg_gen_onoff_client_cmd.c | 243 ---- .../main/ble_mesh_reg_test_perf_client_cmd.c | 325 ----- .../main/ble_mesh_register_cmd.c | 1098 ----------------- .../main/ble_mesh_register_server_cmd.c | 124 -- .../main/register_bluetooth.c | 78 -- .../ble_mesh_console/main/transaction.c | 267 ---- .../ble_mesh_console/main/transaction.h | 94 -- .../ble_mesh_console/partitions.csv | 4 - .../ble_mesh_console/sdkconfig.ci.bluedroid | 32 - .../ble_mesh_console/sdkconfig.ci.nimble | 32 - .../ble_mesh_console/sdkconfig.defaults | 33 - .../sdkconfig.defaults.esp32c3 | 27 - .../sdkconfig.defaults.esp32c6 | 30 - .../sdkconfig.defaults.esp32h2 | 30 - .../sdkconfig.defaults.esp32s3 | 27 - 33 files changed, 4111 deletions(-) delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/CMakeLists.txt delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/README.md delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_commands_README.md delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/CMakeLists.txt delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.h delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_decl.h delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_lib.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_lib.h delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_main.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_model.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_model.h delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_reg_cfg_client_cmd.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_reg_gen_onoff_client_cmd.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_reg_test_perf_client_cmd.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_cmd.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_server_cmd.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/register_bluetooth.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/transaction.c delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/transaction.h delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/partitions.csv delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.ci.bluedroid delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.ci.nimble delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3 delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c6 delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32h2 delete mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3 diff --git a/docs/en/api-guides/esp-ble-mesh/ble-mesh-feature-list.rst b/docs/en/api-guides/esp-ble-mesh/ble-mesh-feature-list.rst index 017af20fa4f..85a81eec8d1 100644 --- a/docs/en/api-guides/esp-ble-mesh/ble-mesh-feature-list.rst +++ b/docs/en/api-guides/esp-ble-mesh/ble-mesh-feature-list.rst @@ -128,8 +128,6 @@ Mesh Applications * :example_file:`Tutorial ` * :example:`Example ` * `Demo Video `__ -* ESP-BLE-MESH Console Commands - * :example:`Example ` Future Release Features diff --git a/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst b/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst index ff93a7abcc6..22d4f67865b 100644 --- a/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst +++ b/docs/en/api-guides/esp-ble-mesh/ble-mesh-index.rst @@ -223,8 +223,6 @@ ESP-BLE-MESH Examples * :example_file:`ESP-BLE-MESH and Wi-Fi Coexistence ` - an example that demonstrates the Wi-Fi and Bluetooth (BLE/BR/EDR) coexistence feature of {IDF_TARGET_NAME}. Simply put, users can use the Wi-Fi while operating Bluetooth, see :example:`example code `. -* ESP-BLE-MESH Console - an example that implements BLE Mesh basic features. Within this example a node can be scanned and provisioned by Provisioner and reply to get/set message from Provisioner, see :example:`example node code `. - .. _esp-ble-mesh-demo-videos: diff --git a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst index 903ef812344..081b8360209 100644 --- a/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst +++ b/docs/zh_CN/api-guides/esp-ble-mesh/ble-mesh-index.rst @@ -223,8 +223,6 @@ ESP-BLE-MESH 示例 * :example_file:`Wi-Fi 和 ESP-BLE-MESH 共存 ` - 该示例用于演示 Wi-Fi 和 ESP-BLE-MESH 共存的功能。简而言之，用户可在运行 ESP-BLE-MESH 时使用 Wi-Fi，示例请见 :example:`example code `。 -* ESP-BLE-MESH 节点控制台 - 该演示实现 ESP-BLE-MESH 节点的基本功能。在演示中，Provisioner and Node 可以扫描、验证节点，节点可以回复 Provisioner 的获取/设置消息，示例请见：:example:`example code `。 - .. _esp-ble-mesh-demo-videos: diff --git a/examples/bluetooth/esp_ble_mesh/README.md b/examples/bluetooth/esp_ble_mesh/README.md index 8da08e5f984..64577c2523e 100644 --- a/examples/bluetooth/esp_ble_mesh/README.md +++ b/examples/bluetooth/esp_ble_mesh/README.md @@ -10,10 +10,6 @@ Note: To use examples in this directory, you need to have Bluetooth enabled in c This directory includes examples to demonstrate ESP-BLE-MESH functionality based on [Zephyr Bluetooth Mesh stack](https://github.com/zephyrproject-rtos/zephyr/tree/master/subsys/bluetooth/mesh). -## ble_mesh_console - -This example demonstrates how ESP-BLE-MESH uses Console for message transmitting/receiving tests. - ## ble_mesh_fast_provision This example illustrates the solution of ESP-BLE-MESH Fast Provisioning. diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/CMakeLists.txt deleted file mode 100644 index 75804879edd..00000000000 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# The following lines of boilerplate have to be in your project's CMakeLists -# in this exact order for cmake to work correctly -cmake_minimum_required(VERSION 3.16) - -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - -include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(ble_mesh_console) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/README.md deleted file mode 100644 index 06837113659..00000000000 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/README.md +++ /dev/null @@ -1,12 +0,0 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | - -# ble mesh node console demo -## Introduction -This demo implements ble mesh node basic features.Based on this demo, node can be scaned and proved by provisioner, reply get/set message to provisioner. - -Demo steps: -1. Build the ble mesh node console demo with sdkconfig.default -2. register node and set oob info, load model to init ble mesh node -3. enable bearer, so that it can be scaned and provisioned by provisioner - diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_commands_README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_commands_README.md deleted file mode 100644 index b9277422ad3..00000000000 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_commands_README.md +++ /dev/null @@ -1,166 +0,0 @@ -# The Document of ESP32 BLE_MESH Commands - -## Overall Command - - -* `bmreg`: Provisioner/node register callback - * Example: `bmreg` - * Result: `Bm:Reg,OK` - -* `bminit`: Provisioner/node initialize - * `-m`: `mesh modle` - * Example: `bminit -m 0x0001` - * Result: `Bm:Init,OK` - -* `bmpbind`: Provisioner binds Appkey with local model - * `-a`: `:appkey index` - * `-e`: `：element address` - * `-n`: `:network index` - * `-m`: `:model id` - * `-c`: `:company id` - * Example: `bmpbind -a 0 -e 0x01 -m 0x1001 -n 0x00` - * Result: `provisioning:AppKeyBind,OK` - -* `bmpdev`: Provisioner add/delete unprovisioned device - * `-z`: `action type ` - * `-d`: `device address` - * `-u`: `device uuid` - * `-a`: `address type` - * `-f`: `address flag` - * `-b`: `used bearer` - * `-o`: `oob information` - * Example: `bmpdev -z add -d bt_mac -b -1 -a 0` - * Result: `provisioner:DevAdd/Del,OK` - -* `bmoob`: Provisioner/node config OOB parameters - * `-s`: `Static OOB value` - * `-l`: `Static OOB value length` - * `-x`: `Maximum size of Output OOB` - * `-o`: `Supported Output OOB Actions` - * `-y`: `Maximum size of Input OOB` - * `-i`: `Supported Input OOB Actions` - * `-p`: `start address assigned by provisioner` - * Example: `bmoob -o -0 -x 0` - * Result: `OOB:Load,OK` - -* `bmpbearer`: Enable/disable provisioner different bearer - * `-b`: `bearer supported` - * `-e`: `enable or disable bearer` - * Example: `bmpbearer -b 1 -e 1` - * Result: `provisioner:EnBearer,OK` - -* `bmnbearer`: Enable/disable node different bearer - * `-b`: `bearer supported` - * `-e`: `enable or disable bearer` - * Example: `bmnbearer -b 1 -e 1` - * Result: `Node:EnBearer,OK` - -* `bmpkey`: Add/Delete NetKey and AppKey of Provisioner - * `-z`: `:add app key or network key` - * `-n`: `:network key index` - * `-k`: `:appkey or network` - * `-a`: `:appkey index` - * Example: `bmpkey -z netkey -n 1 -k ` - * Result: `provisioner:NetKeyAdd,OK` - -* `bmccm`: BLE Mesh configuration client model operations - * `-z`: `:action type`:add or del client model - * `-x`: `:set state` - * `-o`: `:message opcode` - * `-u`: `
:unicast address` - * `-n`: `:net work index` - * `-i`: `:appkey index` - * `-r`: `:relay statue` - * `-t`: `:relay transmit` - * `-c`: `:company id` - * `-v`: `:value` - * `-a`: `
:address` - * `-m`: `:model id` - * Example: `bmccm -z reg` - * Result: `ConfigClient:OK` - -* `bmgocm`: BLE Mesh onoff client model operations - * `-z`: `:action type`: on or off client model - * `-o`: `:message opcode` - * `-u`: `
:unicast address` - * `-n`: `:network key index` - * `-a`: `:appkey index` - * `-r`: `:role` - * `-t`: `