From 48e61955063469a1aa76dc10da98f9c741051d30 Mon Sep 17 00:00:00 2001 From: lly Date: Mon, 2 Mar 2020 18:14:54 +0800 Subject: [PATCH] ble_mesh: Rename ble_mesh_vendor_models to common_vendor_models --- .../ble_mesh_fast_prov_client/CMakeLists.txt | 2 +- .../ble_mesh_fast_provision/ble_mesh_fast_prov_client/Makefile | 2 +- .../ble_mesh_fast_prov_server/CMakeLists.txt | 2 +- .../ble_mesh_fast_provision/ble_mesh_fast_prov_server/Makefile | 2 +- .../bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt | 2 +- examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile | 2 +- .../fast_prov_vendor_model/CMakeLists.txt | 0 .../fast_prov_vendor_model/Makefile | 0 .../fast_prov_vendor_model/components/CMakeLists.txt | 0 .../fast_prov_vendor_model/components/component.mk | 0 .../components/esp_fast_prov_client_model.c | 0 .../components/esp_fast_prov_client_model.h | 0 .../fast_prov_vendor_model/components/esp_fast_prov_common.h | 0 .../fast_prov_vendor_model/components/esp_fast_prov_operation.c | 0 .../fast_prov_vendor_model/components/esp_fast_prov_operation.h | 0 .../components/esp_fast_prov_server_model.c | 0 .../components/esp_fast_prov_server_model.h | 0 .../fast_prov_vendor_model/main/CMakeLists.txt | 0 .../fast_prov_vendor_model/main/component.mk | 0 .../fast_prov_vendor_model/main/main.c | 0 .../fast_prov_vendor_model/sdkconfig.defaults | 0 21 files changed, 6 insertions(+), 6 deletions(-) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/CMakeLists.txt (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/Makefile (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/CMakeLists.txt (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/component.mk (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_client_model.c (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_client_model.h (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_common.h (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_operation.c (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_operation.h (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_server_model.c (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/components/esp_fast_prov_server_model.h (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/main/CMakeLists.txt (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/main/component.mk (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/main/main.c (100%) rename examples/bluetooth/esp_ble_mesh/{ble_mesh_vendor_models => common_vendor_models}/fast_prov_vendor_model/sdkconfig.defaults (100%) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt index fb8272bf3..a6d283cdf 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt @@ -2,7 +2,7 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components) +set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(SUPPORTED_TARGETS esp32) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/Makefile index 9aff276e2..d6537805f 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := ble_mesh_fast_prov_client COMPONENT_ADD_INCLUDEDIRS := components/include -EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components +EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components include $(IDF_PATH)/make/project.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt index b16b01c88..06fb4f746 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt @@ -2,7 +2,7 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components) +set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(SUPPORTED_TARGETS esp32) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/Makefile index 31160373f..07484a570 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := ble_mesh_fast_prov_server COMPONENT_ADD_INCLUDEDIRS := components/include -EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components +EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components include $(IDF_PATH)/make/project.mk 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 3d18ee56b..d8b0116ab 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 @@ -2,7 +2,7 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components) +set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(SUPPORTED_TARGETS esp32) 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 501e1f291..933cd0143 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := ble_mesh_wifi_coexist COMPONENT_ADD_INCLUDEDIRS := components/include -EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components +EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components include $(IDF_PATH)/make/project.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/CMakeLists.txt rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/Makefile b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/Makefile similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/Makefile rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/Makefile diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/component.mk b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/component.mk similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/component.mk rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/component.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.c diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_client_model.h diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_common.h diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.c diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_operation.h diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.c diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/esp_fast_prov_server_model.h diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/component.mk b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/component.mk similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/component.mk rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/component.mk diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/main.c b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/main.c similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/main/main.c rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/main.c diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/sdkconfig.defaults similarity index 100% rename from examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_models/fast_prov_vendor_model/sdkconfig.defaults rename to examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/sdkconfig.defaults