ble_mesh: Rename esp_fast_prov_* to ble_mesh_fast_prov_*

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/components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model)
+                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_provisioning)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(fast_prov_client)

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/components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model
+                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_provisioning
 
 include $(IDF_PATH)/make/project.mk

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

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/components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model)
+                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_provisioning)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(fast_prov_server)

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/components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model
+                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_provisioning
 
 include $(IDF_PATH)/make/project.mk

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"
 

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];

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/components/example_init
-                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model)
+                         $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/components/fast_provisioning)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_mesh_wifi_coexist)

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/components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model
+                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/components/fast_provisioning
 
 include $(IDF_PATH)/make/project.mk

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"
 

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];

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/CMakeLists.txt

@@ -1,9 +0,0 @@
-set(COMPONENT_SRCS "esp_fast_prov_client_model.c"
-                   "esp_fast_prov_server_model.c"
-                   "esp_fast_prov_operation.c")
-
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-set(COMPONENT_REQUIRES bt)
-
-register_component()

examples/bluetooth/esp_ble_mesh/components/fast_provisioning/CMakeLists.txt

@@ -0,0 +1,9 @@
+set(COMPONENT_SRCS "ble_mesh_fast_prov_client_model.c"
+                   "ble_mesh_fast_prov_server_model.c"
+                   "ble_mesh_fast_prov_operation.c")
+
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+
+set(COMPONENT_REQUIRES bt)
+
+register_component()

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_client_model.c → examples/bluetooth/esp_ble_mesh/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"
 

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_client_model.h → examples/bluetooth/esp_ble_mesh/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 */
+#endif /* _BLE_MESH_FAST_PROV_CLIENT_MODEL_H_ */

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_common.h → examples/bluetooth/esp_ble_mesh/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 */
+#endif /* _BLE_MESH_FAST_PROV_COMMON_H_ */

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_operation.c → examples/bluetooth/esp_ble_mesh/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"
 

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_operation.h → examples/bluetooth/esp_ble_mesh/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 */
+#endif /* _BLE_MESH_FAST_PROV_OPERATION_H_ */

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_server_model.c → examples/bluetooth/esp_ble_mesh/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"
 

examples/bluetooth/esp_ble_mesh/components/fast_prov_vendor_model/esp_fast_prov_server_model.h → examples/bluetooth/esp_ble_mesh/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 */
+#endif /* _BLE_MESH_FAST_PROV_SERVER_MODEL_H_ */