diff options
author | JF002 <JF002@users.noreply.github.com> | 2020-12-01 21:44:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 21:44:44 +0100 |
commit | c6556bcdea7671f1c1daaa9e20c4c3d7cd5f29a4 (patch) | |
tree | 38c920cd13ed3768af2363de317ef3adf4483bd6 /src/components/ble/NimbleController.cpp | |
parent | c87de415b28710ec0f5a504fe4720402b9be5ebc (diff) | |
parent | 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 (diff) |
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
Diffstat (limited to 'src/components/ble/NimbleController.cpp')
-rw-r--r-- | src/components/ble/NimbleController.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index af7f4029..a6f3cc39 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -1,15 +1,19 @@ -#include "components/datetime/DateTimeController.h" -#include <systemtask/SystemTask.h> -#include "components/ble/NotificationManager.h" -#include <hal/nrf_rtc.h> #include "NimbleController.h" -#include "MusicService.h" -#include <services/gatt/ble_svc_gatt.h> -#include <services/gap/ble_svc_gap.h> -#include <host/util/util.h> -#include <host/ble_hs_id.h> -#include <host/ble_hs.h> +#include <hal/nrf_rtc.h> +#define min // workaround: nimble's min/max macros conflict with libstdc++ +#define max #include <host/ble_gap.h> +#include <host/ble_hs.h> +#include <host/ble_hs_id.h> +#include <host/util/util.h> +#undef max +#undef min +#include <services/gap/ble_svc_gap.h> +#include <services/gatt/ble_svc_gatt.h> +#include "components/ble/BleController.h" +#include "components/ble/NotificationManager.h" +#include "components/datetime/DateTimeController.h" +#include "systemtask/SystemTask.h" using namespace Pinetime::Controllers; |