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

ladislas/feature/add fs structure and tools #871

Merged
merged 14 commits into from
Jun 14, 2022

Conversation

ladislas
Copy link
Member

@ladislas ladislas commented Jun 13, 2022

  • 🧱 (fs): Add /fs directory structure
  • 🩺 (fs): Add fs content control spike
  • 🩺 (fs): Add script to control fs content on device
  • 🍱 (fs): usr/test - Add files for functional testing

@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
@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 6b0d3de to 462738c Compare June 13, 2022 11:28
@codecov
Copy link

codecov bot commented Jun 13, 2022

Codecov Report

Merging #871 (cd11a82) into develop (51ec038) will not change coverage.
The diff coverage is n/a.

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

@@           Coverage Diff            @@
##           develop     #871   +/-   ##
========================================
  Coverage    95.36%   95.36%           
========================================
  Files          115      115           
  Lines         2568     2568           
========================================
  Hits          2449     2449           
  Misses         119      119           
Impacted Files Coverage Δ
libs/BehaviorKit/source/BehaviorKit.cpp 100.00% <0.00%> (ø)

📣 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 167668 (63%) 94476 (36%) 30856 (5%)
os 397660 (25%) 1167012 (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 ✔️ 397644 (18%)
397660 (18%)
📈
16 (0%)
80776 (15%) ø
bootloader ✔️ 167668 (7%) ø 30856 (5%) ø
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 ✔️ 196036 (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 ✔️ 331052 (15%)
331036 (15%)
📉
-16 (0%)
34072 (6%) ø
spike_lk_flash_memory ✔️ 86712 (4%) ø 18056 (3%) ø
spike_lk_fs - - 170896 (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-14 16:19:22.439087396 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/bootloader-map.txt	2022-06-14 16:19:22.751088097 +0000
@@ -1,26 +1,26 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       168(+168) |       8(+8) |       55(+55) |
+| [fill]                  |       172(+172) |       8(+8) |       55(+55) |
 | [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               |   42256(+42256) | 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]/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            |     4094(+4094) |     24(+24) |   1525(+1525) |
+| main.cpp.obj            |     4090(+4090) |     24(+24) |   1525(+1525) |
 | 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
 
spike_lk_fs (click to expand)

Flash used: 170896&nbsp;(8%) / total: 2097152
SRAM used: 47968&nbsp;(9%) / 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 168372 (64%) 93772 (35%) 30760 (5%)
os 363272 (23%) 1201400 (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 ✔️ 363256 (17%)
363272 (17%)
📈
16 (0%)
73720 (14%) ø
bootloader ✔️ 168372 (8%) ø 30760 (5%) ø
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 ✔️ 187536 (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 ✔️ 124204 (5%)
124188 (5%)
📉
-16 (0%)
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 ✔️ 326984 (15%)
326968 (15%)
📉
-16 (0%)
27576 (5%) ø
spike_lk_flash_memory ✔️ 63880 (3%) ø 11448 (2%) ø
spike_lk_fs - - 171600 (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 ✔️ 122788 (5%)
122804 (5%)
📈
16 (0%)
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-14 16:18:35.930475030 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/bootloader-map.txt	2022-06-14 16:18:36.138479198 +0000
@@ -1,26 +1,26 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       224(+224) |       8(+8) |       47(+47) |
+| [fill]                  |       228(+228) |       8(+8) |       47(+47) |
 | [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]/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            |     4094(+4094) |     24(+24) |   1525(+1525) |
+| main.cpp.obj            |     4090(+4090) |     24(+24) |   1525(+1525) |
 | 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
 
spike_lk_fs (click to expand)

Flash used: 171600&nbsp;(8%) / total: 2097152
SRAM used: 47880&nbsp;(9%) / total: 524288

@lgtm-com
Copy link

lgtm-com bot commented Jun 13, 2022

This pull request introduces 1 alert when merging 462738c into 0f389b3 - view on LGTM.com

new alerts:

  • 1 for Unused import

@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 462738c to 38b9067 Compare June 13, 2022 11:46
@lgtm-com
Copy link

lgtm-com bot commented Jun 13, 2022

This pull request introduces 1 alert when merging 38b9067 into 0f389b3 - view on LGTM.com

new alerts:

  • 1 for Unused import

@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 38b9067 to cd11a82 Compare June 13, 2022 12:50
@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch 2 times, most recently from 2b7af08 to 6a0c2dc Compare June 14, 2022 15:08
@@ -91,7 +91,7 @@ namespace factory_reset {

namespace internal {

constexpr auto factory_reset_counter_path = "/fs/conf/factory_reset_counter";
constexpr auto factory_reset_counter_path = "/fs/etc/factory_reset_counter";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
constexpr auto factory_reset_counter_path = "/fs/etc/factory_reset_counter";
constexpr auto factory_reset_counter_path = "/fs/usr/share/factory_reset_counter";

Copy link
Member

Choose a reason for hiding this comment

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

  • the same variable in os/main.cpp

@@ -156,10 +156,10 @@ namespace factory_reset {

namespace config {

auto bootloader_version = Config {"/fs/conf/bootloader_version", bootloader::version};
auto bootloader_version = Config {"/fs/etc/bootloader_version", bootloader::version};
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
auto bootloader_version = Config {"/fs/etc/bootloader_version", bootloader::version};
auto bootloader_version = Config {"/fs/sys/bootloader-version", bootloader::version};

@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 6a0c2dc to 4e3a4c4 Compare June 14, 2022 16:00
@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 4e3a4c4 to 50c12de Compare June 14, 2022 16:03
@ladislas ladislas force-pushed the ladislas/feature/add-fs-structure-and-tools branch from 50c12de to 0a297b2 Compare June 14, 2022 16:11
@ladislas ladislas merged commit b3c1d8a into develop Jun 14, 2022
@sonarcloud
Copy link

sonarcloud bot commented Jun 14, 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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@ladislas ladislas deleted the ladislas/feature/add-fs-structure-and-tools branch June 26, 2022 12:00
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.

2 participants