Merge branch 'develop' of JF/PineTime into master

JF002 · Gitea · commit f534fb035676 · 2021-02-07T18:11:46.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")
 
diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c b/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,10 @@ void`
`268`	`268`	`npl_freertos_callout_init(struct ble_npl_callout co, struct ble_npl_eventq evq,`
`269`	`269`	`ble_npl_event_fn ev_cb, void ev_arg)`
`270`	`270`	`{`
	`271`	`+ if(co->handle == NULL) {`
`271`	`272`	`memset(co, 0, sizeof(*co));`
`272`	`273`	`co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb);`
	`274`	`+ }`
`273`	`275`	`co->evq = evq;`
`274`	`276`	`ble_npl_event_init(&co->ev, ev_cb, ev_arg);`
`275`	`277`	`}`