ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-23 13:40:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update include directives.

Browse source
This commit is contained in:
h2zero 2022-04-13 20:35:56 -06:00
parent 08a3e676f8
commit 5b206b97a3
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/NimBLEMeshModel.cpp
View file

@ -10,7 +10,11 @@
#include "NimBLEUtils.h" #include "NimBLEUtils.h"
#include "NimBLELog.h" #include "NimBLELog.h"
#include "nimble/nimble_port.h" #if defined(CONFIG_NIMBLE_CPP_IDF)
# include "nimble/nimble_port.h"
#else
# include "nimble/porting/nimble/include/nimble/nimble_port.h"
#endif
#include "NimBLEDevice.h" #include "NimBLEDevice.h"

15
src/NimBLEMeshNode.cpp
View file

@ -1,20 +1,27 @@
/* /*
* NimBLEMeshNoce.cpp * NimBLEMeshNode.cpp
* *
* Created: on July 22 2020 * Created: on July 22 2020
* Author H2zero * Author H2zero
* *
*/ */
#include "sdkconfig.h" #include "nimconfig.h"
#if defined(CONFIG_BT_ENABLED) #if defined(CONFIG_BT_ENABLED)
#include "NimBLEMeshNode.h" #include "NimBLEMeshNode.h"
#include "NimBLELog.h" #include "NimBLELog.h"
#include "NimBLEDevice.h" #include "NimBLEDevice.h"
#include "services/gap/ble_svc_gap.h" #if defined(CONFIG_NIMBLE_CPP_IDF)
#include "services/gatt/ble_svc_gatt.h" # include "services/gap/ble_svc_gap.h"
# include "services/gatt/ble_svc_gatt.h"
#else
# include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
# include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
#endif
#define CID_VENDOR 0x05C3 #define CID_VENDOR 0x05C3

12
src/NimBLEMeshNode.h
View file

@ -9,14 +9,18 @@
#ifndef MAIN_NIMBLE_MESH_NODE_H_ #ifndef MAIN_NIMBLE_MESH_NODE_H_
#define MAIN_NIMBLE_MESH_NODE_H_ #define MAIN_NIMBLE_MESH_NODE_H_
#include "sdkconfig.h"
#if defined(CONFIG_BT_ENABLED)
#include "nimconfig.h" #include "nimconfig.h"
#if defined(CONFIG_BT_ENABLED)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpointer-arith" #pragma GCC diagnostic ignored "-Wpointer-arith"
#include "mesh/glue.h" #if defined(CONFIG_NIMBLE_CPP_IDF)
#include "mesh/mesh.h" # include "mesh/glue.h"
# include "mesh/mesh.h"
#else
# include "nimble/nimble/host/mesh/include/mesh/glue.h"
# include "nimble/nimble/host/mesh/include/mesh/mesh.h"
#endif
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
/**** FIX COMPILATION ****/ /**** FIX COMPILATION ****/