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.

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

🩺 (bootloader): Add watchdog + LogKit #874

Merged
merged 1 commit into from
Jun 15, 2022

Conversation

ladislas
Copy link
Member

No description provided.

@ladislas ladislas requested review from YannLocatelli and HPezz and removed request for YannLocatelli June 13, 2022 14:34
@ladislas ladislas self-assigned this Jun 13, 2022
@ladislas ladislas added the 01 - type: task Something to do label Jun 13, 2022
@ladislas ladislas added this to the v1.0.0 milestone Jun 13, 2022
@codecov
Copy link

codecov bot commented Jun 13, 2022

Codecov Report

Merging #874 (8e55304) into develop (9205d9f) will not change coverage.
The diff coverage is n/a.

❗ Current head 8e55304 differs from pull request most recent head a12ed33. Consider uploading reports for the commit a12ed33 to get more accurate results

@@           Coverage Diff            @@
##           develop     #874   +/-   ##
========================================
  Coverage    95.36%   95.36%           
========================================
  Files          115      115           
  Lines         2567     2567           
========================================
  Hits          2448     2448           
  Misses         119      119           

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@github-actions
Copy link

github-actions bot commented Jun 13, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 170748 (65%) 91396 (34%) 31096 (5%)
os 363544 (23%) 1201128 (76%) 73720 (14%)
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 ✔️ 363544 (17%) ø 73720 (14%) ø
bootloader ✔️ 168372 (8%)
170748 (8%)
📈
2376 (1%)
30760 (5%)
31096 (5%)
📈
336 (1%)
certs_emc_ble_bt_lcd_led_motors ✔️ 250704 (11%) ø 29240 (5%) ø
certs_emc_ble_led_motors ✔️ 174584 (8%) ø 24952 (4%) ø
certs_emc_bt_lcd_qspi_rfid_touch_wifi ✔️ 148840 (7%) ø 22528 (4%) ø
certs_emc_lcd_led_motors ✔️ 92008 (4%) ø 16168 (3%) ø
hardware_motors_test_reduction_and_wheels ✔️ 177976 (8%) ø 24360 (4%) ø
spike_lk_behavior_kit ✔️ 187568 (8%) ø 48112 (9%) ø
spike_lk_ble ✔️ 225792 (10%) ø 28056 (5%) ø
spike_lk_bluetooth ✔️ 73256 (3%) ø 11448 (2%) ø
spike_lk_cg_animations ✔️ 144632 (6%) ø 46528 (8%) ø
spike_lk_color_kit ✔️ 65712 (3%) ø 13744 (2%) ø
spike_lk_command_kit ✔️ 189760 (9%) ø 50928 (9%) ø
spike_lk_config_kit ✔️ 124188 (5%) ø 14312 (2%) ø
spike_lk_coreled ✔️ 76164 (3%) ø 13688 (2%) ø
spike_lk_event_queue ✔️ 74736 (3%) ø 12072 (2%) ø
spike_lk_file_manager_kit ✔️ 128680 (6%) ø 14384 (2%) ø
spike_lk_file_reception ✔️ 326968 (15%) ø 27576 (5%) ø
spike_lk_flash_memory ✔️ 63880 (3%) ø 11448 (2%) ø
spike_lk_fs ✔️ 171728 (8%) ø 47880 (9%) ø
spike_lk_lcd ✔️ 167468 (7%) ø 47320 (9%) ø
spike_lk_led ✔️ 65744 (3%) ø 13392 (2%) ø
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_reinforcer ✔️ 103480 (4%) ø 14608 (2%) ø
spike_lk_rfid ✔️ 78644 (3%) ø 11504 (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 ✔️ 58904 (2%) ø 11464 (2%) ø
spike_lk_ticker_timeout ✔️ 69052 (3%) ø 11632 (2%) ø
spike_lk_update_process_app_base ✔️ 122804 (5%) ø 15288 (2%) ø
spike_lk_update_process_app_update ✔️ 77632 (3%) ø 12352 (2%) ø
spike_lk_watchdog_isr ✔️ 79964 (3%) ø 13296 (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
bootloader (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-06-15 12:46:31.065181584 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-06-15 12:46:31.313189871 +0000
@@ -1,26 +1,26 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       228(+228) |       8(+8) |       47(+47) |
+| [fill]                  |       176(+176) |       8(+8) |       46(+46) |
 | [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  |       808(+808) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a     |       172(+172) |       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  |   74686(+74686) |   528(+528) | 10995(+10995) |
+| [lib]/mbed-os-static.a  |   76634(+76634) |   528(+528) | 11019(+11019) |
 | [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            |     4090(+4090) |     24(+24) |   1525(+1525) |
+| main.cpp.obj            |     4498(+4498) |     24(+24) |   1838(+1838) |
 | signing_keys.c.obj      |           0(+0) |       0(+0) |         0(+0) |
-| Subtotals               | 149576(+149576) | 3168(+3168) | 27280(+27280) |
-Total Static RAM memory (data + bss): 30448(+30448) bytes
-Total Flash memory (text + data): 152744(+152744) bytes
+| Subtotals               | 151880(+151880) | 3168(+3168) | 27616(+27616) |
+Total Static RAM memory (data + bss): 30784(+30784) bytes
+Total Flash memory (text + data): 155048(+155048) bytes
 
Flash used: 170748 (8%) / total: 2097152
SRAM used: 31096 (5%) / total: 524288

@github-actions
Copy link

github-actions bot commented Jun 13, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 181556 (69%) 80588 (30%) 37672 (7%)
os 397932 (25%) 1166740 (74%) 80776 (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 ✔️ 397932 (18%) ø 80776 (15%) ø
bootloader ✔️ 167668 (7%)
181556 (8%)
📈
13888 (8%)
30856 (5%)
37672 (7%)
📈
6816 (22%)
certs_emc_ble_bt_lcd_led_motors ✔️ 257608 (12%) ø 35872 (6%) ø
certs_emc_ble_led_motors ✔️ 190960 (9%) ø 31512 (6%) ø
certs_emc_bt_lcd_qspi_rfid_touch_wifi ✔️ 164608 (7%) ø 29344 (5%) ø
certs_emc_lcd_led_motors ✔️ 91304 (4%) ø 16264 (3%) ø
hardware_motors_test_reduction_and_wheels ✔️ 193408 (9%) ø 30920 (5%) ø
spike_lk_behavior_kit ✔️ 196052 (9%) ø 54528 (10%) ø
spike_lk_ble ✔️ 233676 (11%) ø 34712 (6%) ø
spike_lk_bluetooth ✔️ 90616 (4%) ø 18016 (3%) ø
spike_lk_cg_animations ✔️ 152200 (7%) ø 53064 (10%) ø
spike_lk_color_kit ✔️ 88352 (4%) ø 20216 (3%) ø
spike_lk_command_kit ✔️ 199956 (9%) ø 57856 (11%) ø
spike_lk_config_kit ✔️ 136100 (6%) ø 20976 (4%) ø
spike_lk_coreled ✔️ 87916 (4%) ø 20104 (3%) ø
spike_lk_event_queue ✔️ 84088 (4%) ø 18744 (3%) ø
spike_lk_file_manager_kit ✔️ 143648 (6%) ø 21304 (4%) ø
spike_lk_file_reception ✔️ 331036 (15%) ø 34072 (6%) ø
spike_lk_flash_memory ✔️ 86712 (4%) ø 18056 (3%) ø
spike_lk_fs ✔️ 171024 (8%) ø 47968 (9%) ø
spike_lk_lcd ✔️ 177100 (8%) ø 53992 (10%) ø
spike_lk_led ✔️ 88168 (4%) ø 19872 (3%) ø
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_reinforcer ✔️ 112188 (5%) ø 21024 (4%) ø
spike_lk_rfid ✔️ 84512 (4%) ø 18032 (3%) ø
spike_lk_sensors_battery ✔️ 86960 (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 ✔️ 82176 (3%) ø 18320 (3%) ø
spike_lk_ticker_timeout ✔️ 82584 (3%) ø 18072 (3%) ø
spike_lk_update_process_app_base ✔️ 144644 (6%) ø 21896 (4%) ø
spike_lk_update_process_app_update ✔️ 100328 (4%) ø 19080 (3%) ø
spike_lk_watchdog_isr ✔️ 88152 (4%) ø 20120 (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
bootloader (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-06-15 12:47:17.459133665 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-06-15 12:47:17.687131777 +0000
@@ -1,26 +1,28 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       172(+172) |       8(+8) |       55(+55) |
+| [fill]                  |       244(+244) |       8(+8) |       66(+66) |
 | [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  |       808(+808) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a     |       172(+172) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     6022(+6022) |     16(+16) | 13816(+13816) |
-| [lib]/c.a               |   42256(+42256) | 2572(+2572) |       97(+97) |
+| [lib]/c.a               |   42144(+42144) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     7148(+7148) |       0(+0) |         0(+0) |
-| [lib]/mbed-os-static.a  |   75142(+75142) |   528(+528) | 11083(+11083) |
+| [lib]/m.a               |       360(+360) |       0(+0) |         0(+0) |
+| [lib]/mbed-os-static.a  |   83696(+83696) |   528(+528) | 11143(+11143) |
 | [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) |
+| [lib]/stdc++.a          |   11476(+11476) |     16(+16) |     204(+204) |
 | default_bd.cpp.obj      |       242(+242) |       0(+0) |     568(+568) |
-| main.cpp.obj            |     4090(+4090) |     24(+24) |   1525(+1525) |
+| main.cpp.obj            |     6876(+6876) |     24(+24) |   8270(+8270) |
 | signing_keys.c.obj      |           0(+0) |       0(+0) |         0(+0) |
-| Subtotals               | 148872(+148872) | 3168(+3168) | 27376(+27376) |
-Total Static RAM memory (data + bss): 30544(+30544) bytes
-Total Flash memory (text + data): 152040(+152040) bytes
+| Subtotals               | 161048(+161048) | 3168(+3168) | 34192(+34192) |
+Total Static RAM memory (data + bss): 37360(+37360) bytes
+Total Flash memory (text + data): 164216(+164216) bytes
 
Flash used: 181556 (8%) / total: 2097152
SRAM used: 37672 (7%) / total: 524288

@ladislas ladislas force-pushed the ladislas/feature/bootloader-watchdog-logkit branch from dc191f1 to f4f127c Compare June 14, 2022 22:17
Copy link
Member

@YannLocatelli YannLocatelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update test validated with 12000ms, ok for 1min ✅

@ladislas ladislas force-pushed the ladislas/feature/bootloader-watchdog-logkit branch from f4f127c to 72588df Compare June 15, 2022 10:11
@YannLocatelli YannLocatelli force-pushed the ladislas/feature/bootloader-watchdog-logkit branch from 72588df to 4e721d2 Compare June 15, 2022 12:07
@ladislas ladislas force-pushed the ladislas/feature/bootloader-watchdog-logkit branch from 8e55304 to a12ed33 Compare June 15, 2022 12:57
@ladislas ladislas merged commit 8e10899 into develop Jun 15, 2022
@ladislas ladislas deleted the ladislas/feature/bootloader-watchdog-logkit branch June 15, 2022 12:57
@sonarcloud
Copy link

sonarcloud bot commented Jun 15, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
01 - type: task Something to do
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discussion - LogKit in the bootloader Discussion - Watchdog in bootloader
2 participants