mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-03 19:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: fix compile

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-14 14:38:19 +02:00
parent 8cc6e3fb53
commit a5a7b6da93
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ble/gatt-service/mesh_provisioning_service_server.c
View File

@ -37,19 +37,19 @@
#define __BTSTACK_FILE__ "mesh_provisioning_service_server.c" #define __BTSTACK_FILE__ "mesh_provisioning_service_server.c"
#include "bluetooth.h" #include "ble/gatt-service/mesh_provisioning_service_server.h"
#include "btstack_defines.h"
#include "ble/att_db.h" #include "ble/att_db.h"
#include "ble/att_server.h" #include "ble/att_server.h"
#include "btstack_util.h" #include "bluetooth.h"
#include "bluetooth_gatt.h" #include "bluetooth_gatt.h"
#include "btstack_debug.h" #include "btstack_debug.h"
#include "l2cap.h" #include "btstack_defines.h"
#include "hci.h"
#include "btstack_event.h" #include "btstack_event.h"
#include "btstack_util.h"
#include "hci.h"
#include "ble/gatt-service/mesh_provisioning_service_server.h" #include "mesh/provisioning.h"
#include "provisioning.h"
typedef struct { typedef struct {
hci_con_handle_t con_handle; hci_con_handle_t con_handle;

1
src/ble/gatt-service/mesh_provisioning_service_server.h
View File

@ -38,6 +38,7 @@
#define __MESH_PROVISIONING_SERVICE_SERVER_H #define __MESH_PROVISIONING_SERVICE_SERVER_H
#include <stdint.h> #include <stdint.h>
#include "hci.h" #include "hci.h"
#if defined __cplusplus #if defined __cplusplus

14
src/ble/gatt-service/mesh_proxy_service_server.c
View File

@ -37,19 +37,19 @@
#define __BTSTACK_FILE__ "mesh_proxy_service_server.c" #define __BTSTACK_FILE__ "mesh_proxy_service_server.c"
#include "bluetooth.h" #include "ble/gatt-service/mesh_proxy_service_server.h"
#include "btstack_defines.h"
#include "ble/att_db.h" #include "ble/att_db.h"
#include "ble/att_server.h" #include "ble/att_server.h"
#include "btstack_util.h" #include "bluetooth.h"
#include "bluetooth_gatt.h" #include "bluetooth_gatt.h"
#include "btstack_debug.h" #include "btstack_debug.h"
#include "l2cap.h" #include "btstack_defines.h"
#include "hci.h"
#include "btstack_event.h" #include "btstack_event.h"
#include "btstack_util.h"
#include "hci.h"
#include "ble/gatt-service/mesh_proxy_service_server.h" #include "mesh/provisioning.h"
#include "provisioning.h"
typedef struct { typedef struct {
hci_con_handle_t con_handle; hci_con_handle_t con_handle;

1
src/ble/gatt-service/mesh_proxy_service_server.h
View File

@ -38,6 +38,7 @@
#define __MESH_PROXY_SERVICE_SERVER_H #define __MESH_PROXY_SERVICE_SERVER_H
#include <stdint.h> #include <stdint.h>
#include "hci.h" #include "hci.h"
#if defined __cplusplus #if defined __cplusplus

4
src/btstack_memory.h
View File

@ -76,8 +76,8 @@ extern "C" {
#ifdef ENABLE_MESH #ifdef ENABLE_MESH
#include "mesh/mesh_network.h" #include "mesh/mesh_network.h"
#include "mesh_keys.h" #include "mesh/mesh_keys.h"
#include "mesh_virtual_addresses.h" #include "mesh/mesh_virtual_addresses.h"
#endif #endif
/* API_START */ /* API_START */

4
test/mesh/CMakeLists.txt
View File

@ -28,7 +28,7 @@ file(GLOB SOURCES_LIBUSB "../../platform/libusb/*.c" "../../platform/
file(GLOB SOURCES_OFF "../../src/ble/le_device_db_memory.c" "../../src/ble/le_device_db_memory.h" "../../src/ble/le_device_db_tlv.c" "../../src/ble/le_device_db_tlv.h") file(GLOB SOURCES_OFF "../../src/ble/le_device_db_memory.c" "../../src/ble/le_device_db_memory.h" "../../src/ble/le_device_db_tlv.c" "../../src/ble/le_device_db_tlv.h")
list(REMOVE_ITEM SOURCES_BLE ${SOURCES_OFF}) list(REMOVE_ITEM SOURCES_BLE ${SOURCES_OFF})
set(SOURCES_MESH_NEW main.c mesh.c mesh_access.c mesh_access.h mesh_configuration_server.c mesh_foundation.c mesh_foundation.h mesh_keys.c mesh_keys.h mesh_virtual_addresses.c mesh_virtual_addresses.h mesh_peer.c mesh_peer.h mesh_proxy.h mesh_proxy.c provisioner.c provisioning.c provisioning.h provisioning_device.c provisioning_device.h provisioning_provisioner.c provisioning_provisioner.h mesh_generic_server.h mesh_generic_server.c mesh_iv_index_seq_number.c ) set(SOURCES_MESH_NEW main.c)
set(SOURCES set(SOURCES
${SOURCES_POSIX} ${SOURCES_POSIX}
@ -46,7 +46,7 @@ list(SORT SOURCES)
add_library(btstack STATIC ${SOURCES}) add_library(btstack STATIC ${SOURCES})
# list of targets # list of targets
set(EXAMPLES_C mesh.c) set(EXAMPLES_C mesh_pts.c)
file(GLOB EXAMPLES_GATT "*.gatt") file(GLOB EXAMPLES_GATT "*.gatt")

4
tool/btstack_memory_generator.py
View File

@ -84,8 +84,8 @@ extern "C" {
#ifdef ENABLE_MESH #ifdef ENABLE_MESH
#include "mesh/mesh_network.h" #include "mesh/mesh_network.h"
#include "mesh_keys.h" #include "mesh/mesh_keys.h"
#include "mesh_virtual_addresses.h" #include "mesh/mesh_virtual_addresses.h"
#endif #endif
/* API_START */ /* API_START */