From 8095ee4dd2ff0e7f0c9fc1952c33d7f18cce3512 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Fri, 6 Jan 2023 01:28:14 +0800 Subject: [PATCH] app: Updates the chip version format (vX.Y) --- .../blecent_throughput/components/cmd_system/cmd_system.c | 4 +++- examples/build_system/cmake/idf_as_lib/main.c | 4 +++- examples/get-started/hello_world/main/hello_world_main.c | 4 +++- examples/security/flash_encryption/main/flash_encrypt_main.c | 4 +++- examples/system/console/components/cmd_system/cmd_system.c | 4 +++- tools/test_apps/security/secure_boot/main/secure_boot_main.c | 4 +++- .../test_apps/system/gdb_loadable_elf/main/hello_world_main.c | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/examples/bluetooth/nimble/throughput_app/blecent_throughput/components/cmd_system/cmd_system.c b/examples/bluetooth/nimble/throughput_app/blecent_throughput/components/cmd_system/cmd_system.c index 4fa3240b1c..7351d2c753 100644 --- a/examples/bluetooth/nimble/throughput_app/blecent_throughput/components/cmd_system/cmd_system.c +++ b/examples/bluetooth/nimble/throughput_app/blecent_throughput/components/cmd_system/cmd_system.c @@ -64,7 +64,9 @@ static int get_version(int argc, char **argv) info.features & CHIP_FEATURE_BT ? "/BT" : "", info.features & CHIP_FEATURE_EMB_FLASH ? "/Embedded-Flash:" : "/External-Flash:", spi_flash_get_chip_size() / (1024 * 1024), " MB"); - printf("\trevision number:%d\r\n", info.revision); + unsigned major_rev = info.full_revision / 100; + unsigned minor_rev = info.full_revision % 100; + printf("\trevision number:v%d.%d\r\n", major_rev, minor_rev); return 0; } diff --git a/examples/build_system/cmake/idf_as_lib/main.c b/examples/build_system/cmake/idf_as_lib/main.c index 9eb73f55ef..f1f6c96e16 100644 --- a/examples/build_system/cmake/idf_as_lib/main.c +++ b/examples/build_system/cmake/idf_as_lib/main.c @@ -24,7 +24,9 @@ void app_main(void) (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - printf("silicon revision %d, ", chip_info.revision); + unsigned major_rev = chip_info.full_revision / 100; + unsigned minor_rev = chip_info.full_revision % 100; + printf("silicon revision v%d.%d, ", major_rev, minor_rev); printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); diff --git a/examples/get-started/hello_world/main/hello_world_main.c b/examples/get-started/hello_world/main/hello_world_main.c index ebc5eb0b04..b38d9b7ae8 100644 --- a/examples/get-started/hello_world/main/hello_world_main.c +++ b/examples/get-started/hello_world/main/hello_world_main.c @@ -26,7 +26,9 @@ void app_main(void) (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - printf("silicon revision %d, ", chip_info.revision); + unsigned major_rev = chip_info.full_revision / 100; + unsigned minor_rev = chip_info.full_revision % 100; + printf("silicon revision v%d.%d, ", major_rev, minor_rev); printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); diff --git a/examples/security/flash_encryption/main/flash_encrypt_main.c b/examples/security/flash_encryption/main/flash_encrypt_main.c index 29d71bfda8..6b4ff62720 100644 --- a/examples/security/flash_encryption/main/flash_encrypt_main.c +++ b/examples/security/flash_encryption/main/flash_encrypt_main.c @@ -60,7 +60,9 @@ static void example_print_chip_info(void) (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - printf("silicon revision %d, ", chip_info.revision); + unsigned major_rev = chip_info.full_revision / 100; + unsigned minor_rev = chip_info.full_revision % 100; + printf("silicon revision v%d.%d, ", major_rev, minor_rev); printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); diff --git a/examples/system/console/components/cmd_system/cmd_system.c b/examples/system/console/components/cmd_system/cmd_system.c index 5d5e9fd225..a1da77445b 100644 --- a/examples/system/console/components/cmd_system/cmd_system.c +++ b/examples/system/console/components/cmd_system/cmd_system.c @@ -78,7 +78,9 @@ static int get_version(int argc, char **argv) info.features & CHIP_FEATURE_BT ? "/BT" : "", info.features & CHIP_FEATURE_EMB_FLASH ? "/Embedded-Flash:" : "/External-Flash:", spi_flash_get_chip_size() / (1024 * 1024), " MB"); - printf("\trevision number:%d\r\n", info.revision); + unsigned major_rev = info.full_revision / 100; + unsigned minor_rev = info.full_revision % 100; + printf("\trevision number:v%d.%d\r\n", major_rev, minor_rev); return 0; } diff --git a/tools/test_apps/security/secure_boot/main/secure_boot_main.c b/tools/test_apps/security/secure_boot/main/secure_boot_main.c index 8339a76ed6..ad47304b3b 100644 --- a/tools/test_apps/security/secure_boot/main/secure_boot_main.c +++ b/tools/test_apps/security/secure_boot/main/secure_boot_main.c @@ -41,7 +41,9 @@ static void example_print_chip_info(void) (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - printf("silicon revision %d, ", chip_info.revision); + unsigned major_rev = chip_info.full_revision / 100; + unsigned minor_rev = chip_info.full_revision % 100; + printf("silicon revision v%d.%d, ", major_rev, minor_rev); printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); diff --git a/tools/test_apps/system/gdb_loadable_elf/main/hello_world_main.c b/tools/test_apps/system/gdb_loadable_elf/main/hello_world_main.c index 1bbb227906..e2c7e96722 100644 --- a/tools/test_apps/system/gdb_loadable_elf/main/hello_world_main.c +++ b/tools/test_apps/system/gdb_loadable_elf/main/hello_world_main.c @@ -26,7 +26,9 @@ void app_main(void) (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - printf("silicon revision %d, ", chip_info.revision); + unsigned major_rev = chip_info.full_revision / 100; + unsigned minor_rev = chip_info.full_revision % 100; + printf("silicon revision v%d.%d, ", major_rev, minor_rev); printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024), (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");