ladislas+yann/feature/cmake generate os version #1069

ladislas · 2022-10-17T21:19:17Z

♻️ (version): Rename struct FirmwareVersion -> Version
🔧 (FirmwareKit): CMake - Generate os_version.h
🔧 (cmake-tools): Add OS_VERSION to config

replaces #1025

Needs:

🔨 (version): Move firmware version from build_firmware script to Makefile #1023
Add workflow to check version are correspondant in config and generated binary
Rename Firmware_Version by Version
~~Fix use of settings.json~~
Refactor getCurrentVersionFromFile

github-actions · 2022-10-17T21:30:37Z

File comparision analysis report

🔖 Info

base: develop / 25050e2 + mbed-os-6.15.1+fixes + -std=c++20
head: ladislas+yann/feature/cmake-generate-os_version / f857e15 + mbed-os-6.15.1+fixes + -std=c++20
toolchain: GNU Arm Embedded Toolchain 10.3-2021.10 - 10.3.1 20210824
enable_log_debug: ON

Target	Flash Used (%)	Flash Available (%)	Static RAM (%)
bootloader	181900 (69%)	80244 (30%)	37456 (7%)
os	451764 (28%)	1112908 (71%)	86664 (16%)

Click to show memory sections

| -          |      Hex |     Bytes |  KiB |
|------------|---------:|----------:|-----:|
| Flash      | 0x200000 | 2 097 152 | 2048 |
| SRAM       |  0x80000 |   524 288 |  512 |
| Bootloader |  0x40000 |   262 144 |  256 |
| Header     |   0x1000 |     4 096 |    4 |
| OS         | 0x17E000 | 1 564 672 | 1528 |
| Tail       |   0x1000 |     4 096 |    4 |
| Scratch    |  0x40000 |   262 144 |  256 |

📝 Summary

Click to show summary

✔️ - existing target
✨ - new target
⚰️ - deleted target
✅ - files are the same
❌ - files are different

