Merge branch 'master' into bluetooth5_master
Conflicts:
net/nimble/controller/src/ble_ll_ctrl.c
net/nimble/controller/src/ble_ll_sched.c
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c6003a43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c6003a43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c6003a43
Branch: refs/heads/bluetooth5
Commit: c6003a43437ee2c275fdc8f1a247e38fc0fa8962
Parents: 958bce0 dd4baa2
Author: Szymon Janc <[email protected]>
Authored: Tue May 16 10:02:24 2017 +0200
Committer: Szymon Janc <[email protected]>
Committed: Tue May 16 10:02:24 2017 +0200
----------------------------------------------------------------------
apps/bletiny/src/main.c | 4 -
apps/bletiny/src/misc.c | 2 +-
apps/sensors_test/pkg.yml | 1 +
apps/sensors_test/src/main.c | 40 +-
apps/sensors_test/syscfg.yml | 4 +
hw/bsp/nrf52840pdk/src/hal_bsp.c | 20 +
hw/bsp/nrf52dk/src/hal_bsp.c | 12 +
hw/bsp/pic32mz2048_wi-fire/include/bsp/bsp.h | 8 +
hw/bsp/pic32mz2048_wi-fire/src/hal_bsp.c | 12 +
hw/bsp/pic32mz2048_wi-fire/src/os_bsp.c | 11 +-
hw/bsp/ruuvi_tag_revb2/src/hal_bsp.c | 33 +-
.../sensors/bme280/include/bme280/bme280.h | 259 ++++
hw/drivers/sensors/bme280/pkg.yml | 32 +
hw/drivers/sensors/bme280/src/bme280.c | 1360 ++++++++++++++++++
hw/drivers/sensors/bme280/src/bme280_priv.h | 111 ++
hw/drivers/sensors/bme280/src/bme280_shell.c | 414 ++++++
hw/drivers/sensors/bme280/syscfg.yml | 41 +
.../sensors/bno055/include/bno055/bno055.h | 2 +-
hw/drivers/sensors/bno055/src/bno055.c | 42 +-
hw/drivers/sensors/tcs34725/src/tcs34725.c | 14 +-
.../pic32mz2048efg100/include/mcu/mips_hal.h | 6 +
.../pic32mz2048efg100/include/mcu/pps.h | 161 +++
.../microchip/pic32mz2048efg100/src/hal_gpio.c | 3 +-
.../microchip/pic32mz2048efg100/src/hal_uart.c | 44 +
hw/mcu/microchip/pic32mz2048efg100/src/ppc.c | 207 +++
hw/mcu/native/syscfg.yml | 21 +
hw/mcu/nordic/nrf51xxx/src/hal_spi.c | 2 +-
hw/mcu/nxp/MK64F12/src/hal_uart.c | 2 +-
hw/scripts/jlink.sh | 10 +-
hw/scripts/openocd.sh | 6 +-
hw/sensor/include/sensor/humidity.h | 45 +
hw/sensor/include/sensor/pressure.h | 45 +
hw/sensor/include/sensor/temperature.h | 45 +
hw/sensor/src/sensor_oic.c | 54 +-
hw/sensor/src/sensor_shell.c | 35 +-
hw/sensor/syscfg.yml | 8 +
kernel/os/src/arch/sim/os_arch_sim.c | 461 ------
kernel/os/src/arch/sim/os_arch_sim_gen.c | 248 ++++
kernel/os/src/arch/sim/os_arch_sim_nosig.c | 241 ++++
kernel/os/src/arch/sim/os_arch_sim_priv.h | 29 +
kernel/os/src/arch/sim/os_arch_sim_sig.c | 266 ++++
net/ip/native_sockets/src/native_sock.c | 6 +
.../controller/include/controller/ble_ll_ctrl.h | 2 +-
net/nimble/controller/src/ble_ll_conn_hci.c | 4 +-
net/nimble/controller/src/ble_ll_ctrl.c | 10 +-
net/nimble/controller/src/ble_ll_scan.c | 2 +-
net/nimble/controller/src/ble_ll_sched.c | 9 +-
net/nimble/controller/syscfg.yml | 10 +
net/nimble/host/src/ble_gap.c | 4 +-
net/nimble/host/src/ble_sm.c | 2 +-
50 files changed, 3872 insertions(+), 538 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/apps/bletiny/src/main.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/include/controller/ble_ll_ctrl.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/src/ble_ll_conn_hci.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/src/ble_ll_ctrl.c
----------------------------------------------------------------------
diff --cc net/nimble/controller/src/ble_ll_ctrl.c
index 7fa0768,8db0727..dcd72bd
--- a/net/nimble/controller/src/ble_ll_ctrl.c
+++ b/net/nimble/controller/src/ble_ll_ctrl.c
@@@ -1794,8 -1283,8 +1794,8 @@@ ble_ll_ctrl_proc_init(struct ble_ll_con
} else {
opcode = BLE_LL_CTRL_SLAVE_FEATURE_REQ;
}
-
+ memset(ctrdata, 0, BLE_LL_CTRL_FEATURE_LEN);
- ctrdata[0] = ble_ll_read_supp_features();
+ put_le32(ctrdata, ble_ll_read_supp_features());
break;
case BLE_LL_CTRL_PROC_VERSION_XCHG:
opcode = BLE_LL_CTRL_VERSION_IND;
@@@ -2152,8 -1628,8 +2152,8 @@@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_s
/* Process opcode */
rsp_opcode = BLE_ERR_MAX;
switch (opcode) {
- case BLE_LL_CTRL_CONN_UPDATE_REQ:
+ case BLE_LL_CTRL_CONN_UPDATE_IND:
- rsp_opcode = ble_ll_ctrl_rx_conn_update(connsm, dptr, rspbuf);
+ rsp_opcode = ble_ll_ctrl_rx_conn_update(connsm, dptr);
break;
case BLE_LL_CTRL_CHANNEL_MAP_REQ:
ble_ll_ctrl_rx_chanmap_req(connsm, dptr);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/src/ble_ll_scan.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/src/ble_ll_sched.c
----------------------------------------------------------------------
diff --cc net/nimble/controller/src/ble_ll_sched.c
index 5c292ae,6939a96..c7a5a95
--- a/net/nimble/controller/src/ble_ll_sched.c
+++ b/net/nimble/controller/src/ble_ll_sched.c
@@@ -375,9 -369,9 +375,10 @@@ ble_ll_sched_master_new(struct ble_ll_c
*/
dur = os_cputime_usecs_to_ticks(req_slots * BLE_LL_SCHED_USECS_PER_SLOT);
earliest_start = adv_rxend +
- os_cputime_usecs_to_ticks(BLE_LL_IFS + BLE_LL_CONN_REQ_DURATION +
+ os_cputime_usecs_to_ticks(BLE_LL_IFS +
- ble_phy_pdu_dur(BLE_CONNECT_REQ_LEN, BLE_PHY_1M) +
- BLE_LL_CONN_INITIAL_OFFSET);
++ ble_phy_pdu_dur(BLE_CONNECT_REQ_LEN,
BLE_PHY_1M) +
+ BLE_LL_CONN_INITIAL_OFFSET +
+ MYNEWT_VAL(BLE_LL_CONN_INIT_MIN_WIN_OFFSET)
* BLE_LL_CONN_TX_OFF_USECS);
earliest_end = earliest_start + dur;
itvl_t = os_cputime_usecs_to_ticks(connsm->conn_itvl *
BLE_LL_CONN_ITVL_USECS);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/controller/syscfg.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6003a43/net/nimble/host/src/ble_gap.c
----------------------------------------------------------------------
