nimble/controller: bsnbranch merge into bluetooth5

By default, strict connection scheduling should be off in the
controller syscfg. It is turned on for the bsncent app. Fixed
a merge error when checking for next scheduled connection
time when strict scheduling is defined.

X-Original-Commit: bac7ee6576b7aa2483a98408f7981ab5cd9545af

nimble/controller/src/ble_ll_conn.c

@@ -897,6 +897,10 @@ ble_ll_conn_continue_rx_encrypt(void *arg)
 static uint32_t
 ble_ll_conn_get_next_sched_time(struct ble_ll_conn_sm *connsm)
 {
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    uint32_t ce_end;
+    ce_end = connsm->ce_end_time;
+#else
     uint32_t ce_end;
     uint32_t next_sched_time;
 
@@ -913,6 +917,7 @@ ble_ll_conn_get_next_sched_time(struct ble_ll_conn_sm *connsm)
             ce_end = next_sched_time;
         }
     }
+#endif
 
     return ce_end;
 }

nimble/controller/syscfg.yml

@@ -155,7 +155,7 @@ syscfg.defs:
             time intervals called periods. If set to 0, the scheduler is not forced
             to do this. If set to 1, the scheduler will only schedule connections at
             period boundaries. See comments in ble_ll_sched.h for more details.
-        value: '1'
+        value: '0'
 
     BLE_LL_ADD_STRICT_SCHED_PERIODS:
         description: >