diff options
| author | JF <jf@codingfield.com> | 2021-09-28 18:23:12 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-09-28 18:23:12 (GMT) |
| commit | f41aaad6836ae348d1b5b084b4533b636f516b93 (patch) | |
| tree | 9de3769f86984a7b50f02dc48924ef829ca1e02f | |
| parent | 6652ec6f71967f4a8eea1f159aa500a1a21a5902 (diff) | |
| parent | e9bb0b3cdd0e1b95b7bfdcfb94db5a6a0966eed7 (diff) | |
Merge branch 'develop' of JF/PineTime into master
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec582fa..a8ecb81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pinetime VERSION 1.5.0 LANGUAGES C CXX ASM) +project(pinetime VERSION 1.6.0 LANGUAGES C CXX ASM) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 14) diff --git a/src/libs/mynewt-nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h b/src/libs/mynewt-nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h index 37b81a8..5e2d636 100644 --- a/src/libs/mynewt-nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h +++ b/src/libs/mynewt-nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h @@ -51,7 +51,7 @@ static inline void ble_ll_rfmgmt_reset(void) { } static inline void ble_ll_rfmgmt_scan_changed(bool e, uint32_t n) { } static inline void ble_ll_rfmgmt_sched_changed(struct ble_ll_sched_item *f) { } static inline void ble_ll_rfmgmt_release(void) { } -static inline uint32_t ble_ll_rfmgmt_enable_now(void) { return 0; } +static inline uint32_t ble_ll_rfmgmt_enable_now(void) { return os_cputime_get32(); } static inline bool ble_ll_rfmgmt_is_enabled(void) { return true; } #endif |