Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add firmware ID for soft devices to utilities #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −19
Open

add firmware ID for soft devices to utilities #69

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
615a0a9
add firmware ID for soft devices to utilities
podom Aug 4, 2021
fbe2795
confirmed s312 6.1.1 ID
podom Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add firmware ID for soft devices to utilities
@podom
podom committed Aug 4, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 615a0a96d8b189256fa70553023ec51e7ea069a4
2 changes: 1 addition & 1 deletion cmake/nrf5.cmake
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ if(NRF5_SOFTDEVICE_VARIANT)
add_compile_options(${local_mbr_flags})
add_link_options(${local_mbr_flags})
elseif(NOT NRF5_SOFTDEVICE_VARIANT STREQUAL "blank")
nrf5_get_softdevice_data(${NRF5_SDK_PATH} ${NRF5_SDK_VERSION} ${NRF5_TARGET} ${NRF5_SOFTDEVICE_VARIANT} local_sd_hex_file_path local_sd_flags)
nrf5_get_softdevice_data(${NRF5_SDK_PATH} ${NRF5_SDK_VERSION} ${NRF5_TARGET} ${NRF5_SOFTDEVICE_VARIANT} local_sd_hex_file_path local_sd_flags local_sd_id)
add_compile_options(${local_sd_flags})
add_link_options(${local_sd_flags})
endif()
39 changes: 21 additions & 18 deletions cmake/nrf5_helpers.cmake
View file
Original file line number Diff line number Diff line change
@@ -225,7 +225,7 @@ function(nrf5_get_startup_file sdk_path target out_startup_file out_system_file)
set(${out_system_file} "${system_file}" PARENT_SCOPE)
endfunction()

function(nrf5_get_softdevice_data sdk_path sdk_version target sd_variant out_sd_hex_file_path out_sd_flags)
function(nrf5_get_softdevice_data sdk_path sdk_version target sd_variant out_sd_hex_file_path out_sd_flags out_sd_id)
# If we have blank or mbr sd_variant then continue...
if(sd_variant MATCHES "^(blank|mbr)$")
return()
@@ -278,27 +278,29 @@ function(nrf5_get_softdevice_data sdk_path sdk_version target sd_variant out_sd_
set(sd_key_version 0)
set(sd_key_use_ble 1)
set(sd_key_use_ant 2)

set(softdevice_15.3.0_s112 6.1.1 YES NO)
set(softdevice_15.3.0_s132 6.1.1 YES NO)
set(softdevice_15.3.0_s140 6.1.1 YES NO)
set(softdevice_15.3.0_s212 6.1.1 NO YES)
set(softdevice_15.3.0_s312 6.1.1 YES YES)
set(softdevice_15.3.0_s332 6.1.1 YES YES)
set(softdevice_15.3.0_s340 6.1.1 YES YES)

set(softdevice_16.0.0_s112 7.0.1 YES NO)
set(softdevice_16.0.0_s113 7.0.1 YES NO)
set(softdevice_16.0.0_s132 7.0.1 YES NO)
set(softdevice_16.0.0_s140 7.0.1 YES NO)
set(softdevice_16.0.0_s212 6.1.1 NO YES)
set(softdevice_16.0.0_s312 6.1.1 YES YES)
set(softdevice_16.0.0_s332 6.1.1 YES YES)
set(softdevice_16.0.0_s340 6.1.1 YES YES)
set(sd_key_id 3)

set(softdevice_15.3.0_s112 6.1.1 YES NO 0xB8)
set(softdevice_15.3.0_s132 6.1.1 YES NO 0xB7)
set(softdevice_15.3.0_s140 6.1.1 YES NO 0xB6)
set(softdevice_15.3.0_s212 6.1.1 NO YES 0xBC)
set(softdevice_15.3.0_s312 6.1.1 YES YES 0xBB) #todo this may be wrong!
set(softdevice_15.3.0_s332 6.1.1 YES YES 0xBA)
set(softdevice_15.3.0_s340 6.1.1 YES YES 0xB9)

set(softdevice_16.0.0_s112 7.0.1 YES NO 0xCD)
set(softdevice_16.0.0_s113 7.0.1 YES NO 0xCC)
set(softdevice_16.0.0_s132 7.0.1 YES NO 0xCB)
set(softdevice_16.0.0_s140 7.0.1 YES NO 0xCA)
set(softdevice_16.0.0_s212 6.1.1 NO YES 0xBC)
set(softdevice_16.0.0_s312 6.1.1 YES YES 0xBB) #todo this may be wrong!
set(softdevice_16.0.0_s332 6.1.1 YES YES 0xBA)
set(softdevice_16.0.0_s340 6.1.1 YES YES 0xB9)

list(GET softdevice_${sdk_version}_${sd_variant} ${sd_key_version} sd_version)
list(GET softdevice_${sdk_version}_${sd_variant} ${sd_key_use_ble} sd_use_ble)
list(GET softdevice_${sdk_version}_${sd_variant} ${sd_key_use_ant} sd_use_ant)
list(GET softdevice_${sdk_version}_${sd_variant} ${sd_key_id} sd_id)
string(REGEX REPLACE "\.[0-9]\.[0-9]" "" sd_version_major ${sd_version})

# Check if hex file is present.
@@ -322,6 +324,7 @@ function(nrf5_get_softdevice_data sdk_path sdk_version target sd_variant out_sd_
# Set output variables
set(${out_sd_hex_file_path} "${hex_file_path}" PARENT_SCOPE)
set(${out_sd_flags} ${sd_flags} PARENT_SCOPE)
set(${out_sd_id} ${sd_id} PARENT_SCOPE)

endfunction()