Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
StackYuan authored Apr 6, 2021
2 parents 99f24ad + f88b343 commit ff11f49
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
4 changes: 4 additions & 0 deletions peripherals/nrf5x_sdk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ if PKG_USING_NRF5X_SDK
config PKG_USING_NRF5X_SDK_V1600
bool "v16.0.0"

config PKG_USING_NRF5X_SDK_V1610
bool "v16.1.0"

config PKG_USING_NRF5X_SDK_LATEST_VERSION
bool "latest"
endchoice
Expand All @@ -155,6 +158,7 @@ if PKG_USING_NRF5X_SDK
string
default "v13.0.0" if PKG_USING_NRF5X_SDK_V1300
default "v16.0.0" if PKG_USING_NRF5X_SDK_V1600
default "v16.1.0" if PKG_USING_NRF5X_SDK_V1610
default "latest" if PKG_USING_NRF5X_SDK_LATEST_VERSION

endif
Expand Down
16 changes: 11 additions & 5 deletions peripherals/nrf5x_sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,26 @@
"site": [
{
"version": "v13.0.0",
"URL": "https://github.com/supperthomas/nrf5x_sdk/archive/V13.0.0.zip",
"URL": "https://github.com/supperthomas/nrf5x_sdk.git",
"filename": "nrf5x_sdk-13.0.0.zip",
"VER_SHA": "release"
"VER_SHA": "f5d7ad0eb1390f5b78853212f5869a1d924d141a"
},
{
"version": "v16.0.0",
"URL": "https://github.com/supperthomas/nrf5x_sdk/archive/V16.0.0.zip",
"URL": "https://github.com/supperthomas/nrf5x_sdk.git",
"filename": "nrf5x_sdk-16.0.0.zip",
"VER_SHA": "release"
"VER_SHA": "6db224187ced164181457185cb0ac402be2efa91"
},
{
"version": "v16.1.0",
"URL": "https://github.com/supperthomas/nrf5x_sdk.git",
"filename": "nrf5x_sdk-16.1.0.zip",
"VER_SHA": "bdd5f9df690ae4cca39baab6e5ade6a6b6179c0e"
},
{
"version": "latest",
"URL": "https://github.com/supperthomas/nrf5x_sdk.git",
"filename": "nrf5x_sdk-16.0.0",
"filename": "nrf5x_sdk-latest",
"VER_SHA": "master"
}
]
Expand Down

0 comments on commit ff11f49

Please sign in to comment.