From 3209336f6ba88c24b6ca0633a43a38a7007ab56b Mon Sep 17 00:00:00 2001 From: lly Date: Wed, 13 May 2020 17:45:10 +0800 Subject: [PATCH] ble_mesh: Rename esp_fast_prov_* to ble_mesh_fast_prov_* --- .../fast_prov_client/CMakeLists.txt | 2 +- .../ble_mesh_fast_provision/fast_prov_client/Makefile | 2 +- .../ble_mesh_fast_provision/fast_prov_client/main/main.c | 6 +++--- .../fast_prov_server/CMakeLists.txt | 2 +- .../ble_mesh_fast_provision/fast_prov_server/Makefile | 2 +- .../ble_mesh_fast_provision/fast_prov_server/main/board.c | 2 +- .../ble_mesh_fast_provision/fast_prov_server/main/main.c | 6 +++--- .../esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt | 2 +- .../bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile | 2 +- .../esp_ble_mesh/ble_mesh_wifi_coexist/main/board.c | 2 +- .../esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c | 6 +++--- .../fast_prov_vendor_model/CMakeLists.txt | 7 ------- .../common_components/fast_provisioning/CMakeLists.txt | 7 +++++++ .../ble_mesh_fast_prov_client_model.c} | 6 +++--- .../ble_mesh_fast_prov_client_model.h} | 6 +++--- .../ble_mesh_fast_prov_common.h} | 6 +++--- .../ble_mesh_fast_prov_operation.c} | 8 ++++---- .../ble_mesh_fast_prov_operation.h} | 8 ++++---- .../ble_mesh_fast_prov_server_model.c} | 4 ++-- .../ble_mesh_fast_prov_server_model.h} | 8 ++++---- .../component.mk | 0 21 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt create mode 100644 examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/CMakeLists.txt rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_client_model.c => fast_provisioning/ble_mesh_fast_prov_client_model.c} (99%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_client_model.h => fast_provisioning/ble_mesh_fast_prov_client_model.h} (89%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_common.h => fast_provisioning/ble_mesh_fast_prov_common.h} (97%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_operation.c => fast_provisioning/ble_mesh_fast_prov_operation.c} (99%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_operation.h => fast_provisioning/ble_mesh_fast_prov_operation.h} (93%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_server_model.c => fast_provisioning/ble_mesh_fast_prov_server_model.c} (99%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model/esp_fast_prov_server_model.h => fast_provisioning/ble_mesh_fast_prov_server_model.h} (96%) rename examples/bluetooth/esp_ble_mesh/common_components/{fast_prov_vendor_model => fast_provisioning}/component.mk (100%) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/CMakeLists.txt index b1a734236..f9c091aae 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model) + $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(fast_prov_client) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile index ef93bf5df..2f6e19a27 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile @@ -6,6 +6,6 @@ PROJECT_NAME := fast_prov_client EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \ - $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model + $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning include $(IDF_PATH)/make/project.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/main.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/main.c index 6c5a1c96b..1770ffbcb 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/main.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/main.c @@ -26,9 +26,9 @@ #include "esp_ble_mesh_config_model_api.h" #include "esp_ble_mesh_generic_model_api.h" -#include "esp_fast_prov_common.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_client_model.h" +#include "ble_mesh_fast_prov_common.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_client_model.h" #include "ble_mesh_example_init.h" #define PROV_OWN_ADDR 0x0001 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/CMakeLists.txt index acd7d6070..2690af419 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model) + $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(fast_prov_server) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile index e8c2d25b7..d34eb4ba0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile @@ -6,6 +6,6 @@ PROJECT_NAME := fast_prov_server EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \ - $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model + $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning include $(IDF_PATH)/make/project.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/board.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/board.c index 192d73067..d821fc83d 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/board.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/board.c @@ -16,7 +16,7 @@ #include "driver/gpio.h" #include "board.h" -#include "esp_fast_prov_common.h" +#include "ble_mesh_fast_prov_common.h" #define TAG "BOARD" diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/main.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/main.c index 2d8e4bae3..b5fe155ac 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/main.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/main.c @@ -27,9 +27,9 @@ #include "esp_ble_mesh_local_data_operation_api.h" #include "board.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_client_model.h" -#include "esp_fast_prov_server_model.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_client_model.h" +#include "ble_mesh_fast_prov_server_model.h" #include "ble_mesh_example_init.h" extern struct _led_state led_state[3]; diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt index ddc33a53b..c12ec0288 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model) + $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_mesh_wifi_coexist) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile index 63991ec0c..dab120fd1 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile @@ -6,6 +6,6 @@ PROJECT_NAME := ble_mesh_wifi_coexist EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \ - $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model + $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning include $(IDF_PATH)/make/project.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/board.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/board.c index 192d73067..d821fc83d 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/board.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/board.c @@ -16,7 +16,7 @@ #include "driver/gpio.h" #include "board.h" -#include "esp_fast_prov_common.h" +#include "ble_mesh_fast_prov_common.h" #define TAG "BOARD" diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c index d8aaf7043..d6b6c1f10 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/main.c @@ -39,9 +39,9 @@ #include "esp_ble_mesh_local_data_operation_api.h" #include "board.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_client_model.h" -#include "esp_fast_prov_server_model.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_client_model.h" +#include "ble_mesh_fast_prov_server_model.h" #include "ble_mesh_example_init.h" extern struct _led_state led_state[3]; diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt deleted file mode 100644 index 7a0082a2e..000000000 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(srcs "esp_fast_prov_client_model.c" - "esp_fast_prov_server_model.c" - "esp_fast_prov_operation.c") - -idf_component_register(SRCS "${srcs}" - INCLUDE_DIRS "." - REQUIRES bt) diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/CMakeLists.txt new file mode 100644 index 000000000..5da0b8585 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/CMakeLists.txt @@ -0,0 +1,7 @@ +set(srcs "ble_mesh_fast_prov_client_model.c" + "ble_mesh_fast_prov_server_model.c" + "ble_mesh_fast_prov_operation.c") + +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS "." + REQUIRES bt) diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.c similarity index 99% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.c rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.c index 89e0c2a41..da3e6c200 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.c +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.c @@ -18,9 +18,9 @@ #include "esp_ble_mesh_defs.h" #include "esp_ble_mesh_local_data_operation_api.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_client_model.h" -#include "esp_fast_prov_server_model.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_client_model.h" +#include "ble_mesh_fast_prov_server_model.h" #define TAG "FAST_PROV_CLIENT" diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.h similarity index 89% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.h rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.h index f98ba0eb1..61fe84531 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_client_model.h +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_client_model.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef _ESP_FAST_PROV_CLIENT_MODEL_H -#define _ESP_FAST_PROV_CLIENT_MODEL_H +#ifndef _BLE_MESH_FAST_PROV_CLIENT_MODEL_H_ +#define _BLE_MESH_FAST_PROV_CLIENT_MODEL_H_ #include "esp_ble_mesh_defs.h" @@ -33,4 +33,4 @@ esp_err_t example_fast_prov_client_recv_status(esp_ble_mesh_model_t *model, esp_ble_mesh_msg_ctx_t *ctx, uint16_t len, const uint8_t *data); -#endif /* _ESP_FAST_PROV_CLIENT_MODEL_H */ \ No newline at end of file +#endif /* _BLE_MESH_FAST_PROV_CLIENT_MODEL_H_ */ \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_common.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_common.h similarity index 97% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_common.h rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_common.h index 95a8ca80c..b888d6030 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_common.h +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_common.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef _ESP_FAST_PROV_COMMON_H -#define _ESP_FAST_PROV_COMMON_H +#ifndef _BLE_MESH_FAST_PROV_COMMON_H_ +#define _BLE_MESH_FAST_PROV_COMMON_H_ #include "esp_ble_mesh_defs.h" #include "esp_ble_mesh_config_model_api.h" @@ -118,4 +118,4 @@ typedef struct { uint8_t status_act; /* Indicate the result of action */ } example_fast_prov_net_key_status_t; -#endif /* _ESP_FAST_PROV_COMMON_H */ \ No newline at end of file +#endif /* _BLE_MESH_FAST_PROV_COMMON_H_ */ \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.c similarity index 99% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.c rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.c index 930baaf15..2664caeaf 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.c +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.c @@ -21,10 +21,10 @@ #include "esp_ble_mesh_generic_model_api.h" #include "esp_ble_mesh_local_data_operation_api.h" -#include "esp_fast_prov_common.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_client_model.h" -#include "esp_fast_prov_server_model.h" +#include "ble_mesh_fast_prov_common.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_client_model.h" +#include "ble_mesh_fast_prov_server_model.h" #define TAG "FAST_PROV_OP" diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.h similarity index 93% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.h rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.h index 2fcc00606..962092b2b 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_operation.h +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_operation.h @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef _ESP_FAST_PROV_OPERATION_H -#define _ESP_FAST_PROV_OPERATION_H +#ifndef _BLE_MESH_FAST_PROV_OPERATION_H_ +#define _BLE_MESH_FAST_PROV_OPERATION_H_ -#include "esp_fast_prov_common.h" +#include "ble_mesh_fast_prov_common.h" esp_err_t example_store_node_info(const uint8_t uuid[16], uint16_t node_addr, uint8_t elem_num, uint16_t net_idx, @@ -66,4 +66,4 @@ esp_err_t example_send_fast_prov_status_msg(esp_ble_mesh_model_t *model, esp_ble_mesh_msg_ctx_t *ctx, uint32_t opcode, struct net_buf_simple *msg); -#endif /* _ESP_FAST_PROV_OPERATION_H */ \ No newline at end of file +#endif /* _BLE_MESH_FAST_PROV_OPERATION_H_ */ \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.c b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.c similarity index 99% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.c rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.c index 9168aeab3..ec0ff2f4b 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.c +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.c @@ -22,8 +22,8 @@ #include "esp_ble_mesh_proxy_api.h" #include "esp_ble_mesh_config_model_api.h" -#include "esp_fast_prov_operation.h" -#include "esp_fast_prov_server_model.h" +#include "ble_mesh_fast_prov_operation.h" +#include "ble_mesh_fast_prov_server_model.h" #define TAG "FAST_PROV_SERVER" diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.h b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.h similarity index 96% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.h rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.h index ef48c01fd..39872c28c 100644 --- a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/esp_fast_prov_server_model.h +++ b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/ble_mesh_fast_prov_server_model.h @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef _ESP_FAST_PROV_SERVER_MODEL_H -#define _ESP_FAST_PROV_SERVER_MODEL_H +#ifndef _BLE_MESH_FAST_PROV_SERVER_MODEL_H_ +#define _BLE_MESH_FAST_PROV_SERVER_MODEL_H_ -#include "esp_fast_prov_common.h" +#include "ble_mesh_fast_prov_common.h" #define DISABLE_FAST_PROV_TIMEOUT K_SECONDS(10) #define GATT_PROXY_ENABLE_TIMEOUT K_SECONDS(10) @@ -99,4 +99,4 @@ esp_err_t example_handle_fast_prov_status_send_comp_evt(int err_code, uint32_t o esp_err_t example_fast_prov_server_init(esp_ble_mesh_model_t *model); -#endif /* _ESP_FAST_PROV_SERVER_MODEL_H */ \ No newline at end of file +#endif /* _BLE_MESH_FAST_PROV_SERVER_MODEL_H_ */ \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/component.mk similarity index 100% rename from examples/bluetooth/esp_ble_mesh/common_components/fast_prov_vendor_model/component.mk rename to examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/component.mk