Skip to content

Commit

Permalink
[nrf fromtree] Bluetooth: DIS: integrate app version into FW revision…
Browse files Browse the repository at this point in the history
… characteristic

Integrated the application version feature of the build system with
the default configuration of the Bluetooth DIS module and its Firmware
Revision characteristic.

The firmware revision string now defaults to APP_VERSION_TWEAK_STRING
if the application version feature is used in a project. This specific
version format is used to unify version formatting with other parts of
Zephyr like the MCUboot module and its versioning Kconfig:
CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION

Signed-off-by: Kamil Piszczek <[email protected]>
(cherry picked from commit f9a5699)
  • Loading branch information
kapi-no authored and rlubos committed Aug 2, 2024
1 parent 65acb95 commit bc15a7e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions subsys/bluetooth/services/Kconfig.dis
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ config BT_DIS_FW_REV
config BT_DIS_FW_REV_STR
string "Firmware revision"
depends on BT_DIS_FW_REV
default "$(APP_VERSION_TWEAK_STRING)" if "$(VERSION_MAJOR)" != ""
default "0.0.0+0"
help
Enable firmware revision characteristic in Device Information Service.

Expand Down

0 comments on commit bc15a7e

Please sign in to comment.