Target	Status	.bin	.map	Total Flash (base/head)	Total Flash Δ	Static RAM (base/head)	Static RAM Δ
LekaOS	✔️	❌	❌	451908 (21%) 451764 (21%)	📉 -144 (0%)	86664 (16%)	ø
bootloader	✔️	❌	❌	182012 (8%) 181900 (8%)	📉 -112 (0%)	37456 (7%)	ø
functional_ut_boost_ut	✔️	✅	✅	396064 (18%)	ø	27088 (5%)	ø
functional_ut_file_manager	✔️	✅	✅	385800 (18%)	ø	27336 (5%)	ø
functional_ut_io_expander	✔️	✅	✅	371704 (17%)	ø	27056 (5%)	ø
functional_ut_qdac	✔️	✅	✅	372952 (17%)	ø	27056 (5%)	ø
spike_lk_audio	✔️	✅	✅	135068 (6%)	ø	20984 (4%)	ø
spike_lk_behavior_kit	✔️	✅	✅	198252 (9%)	ø	54536 (10%)	ø
spike_lk_ble	✔️	✅	✅	236652 (11%)	ø	34856 (6%)	ø
spike_lk_bluetooth	✔️	✅	✅	92236 (4%)	ø	18064 (3%)	ø
spike_lk_cg_animations	✔️	✅	✅	152264 (7%)	ø	53064 (10%)	ø
spike_lk_color_kit	✔️	✅	✅	88352 (4%)	ø	20216 (3%)	ø
spike_lk_command_kit	✔️	✅	✅	202716 (9%)	ø	57872 (11%)	ø
spike_lk_config_kit	✔️	✅	✅	138868 (6%)	ø	20976 (4%)	ø
spike_lk_coreled	✔️	✅	✅	87916 (4%)	ø	20104 (3%)	ø
spike_lk_event_queue	✔️	✅	✅	84088 (4%)	ø	18744 (3%)	ø
spike_lk_file_manager_kit	✔️	✅	✅	153984 (7%)	ø	21336 (4%)	ø
spike_lk_file_reception	✔️	✅	✅	331180 (15%)	ø	34072 (6%)	ø
spike_lk_flash_memory	✔️	✅	✅	86712 (4%)	ø	18056 (3%)	ø
spike_lk_fs	✔️	✅	✅	173976 (8%)	ø	47976 (9%)	ø
spike_lk_lcd	✔️	✅	✅	171852 (8%)	ø	53288 (10%)	ø
spike_lk_led_kit	✔️	✅	✅	115708 (5%)	ø	21024 (4%)	ø
spike_lk_log_kit	✔️	✅	✅	84440 (4%)	ø	19248 (3%)	ø
spike_lk_motors	✔️	✅	✅	86008 (4%)	ø	18088 (3%)	ø
spike_lk_qdac	✔️	✅	✅	91508 (4%)	ø	18616 (3%)	ø
spike_lk_reinforcer	✔️	✅	✅	112188 (5%)	ø	21024 (4%)	ø
spike_lk_rfid	✔️	✅	✅	84700 (4%)	ø	18024 (3%)	ø
spike_lk_sensors_battery	✔️	✅	✅	87056 (4%)	ø	19120 (3%)	ø
spike_lk_sensors_light	✔️	✅	✅	83944 (4%)	ø	18056 (3%)	ø
spike_lk_sensors_microphone	✔️	✅	✅	84696 (4%)	ø	18056 (3%)	ø
spike_lk_sensors_temperature_humidity	✔️	✅	✅	90336 (4%)	ø	18032 (3%)	ø
spike_lk_sensors_touch	✔️	✅	✅	91608 (4%)	ø	18296 (3%)	ø
spike_lk_serial_number	✔️	✅	✅	136188 (6%)	ø	20896 (3%)	ø
spike_lk_ticker_timeout	✔️	✅	✅	82584 (3%)	ø	18072 (3%)	ø
spike_lk_update_process_app_base	✔️	❌	❌	148044 (7%) 147916 (7%)	📉 -128 (0%)	21912 (4%) 21904 (4%)	📉 -8 (0%)
spike_lk_update_process_app_update	✔️	✅	✅	100328 (4%)	ø	19080 (3%)	ø
spike_lk_watchdog_isr	✔️	✅	✅	87940 (4%)	ø	19960 (3%)	ø
spike_lk_wifi	✔️	✅	✅	130640 (6%)	ø	21368 (4%)	ø
spike_mbed_blinky	✔️	✅	✅	57616 (2%)	ø	11496 (2%)	ø
spike_mbed_watchdog_ticker_vs_thread	✔️	✅	✅	84112 (4%)	ø	18920 (3%)	ø
spike_stl_cxxsupport	✔️	✅	✅	83424 (3%)	ø	18144 (3%)	ø

🗺️ Map files diff output

Click to show diff list

