RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

pkg/nimble: version bump to 1.5.0 RC1

Browse Source
This commit is contained in:
Hauke Petersen 2022-03-22 08:53:47 +01:00
parent 068c4f1c3b
commit 568576de04
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/nimble/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME = nimble
PKG_URL = https://github.com/apache/mynewt-nimble.git
PKG_VERSION = bc142016bdef082ba7997aea09aec1c1e4db0104
PKG_VERSION = 719bd3c435b728f07ce7aaffaf6cebbd9c659a46
PKG_LICENSE = Apache-2.0
include $(RIOTBASE)/pkg/pkg.mk
@ -40,6 +40,10 @@ nimble_porting_nimble:
nimble_npl_riot:
$(QQ)"$(MAKE)" -C $(PDIR)/porting/npl/riot/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
# generic modules
nimble_transport:
$(QQ)"$(MAKE)" -C $(PDIR)/nimble/transport/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
# host modules
nimble_host:
$(QQ)"$(MAKE)" -C $(PDIR)/nimble/host/src/ -f $(TDIR)/nimble.host.mk
@ -61,9 +65,6 @@ nimble_svc_ipss:
$(QQ)"$(MAKE)" -C $(PDIR)/nimble/host/services/ipss/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
# controller specific modules
nimble_transport_ram:
$(QQ)"$(MAKE)" -C $(PDIR)/nimble/transport/ram/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
nimble_controller:
$(QQ)"$(MAKE)" -C $(PDIR)/nimble/controller/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@

6
pkg/nimble/Makefile.dep
View File

@ -3,6 +3,8 @@ USEMODULE += sema
USEMODULE += event_callback
USEMODULE += ztimer_msec
USEPKG += nrfx
# Requires nimble feature
FEATURES_REQUIRED += ble_nimble
@ -12,6 +14,9 @@ USEMODULE += nimble_riot_contrib
# RIOT port
USEMODULE += nimble_porting_nimble
# Generic modules used by host and controller
USEMODULE += nimble_transport
# Pull in dependencies based on used features
ifneq (,$(filter ble_phy_coded,$(FEATURES_USED)))
USEMODULE += nimble_phy_coded
@ -50,7 +55,6 @@ endif
# nimble controller dependencies
ifneq (,$(filter nimble_controller,$(USEMODULE)))
USEMODULE += nimble_transport_ram
ifneq (,$(filter nrf5%,$(CPU_FAM)))
USEMODULE += nimble_drivers_nrf5x
endif

4
pkg/nimble/Makefile.include
View File

@ -48,9 +48,7 @@ ifneq (,$(filter nimble_host_util,$(USEMODULE)))
endif
# include transport headers
ifneq (,$(filter nimble_transport_ram,$(USEMODULE)))
INCLUDES += $(NIMIBASE)/nimble/transport/ram/include
endif
INCLUDES += $(NIMIBASE)/nimble/transport/include
# include services
ifneq (,$(filter nimble_svc_ans,$(USEMODULE)))