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): Fix units for waiting loop + blink only in charge #590

Merged
merged 2 commits into from
Mar 17, 2022

Conversation

YannLocatelli
Copy link
Member

No description provided.

@YannLocatelli YannLocatelli self-assigned this Mar 16, 2022
@codecov
Copy link

codecov bot commented Mar 16, 2022

Codecov Report

Merging #590 (5385931) into develop (82d6507) will not change coverage.
The diff coverage is n/a.

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

@@            Coverage Diff            @@
##           develop      #590   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           85        85           
  Lines         1671      1671           
=========================================
  Hits          1671      1671           

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

@github-actions
Copy link

github-actions bot commented Mar 16, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 140204 (53%) 121940 (46%) 29512 (5%)
os 238280 (15%) 1326392 (84%) 26368 (5%)
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 ✔️ 238280 (11%) ø 26368 (5%) ø
bootloader ✔️ 140204 (6%) ø 29512 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ 250624 (11%) ø 29240 (5%) ø
certs_emc_ble_led_motors ✔️ 174568 (8%) ø 24952 (4%) ø
certs_emc_bt_lcd_qspi_rfid_touch_wifi ✔️ 148840 (7%) ø 22528 (4%) ø
certs_emc_lcd_led_motors ✔️ 91928 (4%) ø 16168 (3%) ø
hardware_motors_test_reduction_and_wheels ✔️ 177960 (8%) ø 24360 (4%) ø
spike_lk_ble ✔️ 174508 (8%) ø 24360 (4%) ø
spike_lk_bluetooth ✔️ 73256 (3%) ø 11448 (2%) ø
spike_lk_cg_animations ✔️ 141016 (6%) ø 24416 (4%) ø
spike_lk_color_kit ✔️ 65584 (3%) ø 13624 (2%) ø
spike_lk_coreled ✔️ 76164 (3%) ø 13688 (2%) ø
spike_lk_event_queue ✔️ 74736 (3%) ø 12072 (2%) ø
spike_lk_file_reception ✔️ 326904 (15%) ø 27576 (5%) ø
spike_lk_filesystem_kit ✔️ 103540 (4%) ø 14048 (2%) ø
spike_lk_flash_memory ✔️ 63880 (3%) ø 11448 (2%) ø
spike_lk_lcd ✔️ 142584 (6%) ø 23992 (4%) ø
spike_lk_led ✔️ 65744 (3%) ø 13392 (2%) ø
spike_lk_led_kit ✔️ 101516 (4%) ø 14640 (2%) ø
spike_lk_log_kit ✔️ 68528 (3%) ø 11912 (2%) ø
spike_lk_motors ✔️ 62528 (2%) ø 11488 (2%) ø
spike_lk_reinforcer ✔️ 72968 (3%) ø 14240 (2%) ø
spike_lk_rfid ✔️ 73072 (3%) ø 11448 (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 ✔️ 66968 (3%) ø 11424 (2%) ø
spike_lk_sensors_touch ✔️ 68600 (3%) ø 11432 (2%) ø
spike_lk_serial_number ✔️ 58560 (2%) ø 11424 (2%) ø
spike_lk_ticker_timeout ✔️ 69052 (3%) ø 11632 (2%) ø
spike_lk_update_process_app_base ✔️ 122724 (5%) ø 15288 (2%) ø
spike_lk_update_process_app_update ✔️ 77632 (3%) ø 12352 (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-03-17 13:36:44.571530713 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-03-17 13:36:44.815544949 +0000
@@ -1,20 +1,20 @@
 | Module                 |           .text |       .data |          .bss |
 |------------------------|-----------------|-------------|---------------|
-| [fill]                 |       172(+172) |       7(+7) |       32(+32) |
+| [fill]                 |       168(+168) |       7(+7) |       32(+32) |
 | [lib]/CoreBattery.a    |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a        |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/FileSystemKit.a  |       694(+694) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a       |     5898(+5898) |     16(+16) | 13816(+13816) |
 | [lib]/c.a              |   42360(+42360) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a            |     3276(+3276) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a |   72306(+72306) |   528(+528) | 10919(+10919) |
 | [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) |
 | default_bd.cpp.obj     |       242(+242) |       0(+0) |     568(+568) |
-| main.cpp.obj           |     1648(+1648) |       1(+1) |     636(+636) |
+| main.cpp.obj           |     1652(+1652) |       1(+1) |     636(+636) |
 | signing_keys.c.obj     |           0(+0) |       0(+0) |         0(+0) |
 | Subtotals              | 127316(+127316) | 3128(+3128) | 26096(+26096) |
 Total Static RAM memory (data + bss): 29224(+29224) bytes
 Total Flash memory (text + data): 130444(+130444) bytes
 

@github-actions
Copy link

github-actions bot commented Mar 16, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 140204 (53%) 121940 (46%) 29512 (5%)
os 247580 (15%) 1317092 (84%) 32376 (6%)
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 ✔️ 247580 (11%) ø 32376 (6%) ø
bootloader ✔️ 140204 (6%) ø 29512 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ 258168 (12%) ø 35272 (6%) ø
certs_emc_ble_led_motors ✔️ 191600 (9%) ø 30976 (5%) ø
certs_emc_bt_lcd_qspi_rfid_touch_wifi ✔️ 165248 (7%) ø 28680 (5%) ø
certs_emc_lcd_led_motors ✔️ 91928 (4%) ø 16168 (3%) ø
hardware_motors_test_reduction_and_wheels ✔️ 194032 (9%) ø 30384 (5%) ø
spike_lk_ble ✔️ 183968 (8%) ø 30376 (5%) ø
spike_lk_bluetooth ✔️ 91192 (4%) ø 17472 (3%) ø
spike_lk_cg_animations ✔️ 149224 (7%) ø 30416 (5%) ø
spike_lk_color_kit ✔️ 88800 (4%) ø 19624 (3%) ø
spike_lk_coreled ✔️ 88556 (4%) ø 19632 (3%) ø
spike_lk_event_queue ✔️ 84664 (4%) ø 18136 (3%) ø
spike_lk_file_reception ✔️ 331612 (15%) ø 33536 (6%) ø
spike_lk_filesystem_kit ✔️ 127740 (6%) ø 20216 (3%) ø
spike_lk_flash_memory ✔️ 87352 (4%) ø 17512 (3%) ø
spike_lk_lcd ✔️ 155544 (7%) ø 30064 (5%) ø
spike_lk_led ✔️ 88808 (4%) ø 19400 (3%) ø
spike_lk_led_kit ✔️ 109516 (5%) ø 20576 (3%) ø
spike_lk_log_kit ✔️ 92000 (4%) ø 18168 (3%) ø
spike_lk_motors ✔️ 86576 (4%) ø 17552 (3%) ø
spike_lk_reinforcer ✔️ 91808 (4%) ø 20232 (3%) ø
spike_lk_rfid ✔️ 91008 (4%) ø 17472 (3%) ø
spike_lk_sensors_battery ✔️ 87600 (4%) ø 18584 (3%) ø
spike_lk_sensors_light ✔️ 84584 (4%) ø 17512 (3%) ø
spike_lk_sensors_microphone ✔️ 85336 (4%) ø 17512 (3%) ø
spike_lk_sensors_temperature_humidity ✔️ 90896 (4%) ø 17496 (3%) ø
spike_lk_sensors_touch ✔️ 92248 (4%) ø 17632 (3%) ø
spike_lk_serial_number ✔️ 82400 (3%) ø 17544 (3%) ø
spike_lk_ticker_timeout ✔️ 83224 (3%) ø 17592 (3%) ø
spike_lk_update_process_app_base ✔️ 145204 (6%) ø 21352 (4%) ø
spike_lk_update_process_app_update ✔️ 100968 (4%) ø 18472 (3%) ø
spike_lk_wifi ✔️ 131280 (6%) ø 20832 (3%) ø
spike_mbed_blinky ✔️ 57968 (2%) ø 11400 (2%) ø
spike_mbed_watchdog_ticker_vs_thread ✔️ 84688 (4%) ø 18448 (3%) ø
spike_stl_cxxsupport ✔️ 84000 (4%) ø 17536 (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-03-17 13:36:52.709230201 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-03-17 13:36:52.933230281 +0000
@@ -1,20 +1,20 @@
 | Module                 |           .text |       .data |          .bss |
 |------------------------|-----------------|-------------|---------------|
-| [fill]                 |       172(+172) |       7(+7) |       32(+32) |
+| [fill]                 |       168(+168) |       7(+7) |       32(+32) |
 | [lib]/CoreBattery.a    |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a        |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/FileSystemKit.a  |       694(+694) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a       |     5898(+5898) |     16(+16) | 13816(+13816) |
 | [lib]/c.a              |   42360(+42360) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a            |     3276(+3276) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a |   72306(+72306) |   528(+528) | 10919(+10919) |
 | [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) |
 | default_bd.cpp.obj     |       242(+242) |       0(+0) |     568(+568) |
-| main.cpp.obj           |     1648(+1648) |       1(+1) |     636(+636) |
+| main.cpp.obj           |     1652(+1652) |       1(+1) |     636(+636) |
 | signing_keys.c.obj     |           0(+0) |       0(+0) |         0(+0) |
 | Subtotals              | 127316(+127316) | 3128(+3128) | 26096(+26096) |
 Total Static RAM memory (data + bss): 29224(+29224) bytes
 Total Flash memory (text + data): 130444(+130444) bytes
 

Copy link
Member

@ladislas ladislas left a comment

Choose a reason for hiding this comment

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

LGTM 👍
c'est quoi la diff entre level et voltage?

@YannLocatelli
Copy link
Member Author

Voltage est la tension de la batteries, généralement de 7.5V à 12.6V
Level est le niveau en pourcentage de 0 à 100

N.B. Level est dans l'interval de Voltage, 0% = 9.0V et 100% = 12.0V

@YannLocatelli YannLocatelli changed the title 🐛 (bootloader): While loop waiting enough fix units + blink only in charge 🐛 (bootloader): Fix units for waiting loop + blink only in charge Mar 17, 2022
@YannLocatelli YannLocatelli force-pushed the yann/bug/bootloader/exit-while-loop branch from 168a162 to 5385931 Compare March 17, 2022 11:35
@ladislas ladislas force-pushed the yann/bug/bootloader/exit-while-loop branch from 5385931 to e3a0b63 Compare March 17, 2022 13:23
@ladislas ladislas merged commit 3e56f94 into develop Mar 17, 2022
@ladislas ladislas deleted the yann/bug/bootloader/exit-while-loop branch March 17, 2022 13:24
@sonarcloud
Copy link

sonarcloud bot commented Mar 17, 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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants