From 675c94a9d4bc82f231a3412ce84d2c4212373460 Mon Sep 17 00:00:00 2001 From: lly Date: Fri, 16 Oct 2020 09:22:29 +0800 Subject: [PATCH] ble_mesh: stack: Introduce a new header file mesh_config.h --- .../mesh_common/include/mesh_buf.h | 2 +- .../mesh_common/include/mesh_config.h | 30 +++++++++++++++++++ .../mesh_common/include/mesh_kernel.h | 2 +- .../mesh_core/include/mesh_access.h | 2 +- .../mesh_core/include/mesh_bearer_adapt.h | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h index 4a47b1c0c6..5b77c3d398 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h @@ -11,7 +11,7 @@ #ifndef _BLE_MESH_BUF_H_ #define _BLE_MESH_BUF_H_ -#include "sdkconfig.h" +#include "mesh_config.h" #include "mesh_slist.h" #include "mesh_compiler.h" diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h new file mode 100644 index 0000000000..9aefe420cd --- /dev/null +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_config.h @@ -0,0 +1,30 @@ +// Copyright 2020-2021 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef _BLE_MESH_CONFIG_H_ +#define _BLE_MESH_CONFIG_H_ + +#include "sdkconfig.h" + +#ifdef __cplusplus +extern "C" { +#endif + + + +#ifdef __cplusplus +} +#endif + +#endif /* _BLE_MESH_CONFIG_H_ */ \ No newline at end of file diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h index 84ab518353..48c40d2595 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h @@ -13,7 +13,7 @@ #include "freertos/queue.h" #include "freertos/semphr.h" -#include "sdkconfig.h" +#include "mesh_config.h" #include "mesh_types.h" #ifdef __cplusplus diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h index 31a8bbfb56..0ee1859e30 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h @@ -11,7 +11,7 @@ #ifndef _BLE_MESH_ACCESS_H_ #define _BLE_MESH_ACCESS_H_ -#include "sdkconfig.h" +#include "mesh_config.h" #include "mesh_buf.h" #include "mesh_timer.h" diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h index 4dc18f07ff..396c862396 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h @@ -10,7 +10,7 @@ #define _BLE_MESH_BEARER_ADAPT_H_ #include -#include "sdkconfig.h" +#include "mesh_config.h" #include "mesh_types.h" #include "mesh_util.h" #include "mesh_uuid.h"