diff options
| author | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /src/libs/mynewt-nimble/nimble | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/libs/mynewt-nimble/nimble')
| -rw-r--r-- | src/libs/mynewt-nimble/nimble/controller/src/ble_ll.c | 1 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/mynewt-nimble/nimble/controller/src/ble_ll.c b/src/libs/mynewt-nimble/nimble/controller/src/ble_ll.c index da5d2972..996ad9c3 100644 --- a/src/libs/mynewt-nimble/nimble/controller/src/ble_ll.c +++ b/src/libs/mynewt-nimble/nimble/controller/src/ble_ll.c @@ -21,7 +21,6 @@ #include <stdlib.h> #include <assert.h> #include <string.h> -#include <sdk/components/libraries/log/nrf_log.h> #include "sysinit/sysinit.h" #include "syscfg/syscfg.h" #include "os/os.h" diff --git a/src/libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c b/src/libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c index 83730a44..2f6ce08e 100644 --- a/src/libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c +++ b/src/libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <string.h> #include <assert.h> -#include <sdk/components/libraries/log/nrf_log.h> #include "syscfg/syscfg.h" #include "os/os.h" #include "ble/xcvr.h" |