[nrfconnect] Use version string with tweak

This commit modifies the string format of versioning to include tweak.

Signed-off-by: Łukasz Duda <lukasz.duda@nordicsemi.no>

Author: LuDuda

config/zephyr/ota-image.cmake

@@ -40,7 +40,7 @@ function(chip_ota_image TARGET_NAME)
             "--version"
             ${APPVERSION}
             "--version-str"
-            ${APP_VERSION_STRING}
+            ${APP_VERSION_TWEAK_STRING}
             "--digest-algorithm"
             "sha256"
         )

src/platform/nrfconnect/CHIPDevicePlatformConfig.h

@@ -37,20 +37,16 @@
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
 
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
 #ifdef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
 #else
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION APPVERSION
 #endif
-#endif
 
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
 #ifdef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #else
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING APP_VERSION_STRING
-#endif
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING APP_VERSION_TWEAK_STRING
 #endif
 
 #define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE