josh/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'develop' of JF/PineTime into master

Browse Source
This commit is contained in:
JF 2021-02-07 18:11:46 +01:00 committed by Gitea
commit f534fb0356
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
project(pinetime VERSION 0.12.0 LANGUAGES C CXX ASM)
project(pinetime VERSION 0.12.1 LANGUAGES C CXX ASM)
set(NRF_TARGET "nrf52")

2
src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
View File

@ -268,8 +268,10 @@ void
npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq,
ble_npl_event_fn *ev_cb, void *ev_arg)
{
if(co->handle == NULL) {
memset(co, 0, sizeof(*co));
co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb);
}
co->evq = evq;
ble_npl_event_init(&co->ev, ev_cb, ev_arg);
}