From ed9790f517964f930021717d0b940931da028b55 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Mon, 5 Aug 2019 23:46:53 +0200
Subject: [PATCH] chore(ble): Move BLE into own subdirectory
---
epicardium/{modules => ble}/ble.c | 3 ++-
epicardium/ble/meson.build | 4 ++++
epicardium/{modules/ble_stack_fit.c => ble/stack.c} | 0
epicardium/meson.build | 2 ++
epicardium/modules/meson.build | 2 --
5 files changed, 8 insertions(+), 3 deletions(-)
rename epicardium/{modules => ble}/ble.c (99%)
create mode 100644 epicardium/ble/meson.build
rename epicardium/{modules/ble_stack_fit.c => ble/stack.c} (100%)
diff --git a/epicardium/modules/ble.c b/epicardium/ble/ble.c
similarity index 99%
rename from epicardium/modules/ble.c
rename to epicardium/ble/ble.c
index 4f2758323..dc8664067 100644
--- a/epicardium/modules/ble.c
+++ b/epicardium/ble/ble.c
@@ -11,8 +11,9 @@
#include "util/bstream.h"
#include "att_api.h"
-#include "modules.h"
+#include "modules/modules.h"
+#include "fs_util.h"
#include "FreeRTOS.h"
#include "timers.h"
diff --git a/epicardium/ble/meson.build b/epicardium/ble/meson.build
new file mode 100644
index 000000000..0da905389
--- /dev/null
+++ b/epicardium/ble/meson.build
@@ -0,0 +1,4 @@
+ble_sources = files(
+ 'ble.c',
+ 'stack.c'
+)
diff --git a/epicardium/modules/ble_stack_fit.c b/epicardium/ble/stack.c
similarity index 100%
rename from epicardium/modules/ble_stack_fit.c
rename to epicardium/ble/stack.c
diff --git a/epicardium/meson.build b/epicardium/meson.build
index bf727f071..9b3880a81 100644
--- a/epicardium/meson.build
+++ b/epicardium/meson.build
@@ -65,6 +65,7 @@ freertos = static_library(
##########################################################################
subdir('modules/')
+subdir('ble/')
subdir('l0der/')
@@ -75,6 +76,7 @@ elf = executable(
'support.c',
module_sources,
l0der_sources,
+ ble_sources,
dependencies: [libcard10, max32665_startup_core0, maxusb, libff13, ble],
link_with: [api_dispatcher_lib, freertos],
link_whole: [max32665_startup_core0_lib, board_card10_lib, newlib_heap_lib],
diff --git a/epicardium/modules/meson.build b/epicardium/modules/meson.build
index 416ec428c..d02549569 100644
--- a/epicardium/modules/meson.build
+++ b/epicardium/modules/meson.build
@@ -10,6 +10,4 @@ module_sources = files(
'vibra.c',
'light_sensor.c',
'rtc.c',
- 'ble.c',
- 'ble_stack_fit.c'
)
--
GitLab