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.

Sign up for GitHub

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

Jump to bottom

♻️ (os): Move still alive message to watchdog kick function #700

Merged
merged 3 commits into from
Apr 19, 2022
Merged

♻️ (os): Move still alive message to watchdog kick function #700

merged 3 commits into from
Apr 19, 2022

Conversation

ladislas
Copy link
Member

closes #674

@ladislas ladislas self-assigned this Apr 18, 2022
@ladislas ladislas added the 01 - type: task Something to do label Apr 18, 2022
@ladislas ladislas added this to the v1.0.0 milestone Apr 18, 2022
@codecov
Copy link

codecov bot commented Apr 18, 2022 •
edited
Loading

Codecov Report

Merging #700 (ffb5422) into develop (743a941) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #700   +/-   ##
========================================
  Coverage    94.38%   94.38%           
========================================
  Files          103      103           
  Lines         2208     2208           
========================================
  Hits          2084     2084           
  Misses         124      124

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

@github-actions
Copy link

github-actions bot commented Apr 18, 2022 •
edited
Loading

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 145244 (55%) 116900 (44%) 30048 (5%)
os 313792 (20%) 1250880 (79%) 38600 (7%)
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 ✔️ ❌ ❌ 313488 (14%)
313792 (14%)		 📈
304 (0%)		 38552 (7%)
38600 (7%)		 📈
48 (0%)
bootloader ✔️ ✅ ✅ 145244 (6%) ø 30048 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ ✅ ✅ 258248 (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_behavior_kit ✔️ ✅ ✅ 151960 (7%) ø 21648 (4%) ø
spike_lk_ble ✔️ ✅ ✅ 224788 (10%) ø 33568 (6%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 91192 (4%) ø 17472 (3%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 152104 (7%) ø 52488 (10%) ø
spike_lk_color_kit ✔️ ✅ ✅ 88992 (4%) ø 19744 (3%) ø
spike_lk_command_kit ✔️ ✅ ✅ 156752 (7%) ø 22560 (4%) ø
spike_lk_config_kit ✔️ ✅ ✅ 136740 (6%) ø 20368 (3%) ø
spike_lk_coreled ✔️ ✅ ✅ 88556 (4%) ø 19632 (3%) ø
spike_lk_event_queue ✔️ ✅ ✅ 84664 (4%) ø 18136 (3%) ø
spike_lk_file_manager_kit ✔️ ✅ ✅ 127820 (6%) ø 20216 (3%) ø
spike_lk_file_reception ✔️ ✅ ✅ 331692 (15%) ø 33536 (6%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 87352 (4%) ø 17512 (3%) ø
spike_lk_lcd ✔️ ✅ ✅ 158728 (7%) ø 52136 (9%) ø
spike_lk_led ✔️ ✅ ✅ 88808 (4%) ø 19400 (3%) ø
spike_lk_led_kit ✔️ ✅ ✅ 115724 (5%) ø 20608 (3%) ø
spike_lk_log_kit ✔️ ✅ ✅ 85016 (4%) ø 18512 (3%) ø
spike_lk_motors ✔️ ✅ ✅ 86576 (4%) ø 17552 (3%) ø
spike_lk_reinforcer ✔️ ✅ ✅ 111852 (5%) ø 20608 (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 ✔️ ✅ ✅ 82752 (3%) ø 17648 (3%) ø
spike_lk_ticker_timeout ✔️ ✅ ✅ 83224 (3%) ø 17592 (3%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 145268 (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
LekaOS (click to expand) 
--- build_artifacts/base_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-04-19 20:28:08.474879485 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-04-19 20:28:08.826884091 +0000
@@ -1,39 +1,39 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       484(+484) |     13(+13) |     145(+145) |
+| [fill]                  |       532(+532) |     13(+13) |     149(+149) |
 | [lib]/BLEKit.a          |     1198(+1198) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a      |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a     |     1228(+1228) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a        |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a      |     2216(+2216) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a     |       472(+472) |       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]/CoreSPI.a         |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a     |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       812(+812) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a     |       172(+172) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a          |   19198(+19198) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/Utils.a           |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     1282(+1282) |     12(+12) |     132(+132) |
 | [lib]/c.a               |   42284(+42284) | 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  | 161378(+161378) |   769(+769) | 19647(+19647) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |     5864(+5864) |       8(+8) |       44(+44) |
-| main.cpp.obj            |   40146(+40146) |   510(+510) | 14267(+14267) |
-| Subtotals               | 287464(+287464) | 3888(+3888) | 34360(+34360) |
-Total Static RAM memory (data + bss): 38248(+38248) bytes
-Total Flash memory (text + data): 291352(+291352) bytes
+| main.cpp.obj            |   40418(+40418) |   510(+510) | 14311(+14311) |
+| Subtotals               | 287784(+287784) | 3888(+3888) | 34408(+34408) |
+Total Static RAM memory (data + bss): 38296(+38296) bytes
+Total Flash memory (text + data): 291672(+291672) bytes
 
Flash used: 313792 (14%) / total: 2097152
SRAM used: 38600 (7%) / total: 524288

@github-actions
Copy link

github-actions bot commented Apr 18, 2022 •
edited
Loading

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 145244 (55%) 116900 (44%) 30048 (5%)
os 294756 (18%) 1269916 (81%) 32392 (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 ✔️ ❌ ❌ 294564 (14%)
294756 (14%)		 📈
192 (0%)		 32360 (6%)
32392 (6%)		 📈
32 (0%)
bootloader ✔️ ✅ ✅ 145244 (6%) ø 30048 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ ✅ ✅ 250688 (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_behavior_kit ✔️ ✅ ✅ 142592 (6%) ø 15704 (2%) ø
spike_lk_ble ✔️ ✅ ✅ 215120 (10%) ø 27496 (5%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 73256 (3%) ø 11448 (2%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 143832 (6%) ø 46488 (8%) ø
spike_lk_color_kit ✔️ ✅ ✅ 65712 (3%) ø 13744 (2%) ø
spike_lk_command_kit ✔️ ✅ ✅ 144856 (6%) ø 16360 (3%) ø
spike_lk_config_kit ✔️ ✅ ✅ 124204 (5%) ø 14312 (2%) ø
spike_lk_coreled ✔️ ✅ ✅ 76164 (3%) ø 13688 (2%) ø
spike_lk_event_queue ✔️ ✅ ✅ 74736 (3%) ø 12072 (2%) ø
spike_lk_file_manager_kit ✔️ ✅ ✅ 103604 (4%) ø 14048 (2%) ø
spike_lk_file_reception ✔️ ✅ ✅ 326984 (15%) ø 27576 (5%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 63880 (3%) ø 11448 (2%) ø
spike_lk_lcd ✔️ ✅ ✅ 145768 (6%) ø 46064 (8%) ø
spike_lk_led ✔️ ✅ ✅ 65744 (3%) ø 13392 (2%) ø
spike_lk_led_kit ✔️ ✅ ✅ 103220 (4%) ø 14664 (2%) ø
spike_lk_log_kit ✔️ ✅ ✅ 63736 (3%) ø 12256 (2%) ø
spike_lk_motors ✔️ ✅ ✅ 62528 (2%) ø 11488 (2%) ø
spike_lk_reinforcer ✔️ ✅ ✅ 101996 (4%) ø 14664 (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 ✔️ ✅ ✅ 58904 (2%) ø 11464 (2%) ø
spike_lk_ticker_timeout ✔️ ✅ ✅ 69052 (3%) ø 11632 (2%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 122788 (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
LekaOS (click to expand) 
--- build_artifacts/base_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-04-19 20:27:42.714534847 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-04-19 20:27:43.026528030 +0000
@@ -1,39 +1,39 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       506(+506) |     13(+13) |     141(+141) |
+| [fill]                  |       518(+518) |     13(+13) |     137(+137) |
 | [lib]/BLEKit.a          |     1198(+1198) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a      |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a     |     1228(+1228) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a        |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a      |     1716(+1716) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a     |       472(+472) |       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]/CoreSPI.a         |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a     |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a  |       812(+812) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a     |       172(+172) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a          |   19198(+19198) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a |       160(+160) |       0(+0) |         0(+0) |
 | [lib]/Utils.a           |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/bootutil.a        |     1282(+1282) |     12(+12) |     132(+132) |
 | [lib]/c.a               |   42396(+42396) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a             |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a               |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  | 157854(+157854) |   769(+769) | 19611(+19611) |
 | [lib]/misc              |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a           |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a          |     5444(+5444) |       8(+8) |       44(+44) |
-| main.cpp.obj            |   27520(+27520) |   510(+510) |   8115(+8115) |
-| Subtotals               | 270168(+270168) | 3888(+3888) | 28168(+28168) |
-Total Static RAM memory (data + bss): 32056(+32056) bytes
-Total Flash memory (text + data): 274056(+274056) bytes
+| main.cpp.obj            |   27700(+27700) |   510(+510) |   8151(+8151) |
+| Subtotals               | 270360(+270360) | 3888(+3888) | 28200(+28200) |
+Total Static RAM memory (data + bss): 32088(+32088) bytes
+Total Flash memory (text + data): 274248(+274248) bytes
 
Flash used: 294756 (14%) / total: 2097152
SRAM used: 32392 (6%) / total: 524288

@ladislas ladislas force-pushed the ladislas/feature/674-still-alive-inside-watchdog branch from 911e9a5 to c26aa48 Compare April 19, 2022 10:37
@ladislas ladislas requested a review from HPezz April 19, 2022 11:15
YannLocatelli
YannLocatelli reviewed Apr 19, 2022
View reviewed changes
app/os/main.cpp Outdated Show resolved Hide resolved
app/os/main.cpp Outdated Show resolved Hide resolved
app/os/main.cpp Show resolved Hide resolved
@ladislas ladislas force-pushed the ladislas/feature/674-still-alive-inside-watchdog branch 2 times, most recently from 53ed09b to 3c81b7e Compare April 19, 2022 20:04
@ladislas ladislas force-pushed the ladislas/feature/674-still-alive-inside-watchdog branch from 3c81b7e to ffb5422 Compare April 19, 2022 20:20
@sonarcloud
Copy link

sonarcloud bot commented Apr 19, 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
0.0% 0.0% Duplication

@ladislas ladislas merged commit cc0e72d into develop Apr 19, 2022
@ladislas ladislas deleted the ladislas/feature/674-still-alive-inside-watchdog branch May 9, 2022 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YannLocatelli YannLocatelli YannLocatelli left review comments

@HPezz HPezz Awaiting requested review from HPezz

Assignees

@ladislas ladislas

Labels
01 - type: task Something to do
Projects
None yet
Milestone
v1.0.0
Development

Successfully merging this pull request may close these issues.

Log "still alive" on watchdog kick
2 participants
@ladislas @YannLocatelli