LekaOS (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-10-31 20:35:39.278394931 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-10-31 20:35:39.630399800 +0000
@@ -1,48 +1,48 @@
 | Module                     |           .text |       .data |          .bss |
 |----------------------------|-----------------|-------------|---------------|
-| [fill]                     |       658(+658) |     18(+18) |     229(+229) |
+| [fill]                     |       662(+662) |     18(+18) |     233(+233) |
 | [lib]/ActivityKit.a        |   19586(+19586) |       0(+0) |         0(+0) |
 | [lib]/BLEKit.a             |     1368(+1368) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a         |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a        |     1794(+1794) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a           |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a         |     1120(+1120) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a        |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreBufferedSerial.a |         62(+62) |       0(+0) |         0(+0) |
 | [lib]/CoreEventFlags.a     |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/CoreEventQueue.a     |       116(+116) |       0(+0) |         0(+0) |
 | [lib]/CoreFlashMemory.a    |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreMCU.a            |         16(+16) |       0(+0) |         0(+0) |
 | [lib]/CoreMotor.a          |       130(+130) |       0(+0) |         0(+0) |
 | [lib]/CoreMutex.a          |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/CorePwm.a            |         12(+12) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a           |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/CoreRFIDReader.a     |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a            |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreSTM32Hal.a       |       930(+930) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a        |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CoreVideo.a          |     7944(+7944) |       1(+1) | 30800(+30800) |
 | [lib]/CriticalSection.a    |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/EventLoopKit.a       |       348(+348) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a     |     1432(+1432) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a        |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a        |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a         |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a             |   19410(+19410) |       0(+0) |       10(+10) |
 | [lib]/RFIDKit.a            |     1074(+1074) |       0(+0) |         8(+8) |
 | [lib]/ReinforcerKit.a      |     1484(+1484) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a    |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/Utils.a              |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/VideoKit.a           |       774(+774) |       0(+0) |       36(+36) |
 | [lib]/bootutil.a           |     1362(+1362) |     12(+12) |     132(+132) |
 | [lib]/c.a                  |   48840(+48840) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a                |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a                  |       564(+564) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a     | 174464(+174464) |   773(+773) | 19735(+19735) |
 | [lib]/misc                 |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a              |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a             |   10732(+10732) |     16(+16) |     204(+204) |
-| main.cpp.obj               | 102902(+102902) |   548(+548) | 31073(+31073) |
-| Subtotals                  | 409252(+409252) | 3944(+3944) | 82352(+82352) |
+| main.cpp.obj               | 102882(+102882) |   548(+548) | 31069(+31069) |
+| Subtotals                  | 409124(+409124) | 3944(+3944) | 82352(+82352) |
 Total Static RAM memory (data + bss): 86296(+86296) bytes
-Total Flash memory (text + data): 413196(+413196) bytes
+Total Flash memory (text + data): 413068(+413068) bytes

Flash used: 451764&nbsp;(21%) / total: 2097152
SRAM used: 86664&nbsp;(16%) / total: 524288

bootloader (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-10-31 20:35:39.878403231 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-10-31 20:35:40.086406108 +0000
@@ -1,28 +1,28 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       210(+210) |       8(+8) |       68(+68) |
+| [fill]                  |       198(+198) |       8(+8) |       72(+72) |
 | [lib]/ConfigKit.a       |       284(+284) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a     |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreFlashMemory.a |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreMotor.a       |       130(+130) |       0(+0) |         0(+0) |
 | [lib]/CorePwm.a         |         12(+12) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a        |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a         |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       932(+932) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a     |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a     |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     6022(+6022) |     16(+16) | 13816(+13816) |
 | [lib]/c.a               |   42144(+42144) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a               |       360(+360) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  |   83414(+83414) |   528(+528) | 11127(+11127) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |   11476(+11476) |     16(+16) |     204(+204) |
 | default_bd.cpp.obj      |       242(+242) |       0(+0) |     568(+568) |
-| main.cpp.obj            |     6874(+6874) |     24(+24) |   8068(+8068) |
+| main.cpp.obj            |     6870(+6870) |     24(+24) |   8064(+8064) |
 | signing_keys.c.obj      |           0(+0) |       0(+0) |         0(+0) |
-| Subtotals               | 161432(+161432) | 3168(+3168) | 33976(+33976) |
+| Subtotals               | 161304(+161304) | 3168(+3168) | 33976(+33976) |
 Total Static RAM memory (data + bss): 37144(+37144) bytes
-Total Flash memory (text + data): 164600(+164600) bytes
+Total Flash memory (text + data): 164472(+164472) bytes

Flash used: 181900&nbsp;(8%) / total: 2097152
SRAM used: 37456&nbsp;(7%) / total: 524288

spike_lk_update_process_app_base (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-ON/spike_lk_update_process_app_base-map.txt	2022-10-31 20:35:54.146597755 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/spike_lk_update_process_app_base-map.txt	2022-10-31 20:35:54.334599630 +0000
@@ -1,22 +1,22 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       224(+224) |       4(+4) |       50(+50) |
+| [fill]                  |       216(+216) |       4(+4) |       46(+46) |
 | [lib]/CoreFlashMemory.a |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a        |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       936(+936) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a     |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a     |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     1282(+1282) |     12(+12) |     132(+132) |
 | [lib]/c.a               |   41120(+41120) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a               |       360(+360) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  |   71590(+71590) |   528(+528) | 10473(+10473) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |     5424(+5424) |       8(+8) |       44(+44) |
-| main.cpp.obj            |     3362(+3362) |       0(+0) |   7664(+7664) |
-| Subtotals               | 133224(+133224) | 3128(+3128) | 18488(+18488) |
-Total Static RAM memory (data + bss): 21616(+21616) bytes
-Total Flash memory (text + data): 136352(+136352) bytes
+| main.cpp.obj            |     3354(+3354) |       0(+0) |   7660(+7660) |
+| Subtotals               | 133096(+133096) | 3128(+3128) | 18480(+18480) |
+Total Static RAM memory (data + bss): 21608(+21608) bytes
+Total Flash memory (text + data): 136224(+136224) bytes

Flash used: 147916&nbsp;(7%) / total: 2097152
SRAM used: 21904&nbsp;(4%) / total: 524288

github-actions · 2022-10-17T21:32:38Z

File comparision analysis report

🔖 Info

base: develop / 25050e2 + mbed-os-6.15.1+fixes + -std=c++20
head: ladislas+yann/feature/cmake-generate-os_version / f857e15 + mbed-os-6.15.1+fixes + -std=c++20
toolchain: GNU Arm Embedded Toolchain 10.3-2021.10 - 10.3.1 20210824
enable_log_debug: OFF

Target	Flash Used (%)	Flash Available (%)	Static RAM (%)
bootloader	169508 (64%)	92636 (35%)	30920 (5%)
os	410728 (26%)	1153944 (73%)	79608 (15%)

Click to show memory sections

| -          |      Hex |     Bytes |  KiB |
|------------|---------:|----------:|-----:|
| Flash      | 0x200000 | 2 097 152 | 2048 |
| SRAM       |  0x80000 |   524 288 |  512 |
| Bootloader |  0x40000 |   262 144 |  256 |
| Header     |   0x1000 |     4 096 |    4 |
| OS         | 0x17E000 | 1 564 672 | 1528 |
| Tail       |   0x1000 |     4 096 |    4 |
| Scratch    |  0x40000 |   262 144 |  256 |

📝 Summary

Click to show summary

✔️ - existing target
✨ - new target
⚰️ - deleted target
✅ - files are the same
❌ - files are different

Target	Status	.bin	.map	Total Flash (base/head)	Total Flash Δ	Static RAM (base/head)	Static RAM Δ
LekaOS	✔️	❌	❌	410936 (19%) 410728 (19%)	📉 -208 (0%)	79608 (15%)	ø
bootloader	✔️	❌	❌	169636 (8%) 169508 (8%)	📉 -128 (0%)	30920 (5%)	ø
functional_ut_boost_ut	✔️	✅	✅	384496 (18%)	ø	20424 (3%)	ø
functional_ut_file_manager	✔️	✅	✅	373280 (17%)	ø	20664 (3%)	ø
functional_ut_io_expander	✔️	✅	✅	360200 (17%)	ø	20392 (3%)	ø
functional_ut_qdac	✔️	✅	✅	361448 (17%)	ø	20392 (3%)	ø
spike_lk_audio	✔️	✅	✅	125076 (5%)	ø	14568 (2%)	ø
spike_lk_behavior_kit	✔️	✅	✅	189752 (9%)	ø	48120 (9%)	ø
spike_lk_ble	✔️	✅	✅	228768 (10%)	ø	28200 (5%)	ø
spike_lk_bluetooth	✔️	✅	✅	82948 (3%)	ø	11544 (2%)	ø
spike_lk_cg_animations	✔️	✅	✅	144632 (6%)	ø	46528 (8%)	ø
spike_lk_color_kit	✔️	✅	✅	65712 (3%)	ø	13744 (2%)	ø
spike_lk_command_kit	✔️	✅	✅	192520 (9%)	ø	50944 (9%)	ø
spike_lk_config_kit	✔️	✅	✅	126956 (6%)	ø	14312 (2%)	ø
spike_lk_coreled	✔️	✅	✅	76164 (3%)	ø	13688 (2%)	ø
spike_lk_event_queue	✔️	✅	✅	74736 (3%)	ø	12072 (2%)	ø
spike_lk_file_manager_kit	✔️	✅	✅	139016 (6%)	ø	14416 (2%)	ø
spike_lk_file_reception	✔️	✅	✅	327112 (15%)	ø	27576 (5%)	ø
spike_lk_flash_memory	✔️	✅	✅	63880 (3%)	ø	11448 (2%)	ø
spike_lk_fs	✔️	✅	✅	174616 (8%)	ø	47888 (9%)	ø
spike_lk_lcd	✔️	✅	✅	162236 (7%)	ø	46616 (8%)	ø
spike_lk_led_kit	✔️	✅	✅	103992 (4%)	ø	14608 (2%)	ø
spike_lk_log_kit	✔️	✅	✅	63736 (3%)	ø	12256 (2%)	ø
spike_lk_motors	✔️	✅	✅	62600 (2%)	ø	11488 (2%)	ø
spike_lk_qdac	✔️	✅	✅	78564 (3%)	ø	11816 (2%)	ø
spike_lk_reinforcer	✔️	✅	✅	103480 (4%)	ø	14608 (2%)	ø
spike_lk_rfid	✔️	✅	✅	80920 (3%)	ø	11520 (2%)	ø
spike_lk_sensors_battery	✔️	✅	✅	78196 (3%)	ø	12568 (2%)	ø
spike_lk_sensors_light	✔️	✅	✅	60056 (2%)	ø	11440 (2%)	ø
spike_lk_sensors_microphone	✔️	✅	✅	72496 (3%)	ø	11504 (2%)	ø
spike_lk_sensors_temperature_humidity	✔️	✅	✅	67048 (3%)	ø	11424 (2%)	ø
spike_lk_sensors_touch	✔️	✅	✅	68600 (3%)	ø	11432 (2%)	ø
spike_lk_serial_number	✔️	✅	✅	114244 (5%)	ø	14056 (2%)	ø
spike_lk_ticker_timeout	✔️	✅	✅	69052 (3%)	ø	11632 (2%)	ø
spike_lk_update_process_app_base	✔️	❌	❌	126236 (6%) 126092 (6%)	📉 -144 (0%)	15304 (2%) 15296 (2%)	📉 -8 (0%)
spike_lk_update_process_app_update	✔️	✅	✅	77632 (3%)	ø	12352 (2%)	ø
spike_lk_watchdog_isr	✔️	✅	✅	82032 (3%)	ø	13288 (2%)	ø
spike_lk_wifi	✔️	✅	✅	116392 (5%)	ø	14808 (2%)	ø
spike_mbed_blinky	✔️	✅	✅	57968 (2%)	ø	11400 (2%)	ø
spike_mbed_watchdog_ticker_vs_thread	✔️	✅	✅	63208 (3%)	ø	12448 (2%)	ø
spike_stl_cxxsupport	✔️	✅	✅	58456 (2%)	ø	11400 (2%)	ø

🗺️ Map files diff output

Click to show diff list

LekaOS (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-10-31 20:35:17.705514099 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-10-31 20:35:18.049514468 +0000
@@ -1,48 +1,48 @@
 | Module                     |           .text |       .data |          .bss |
 |----------------------------|-----------------|-------------|---------------|
-| [fill]                     |       664(+664) |     18(+18) |     208(+208) |
+| [fill]                     |       612(+612) |     18(+18) |     212(+212) |
 | [lib]/ActivityKit.a        |   19586(+19586) |       0(+0) |         0(+0) |
 | [lib]/BLEKit.a             |     1368(+1368) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a         |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a        |     1794(+1794) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a           |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a         |     1120(+1120) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a        |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreBufferedSerial.a |         62(+62) |       0(+0) |         0(+0) |
 | [lib]/CoreEventFlags.a     |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/CoreEventQueue.a     |       116(+116) |       0(+0) |         0(+0) |
 | [lib]/CoreFlashMemory.a    |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreMCU.a            |         16(+16) |       0(+0) |         0(+0) |
 | [lib]/CoreMotor.a          |       130(+130) |       0(+0) |         0(+0) |
 | [lib]/CoreMutex.a          |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/CorePwm.a            |         12(+12) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a           |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/CoreRFIDReader.a     |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a            |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreSTM32Hal.a       |       930(+930) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a        |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CoreVideo.a          |     7944(+7944) |       1(+1) | 30800(+30800) |
 | [lib]/CriticalSection.a    |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/EventLoopKit.a       |       348(+348) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a     |     1432(+1432) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a        |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a        |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a         |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a             |   19410(+19410) |       0(+0) |       10(+10) |
 | [lib]/RFIDKit.a            |     1074(+1074) |       0(+0) |         8(+8) |
 | [lib]/ReinforcerKit.a      |     1484(+1484) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a    |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/Utils.a              |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/VideoKit.a           |       774(+774) |       0(+0) |       36(+36) |
 | [lib]/bootutil.a           |     1362(+1362) |     12(+12) |     132(+132) |
 | [lib]/c.a                  |   49944(+49944) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a                |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a                  |       564(+564) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a     | 173212(+173212) |   773(+773) | 19647(+19647) |
 | [lib]/misc                 |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a              |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a             |   10684(+10684) |     16(+16) |     204(+204) |
-| main.cpp.obj               |   62580(+62580) |   548(+548) | 24126(+24126) |
-| Subtotals                  | 368740(+368740) | 3944(+3944) | 75296(+75296) |
+| main.cpp.obj               |   62552(+62552) |   548(+548) | 24122(+24122) |
+| Subtotals                  | 368548(+368548) | 3944(+3944) | 75296(+75296) |
 Total Static RAM memory (data + bss): 79240(+79240) bytes
-Total Flash memory (text + data): 372684(+372684) bytes
+Total Flash memory (text + data): 372492(+372492) bytes

Flash used: 410728&nbsp;(19%) / total: 2097152
SRAM used: 79608&nbsp;(15%) / total: 524288

bootloader (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-10-31 20:35:18.285514721 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-10-31 20:35:18.481514932 +0000
@@ -1,26 +1,26 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       214(+214) |       8(+8) |       65(+65) |
+| [fill]                  |       206(+206) |       8(+8) |       69(+69) |
 | [lib]/ConfigKit.a       |       284(+284) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a     |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreFlashMemory.a |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreMotor.a       |       130(+130) |       0(+0) |         0(+0) |
 | [lib]/CorePwm.a         |         12(+12) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a        |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a         |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       932(+932) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a     |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a     |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     6022(+6022) |     16(+16) | 13816(+13816) |
 | [lib]/c.a               |   43360(+43360) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  |   74842(+74842) |   528(+528) | 11003(+11003) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |   10968(+10968) |     16(+16) |     204(+204) |
 | default_bd.cpp.obj      |       242(+242) |       0(+0) |     568(+568) |
-| main.cpp.obj            |     4462(+4462) |     24(+24) |   1659(+1659) |
+| main.cpp.obj            |     4454(+4454) |     24(+24) |   1655(+1655) |
 | signing_keys.c.obj      |           0(+0) |       0(+0) |         0(+0) |
-| Subtotals               | 150792(+150792) | 3168(+3168) | 27440(+27440) |
+| Subtotals               | 150664(+150664) | 3168(+3168) | 27440(+27440) |
 Total Static RAM memory (data + bss): 30608(+30608) bytes
-Total Flash memory (text + data): 153960(+153960) bytes
+Total Flash memory (text + data): 153832(+153832) bytes

Flash used: 169508&nbsp;(8%) / total: 2097152
SRAM used: 30920&nbsp;(5%) / total: 524288

spike_lk_update_process_app_base (click to expand)

--- build_artifacts/base_ref-build-enable_log_debug-OFF/spike_lk_update_process_app_base-map.txt	2022-10-31 20:35:31.689478373 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/spike_lk_update_process_app_base-map.txt	2022-10-31 20:35:31.857477640 +0000
@@ -1,20 +1,20 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       200(+200) |       4(+4) |       42(+42) |
+| [fill]                  |       192(+192) |       4(+4) |       38(+38) |
 | [lib]/CoreFlashMemory.a |       546(+546) |       0(+0) |         0(+0) |
 | [lib]/CoreQSPI.a        |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       936(+936) |       0(+0) |         0(+0) |
-| [lib]/FirmwareKit.a     |       750(+750) |       0(+0) |         0(+0) |
+| [lib]/FirmwareKit.a     |       638(+638) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     1282(+1282) |     12(+12) |     132(+132) |
 | [lib]/c.a               |   42336(+42336) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     3276(+3276) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  |   63666(+63666) |   528(+528) | 10341(+10341) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |           0(+0) |       0(+0) |         0(+0) |
-| main.cpp.obj            |     1022(+1022) |       0(+0) |   1256(+1256) |
-| Subtotals               | 114488(+114488) | 3120(+3120) | 11896(+11896) |
-Total Static RAM memory (data + bss): 15016(+15016) bytes
-Total Flash memory (text + data): 117608(+117608) bytes
+| main.cpp.obj            |     1014(+1014) |       0(+0) |   1252(+1252) |
+| Subtotals               | 114360(+114360) | 3120(+3120) | 11888(+11888) |
+Total Static RAM memory (data + bss): 15008(+15008) bytes
+Total Flash memory (text + data): 117480(+117480) bytes

Flash used: 126092&nbsp;(6%) / total: 2097152
SRAM used: 15296&nbsp;(2%) / total: 524288

codecov · 2022-10-17T22:10:33Z

Codecov Report

Merging #1069 (f857e15) into develop (25050e2) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #1069      +/-   ##
===========================================
- Coverage    96.05%   96.04%   -0.01%     
===========================================
  Files          133      133              
  Lines         3191     3183       -8     
===========================================
- Hits          3065     3057       -8     
  Misses         126      126

Impacted Files	Coverage Δ
libs/FirmwareKit/include/FirmwareKit.h	`100.00% <ø> (ø)`
libs/BLEKit/include/BLEServiceDeviceInformation.h	`100.00% <100.00%> (ø)`
libs/BLEKit/include/BLEServiceUpdate.h	`100.00% <100.00%> (ø)`
libs/FirmwareKit/source/FirmwareKit.cpp	`100.00% <100.00%> (ø)`
libs/RobotKit/include/RobotController.h	`94.41% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

YannLocatelli

Validated on the robot

I can add the commit to clean up the whole getCurrentVersionFromFile part

.vscode/settings.template.json

libs/FirmwareKit/CMakeLists.txt

libs/FirmwareKit/tests/FirmwareKit_test.cpp

sonarcloud · 2022-10-31T20:38:08Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

100.0% Coverage
0.0% Duplication

ladislas changed the base branch from develop to ladislas/feature/cleanup-makefile October 17, 2022 21:20

ladislas requested a review from YannLocatelli October 17, 2022 21:21

ladislas self-assigned this Oct 17, 2022

ladislas added the 01 - type: task Something to do label Oct 17, 2022

ladislas added this to the Future Release milestone Oct 17, 2022

YannLocatelli reviewed Oct 17, 2022

View reviewed changes

.vscode/settings.template.json Outdated Show resolved Hide resolved

libs/FirmwareKit/CMakeLists.txt Show resolved Hide resolved

libs/FirmwareKit/tests/FirmwareKit_test.cpp Outdated Show resolved Hide resolved

libs/FirmwareKit/tests/FirmwareKit_test.cpp Outdated Show resolved Hide resolved

Base automatically changed from ladislas/feature/cleanup-makefile to develop October 18, 2022 07:07

ladislas force-pushed the ladislas+yann/feature/cmake-generate-os_version branch from 33067ba to dd7fcab Compare October 18, 2022 07:07

YannLocatelli mentioned this pull request Oct 25, 2022

🔧 (version): FirmwareKit use os version generated from cmake #1025

Closed

5 tasks

YannLocatelli and others added 3 commits October 31, 2022 13:44

♻️ (version): Rename struct FirmwareVersion -> Version

8f6b2fa

🔧 (vscode): cmake-tools - Add OS_VERSION to config

804d013

🔧 (FirmwareKit): CMake - Generate os_version.h

08a81d9

ladislas force-pushed the ladislas+yann/feature/cmake-generate-os_version branch from 342f438 to bc6f020 Compare October 31, 2022 13:50

ladislas mentioned this pull request Oct 31, 2022

🔥 (firmwarekit): Remove getOSVersionFromFile #1072

Closed

🔥 (FirmwareKit): Remove method getOSVersionFromFile

9f3d097

ladislas force-pushed the ladislas+yann/feature/cmake-generate-os_version branch from bc6f020 to 9f3d097 Compare October 31, 2022 14:27

ladislas requested a review from YannLocatelli October 31, 2022 14:27

YannLocatelli approved these changes Oct 31, 2022

View reviewed changes

✨ (RobotKit): Link FirmwareUpdate's getCurrentVersion to RobotController

f857e15

ladislas force-pushed the ladislas+yann/feature/cmake-generate-os_version branch from c92cea1 to f857e15 Compare October 31, 2022 20:28

ladislas merged commit 9e98b42 into develop Oct 31, 2022

YannLocatelli deleted the ladislas+yann/feature/cmake-generate-os_version branch December 1, 2022 15:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ladislas+yann/feature/cmake generate os version #1069

ladislas+yann/feature/cmake generate os version #1069

ladislas commented Oct 17, 2022 •

edited

Loading

github-actions bot commented Oct 17, 2022 •

edited

Loading

github-actions bot commented Oct 17, 2022 •

edited

Loading

codecov bot commented Oct 17, 2022 •

edited

Loading

YannLocatelli left a comment

sonarcloud bot commented Oct 31, 2022

ladislas+yann/feature/cmake generate os version #1069

ladislas+yann/feature/cmake generate os version #1069

Conversation

ladislas commented Oct 17, 2022 • edited Loading

github-actions bot commented Oct 17, 2022 • edited Loading

File comparision analysis report

🔖 Info

📝 Summary

🗺️ Map files diff output

github-actions bot commented Oct 17, 2022 • edited Loading

File comparision analysis report

🔖 Info

📝 Summary

🗺️ Map files diff output

codecov bot commented Oct 17, 2022 • edited Loading

Codecov Report

YannLocatelli left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Oct 31, 2022

ladislas commented Oct 17, 2022 •

edited

Loading

github-actions bot commented Oct 17, 2022 •

edited

Loading

github-actions bot commented Oct 17, 2022 •

edited

Loading

codecov bot commented Oct 17, 2022 •

edited

Loading