You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2017/06/30 09:50:01 UTC
[mynewt-core] 01/01: Merge pull request #364 from
sjanc/bluetooth5_master
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch bluetooth5
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit e6b348003df1f10f575d03345e5ef4cfad675581
Merge: ae75302 ffbd4c8
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Jun 30 11:49:58 2017 +0200
Merge pull request #364 from sjanc/bluetooth5_master
merge master branch into bluetooth5
README.md | 1 +
apps/blecent/src/main.c | 17 +
apps/bleprph/pkg.yml | 2 +-
apps/bleprph/src/main.c | 17 +
apps/bleprph_oic/pkg.yml | 2 +-
apps/bleprph_oic/src/main.c | 37 +-
apps/bleprph_oic/syscfg.yml | 8 +
apps/blesplit/src/main.c | 17 +
apps/bletiny/src/main.c | 18 +
apps/bleuart/src/main.c | 17 +
apps/{bleprph_oic => btshell}/pkg.yml | 19 +-
apps/btshell/src/btshell.h | 186 ++
apps/btshell/src/cmd.c | 2516 ++++++++++++++++++
apps/btshell/src/cmd.h | 62 +
apps/btshell/src/cmd_gatt.c | 633 +++++
.../include/id/id.h => apps/btshell/src/cmd_gatt.h | 36 +-
apps/btshell/src/cmd_l2cap.c | 175 ++
.../flash_test.h => apps/btshell/src/cmd_l2cap.h | 23 +-
apps/btshell/src/gatt_svr.c | 604 +++++
apps/{bletiny => btshell}/src/main.c | 878 +++----
apps/btshell/src/misc.c | 162 ++
apps/btshell/src/parse.c | 486 ++++
{net/nimble/host/test => apps/btshell}/syscfg.yml | 26 +-
apps/sensors_test/pkg.yml | 1 +
apps/sensors_test/src/main.c | 3 +-
apps/sensors_test/syscfg.yml | 2 +-
apps/slinky/pkg.yml | 4 +
apps/slinky/src/main.c | 3 -
boot/boot_serial/src/boot_serial.c | 8 +-
boot/bootutil/src/loader.c | 16 +-
hw/bsp/nrf52-thingy/boot-nrf52xxaa.ld | 25 +
hw/bsp/nrf52-thingy/bsp.yml | 65 +
hw/bsp/nrf52-thingy/include/bsp/bsp.h | 61 +
hw/bsp/nrf52-thingy/include/bsp/cmsis_nvic.h | 29 +
hw/bsp/nrf52-thingy/nrf52-thingy_debug.cmd | 22 +
hw/bsp/nrf52-thingy/nrf52-thingy_debug.sh | 46 +
hw/bsp/nrf52-thingy/nrf52-thingy_download.cmd | 22 +
hw/bsp/nrf52-thingy/nrf52-thingy_download.sh | 40 +
hw/bsp/nrf52-thingy/nrf52-thingy_no_boot.ld | 191 ++
hw/bsp/nrf52-thingy/nrf52xxaa.ld | 25 +
hw/bsp/{ruuvi_tag_revb2 => nrf52-thingy}/pkg.yml | 23 +-
hw/bsp/nrf52-thingy/split-nrf52-thingy.ld | 208 ++
.../src/arch/cortex_m4/gcc_startup_nrf52.s | 301 +++
.../src/arch/cortex_m4/gcc_startup_nrf52_split.s | 166 ++
.../src/hal_bsp.c | 87 +-
hw/bsp/nrf52-thingy/src/sbrk.c | 59 +
hw/bsp/nrf52-thingy/syscfg.yml | 98 +
.../olimex_stm32-e407_devboard.ld | 2 +-
...ex_stm32-e407_devboard.ld => run_from_flash.ld} | 8 +-
...x_stm32-e407_devboard.ld => run_from_loader.ld} | 2 +-
hw/bsp/olimex_stm32-e407_devboard/run_from_sram.ld | 202 ++
hw/bsp/pic32mz2048_wi-fire/src/hal_bsp.c | 46 +
hw/bsp/pic32mz2048_wi-fire/syscfg.yml | 32 +
hw/bsp/ruuvi_tag_revb2/pkg.yml | 3 +
hw/bsp/ruuvi_tag_revb2/src/hal_bsp.c | 19 +-
.../include/bsp/stm32f7xx_hal_conf.h | 2 +-
hw/bsp/stm32f7discovery/src/hal_bsp.c | 2 +-
hw/bsp/stm32f7discovery/src/system_stm32f7xx.c | 60 +
hw/bsp/vbluno51/boot-nrf51xxac.ld | 27 +
hw/bsp/vbluno51/bsp.yml | 64 +
.../bsp/vbluno51/include/bsp/boards.h | 18 +-
.../id/id.h => hw/bsp/vbluno51/include/bsp/bsp.h | 40 +-
hw/bsp/vbluno51/include/bsp/cmsis_nvic.h | 30 +
hw/bsp/vbluno51/nrf51xxac.ld | 25 +
hw/bsp/{ruuvi_tag_revb2 => vbluno51}/pkg.yml | 61 +-
hw/bsp/vbluno51/split-vbluno51.ld | 185 ++
.../src/arch/cortex_m0/gcc_startup_nrf51.s | 280 ++
.../src/arch/cortex_m0/gcc_startup_nrf51_split.s | 182 ++
hw/bsp/{ruuvi_tag_revb2 => vbluno51}/src/hal_bsp.c | 174 +-
hw/bsp/vbluno51/src/sbrk.c | 59 +
hw/bsp/vbluno51/syscfg.yml | 82 +
hw/bsp/vbluno51/vbluno51_debug.cmd | 22 +
hw/bsp/vbluno51/vbluno51_debug.sh | 38 +
hw/bsp/vbluno51/vbluno51_download.cmd | 22 +
hw/bsp/vbluno51/vbluno51_download.sh | 42 +
hw/bsp/vbluno51/vbluno51_no_boot.ld | 179 ++
hw/drivers/nimble/nrf52/src/ble_hw.c | 4 +
hw/drivers/rtt/include/rtt/SEGGER_RTT_Conf.h | 11 +-
.../rtt/include/rtt/SEGGER_RTT_Conf_Mynewt.h | 12 +
hw/drivers/sensors/bme280/include/bme280/bme280.h | 2 +-
hw/drivers/sensors/bme280/pkg.yml | 3 +
hw/drivers/sensors/bme280/src/bme280.c | 4 +-
hw/drivers/sensors/bme280/src/bme280_shell.c | 50 +-
hw/drivers/sensors/bno055/pkg.yml | 3 +
hw/drivers/sensors/bno055/src/bno055_shell.c | 46 +-
hw/drivers/sensors/bno055/syscfg.yml | 3 +
hw/drivers/sensors/tcs34725/pkg.yml | 3 +
hw/drivers/sensors/tcs34725/src/tcs34725.c | 36 +-
hw/drivers/sensors/tcs34725/src/tcs34725_shell.c | 102 +-
hw/drivers/sensors/tcs34725/syscfg.yml | 3 +
hw/drivers/sensors/tsl2561/pkg.yml | 3 +
hw/drivers/sensors/tsl2561/src/tsl2561_shell.c | 63 +-
hw/drivers/sensors/tsl2561/syscfg.yml | 3 +
hw/mcu/microchip/pic32mz2048efg100/src/hal_spi.c | 13 +-
hw/mcu/microchip/pic32mz2048efg100/src/hal_timer.c | 545 ++++
hw/mcu/native/src/hal_uart.c | 6 +
hw/mcu/nordic/nrf52xxx/src/hal_gpio.c | 5 +
hw/mcu/nordic/nrf52xxx/src/hal_os_tick.c | 4 +
hw/mcu/nordic/nrf52xxx/src/hal_spi.c | 5 +
hw/mcu/nordic/nrf52xxx/src/hal_timer.c | 5 +
hw/mcu/nordic/nrf52xxx/src/hal_uart.c | 5 +
hw/mcu/nordic/nrf52xxx/src/hal_watchdog.c | 4 +
hw/mcu/stm/stm32f7xx/src/hal_system_start.c | 3 +-
hw/sensor/creator/src/sensor_creator.c | 61 +-
hw/sensor/include/sensor/sensor.h | 2 -
hw/sensor/pkg.yml | 1 +
hw/sensor/src/sensor_shell.c | 85 +-
kernel/os/include/os/os_trace_api.h | 84 +
kernel/os/pkg.yml | 3 +
kernel/os/src/os.c | 3 +
kernel/os/src/os_eventq.c | 6 +
kernel/os/src/os_mutex.c | 8 +
kernel/os/src/os_sched.c | 5 +
kernel/os/src/os_task.c | 2 +
kernel/os/syscfg.yml | 3 +
mgmt/imgmgr/src/imgmgr_state.c | 30 +-
net/lora/node/include/node/mac/LoRaMac.h | 58 +
net/lora/node/src/mac/LoRaMacCrypto.c | 50 +-
net/lora/node/src/mac/aes.c | 936 +++++++
net/lora/node/src/mac/cmac.c | 155 ++
net/nimble/host/include/host/ble_att.h | 1 -
net/nimble/host/include/host/ble_gap.h | 43 +-
net/nimble/host/include/host/ble_gatt.h | 6 +
net/nimble/host/include/host/ble_hs.h | 14 +
.../nimble/host/include/host/ble_hs_hci.h | 15 +-
net/nimble/host/include/host/ble_sm.h | 1 -
net/nimble/host/include/host/ble_store.h | 75 +-
net/nimble/host/src/ble_att.c | 2 +-
net/nimble/host/src/ble_gap.c | 17 +
net/nimble/host/src/ble_gap_priv.h | 1 +
net/nimble/host/src/ble_gatts.c | 12 +
net/nimble/host/src/ble_gatts_lcl.c | 164 ++
net/nimble/host/src/ble_hs_hci_cmd.c | 56 +-
net/nimble/host/src/ble_hs_hci_priv.h | 6 +-
net/nimble/host/src/ble_hs_hci_util.c | 96 +
net/nimble/host/src/ble_sm.c | 386 ++-
net/nimble/host/src/ble_sm_lgcy.c | 12 +-
net/nimble/host/src/ble_sm_priv.h | 4 +-
net/nimble/host/src/ble_sm_sc.c | 12 +-
net/nimble/host/src/ble_store.c | 79 +-
net/nimble/host/src/ble_store_util.c | 90 +
.../config/include/store/config/ble_store_config.h | 18 +-
net/nimble/host/store/{ram => config}/pkg.yml | 10 +-
.../src/ble_store_config.c} | 256 +-
.../host/store/config/src/ble_store_config_conf.c | 231 ++
.../host/store/config/src/ble_store_config_priv.h | 59 +
.../nimble/host/store/config/syscfg.yml | 18 +-
net/nimble/host/store/ram/pkg.yml | 5 +-
net/nimble/host/store/ram/src/ble_store_ram.c | 10 +-
net/nimble/host/syscfg.yml | 19 +-
net/nimble/host/test/pkg.yml | 2 +-
net/nimble/host/test/src/ble_hs_conn_test.c | 6 +-
net/nimble/host/test/src/ble_hs_test_util.c | 8 +-
net/nimble/host/test/src/ble_sm_lgcy_test.c | 2 +-
net/nimble/host/test/src/ble_sm_test.c | 2 +-
net/nimble/host/test/src/ble_sm_test_util.c | 594 +++--
net/nimble/host/test/src/ble_sm_test_util.h | 1 +
net/nimble/host/test/src/ble_store_test.c | 194 +-
net/nimble/host/test/syscfg.yml | 1 +
net/oic/include/oic/oc_rep.h | 4 +-
net/oic/include/oic/port/oc_connectivity.h | 1 +
net/oic/src/port/mynewt/ble_adaptor.c | 81 +-
net/oic/src/port/mynewt/ip4_adaptor.c | 2 +-
net/oic/src/port/mynewt/ip_adaptor.c | 2 +-
sys/config/src/config.c | 3 +
sys/console/full/src/console.c | 2 +
sys/id/include/id/id.h | 2 +
sys/id/src/id.c | 10 +-
sys/sysview/SYSVIEW_Mynewt.txt | 5 +
.../include/sysview/SEGGER_SYSVIEW_Mynewt.h | 21 +-
{hw/sensor => sys/sysview}/pkg.yml | 18 +-
sys/sysview/src/SEGGER_SYSVIEW_Config_Mynewt.c | 133 +
sys/sysview/src/SEGGER_SYSVIEW_Mynewt.c | 174 ++
sys/sysview/vendor/include/sysview/vendor/Global.h | 102 +
sys/sysview/vendor/include/sysview/vendor/SEGGER.h | 155 ++
.../vendor/include/sysview/vendor/SEGGER_SYSVIEW.h | 334 +++
.../include/sysview/vendor/SEGGER_SYSVIEW_Conf.h | 168 ++
.../sysview/vendor/SEGGER_SYSVIEW_ConfDefaults.h | 178 ++
{test/flash_test => sys/sysview/vendor}/pkg.yml | 14 +-
sys/sysview/vendor/src/SEGGER_SYSVIEW.c | 2763 ++++++++++++++++++++
sys/sysview/vendor/src/SEGGER_SYSVIEW_Int.h | 110 +
.../pkg.yml => sys/sysview/vendor/syscfg.yml | 17 +-
test/flash_test/pkg.yml | 5 +
test/flash_test/src/flash_test/flash_test.c | 11 +-
test/{flash_test => i2c_scan}/pkg.yml | 10 +-
test/i2c_scan/src/i2c_scan.c | 90 +
186 files changed, 16898 insertions(+), 1838 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.