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

🏗 (file): Replace FIL by interface::File in Video #580

Merged
merged 2 commits into from
Mar 15, 2022

Conversation

YannLocatelli
Copy link
Member

No description provided.

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

codecov bot commented Mar 15, 2022

Codecov Report

Merging #580 (acba950) into develop (9462af2) will not change coverage.
The diff coverage is 100.00%.

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

@@            Coverage Diff            @@
##           develop      #580   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          108       107    -1     
  Lines         1689      1690    +1     
=========================================
+ Hits          1689      1690    +1     
Impacted Files Coverage Δ
drivers/CoreVideo/source/CoreJPEG.cpp 100.00% <100.00%> (ø)
drivers/CoreVideo/source/CoreVideo.cpp 100.00% <100.00%> (ø)
libs/LedKit/include/internal/LEDAnimation.h 100.00% <0.00%> (ø)
include/interface/platform/FatFs.h

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

@github-actions
Copy link

github-actions bot commented Mar 15, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 140204 (53%) 121940 (46%) 29512 (5%)
os 213016 (13%) 1351656 (86%) 25136 (4%)
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 ✔️ 213016 (10%) ø 25136 (4%) ø
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 ✔️ 141176 (6%)
141016 (6%)
📉
-160 (0%)
24464 (4%)
24416 (4%)
📉
-48 (0%)
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 ✔️ 103476 (4%) ø 14048 (2%) ø
spike_lk_flash_memory ✔️ 63880 (3%) ø 11448 (2%) ø
spike_lk_lcd ✔️ 137552 (6%)
142584 (6%)
📈
5032 (3%)
24016 (4%)
23992 (4%)
📉
-24 (0%)
spike_lk_led ✔️ 65744 (3%) ø 13392 (2%) ø
spike_lk_led_kit ✔️ 101132 (4%) ø 14640 (2%) ø
spike_lk_log_kit ✔️ 68528 (3%) ø 11912 (2%) ø
spike_lk_motors ✔️ 62528 (2%) ø 11488 (2%) ø
spike_lk_reinforcer ✔️ 73032 (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
spike_lk_cg_animations (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-OFF/spike_lk_cg_animations-map.txt	2022-03-15 22:57:10.833162913 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/spike_lk_cg_animations-map.txt	2022-03-15 22:57:11.021164436 +0000
@@ -1,19 +1,18 @@
 | Module                 |           .text |       .data |          .bss |
 |------------------------|-----------------|-------------|---------------|
-| [fill]                 |       150(+150) |       7(+7) |       38(+38) |
-| [lib]/CoreFs.a         |         40(+40) |       0(+0) |         0(+0) |
+| [fill]                 |       180(+180) |       3(+3) |       38(+38) |
 | [lib]/CoreSTM32Hal.a   |       826(+826) |       0(+0) |         0(+0) |
-| [lib]/CoreVideo.a      |     6502(+6502) |       1(+1) |   4160(+4160) |
+| [lib]/CoreVideo.a      |     6484(+6484) |       1(+1) |   4160(+4160) |
 | [lib]/HelloWorld.a     |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/UIAnimationKit.a |       540(+540) |       0(+0) |         0(+0) |
 | [lib]/c.a              |   36984(+36984) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a            |     7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a |   60492(+60492) |   460(+460) | 10269(+10269) |
 | [lib]/misc             |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a          |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a         |     5356(+5356) |       8(+8) |       44(+44) |
-| main.cpp.obj           |       976(+976) |     52(+52) |   6436(+6436) |
-| Subtotals              | 119328(+119328) | 3104(+3104) | 21072(+21072) |
-Total Static RAM memory (data + bss): 24176(+24176) bytes
-Total Flash memory (text + data): 122432(+122432) bytes
+| main.cpp.obj           |       940(+940) |       8(+8) |   6436(+6436) |
+| Subtotals              | 119264(+119264) | 3056(+3056) | 21072(+21072) |
+Total Static RAM memory (data + bss): 24128(+24128) bytes
+Total Flash memory (text + data): 122320(+122320) bytes
 
Flash used: 141016&nbsp;(6%) / total: 2097152
SRAM used: 24416&nbsp;(4%) / total: 524288
spike_lk_lcd (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-OFF/spike_lk_lcd-map.txt	2022-03-15 22:57:13.649185718 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/spike_lk_lcd-map.txt	2022-03-15 22:57:13.837187240 +0000
@@ -1,18 +1,18 @@
 | Module                 |           .text |       .data |          .bss |
 |------------------------|-----------------|-------------|---------------|
-| [fill]                 |       154(+154) |       7(+7) |       30(+30) |
-| [lib]/CoreFs.a         |         40(+40) |       0(+0) |         0(+0) |
+| [fill]                 |       178(+178) |       3(+3) |       34(+34) |
 | [lib]/CoreSTM32Hal.a   |       826(+826) |       0(+0) |         0(+0) |
-| [lib]/CoreVideo.a      |     6552(+6552) |       1(+1) |   4160(+4160) |
+| [lib]/CoreVideo.a      |     6534(+6534) |       1(+1) |   4160(+4160) |
+| [lib]/FileSystemKit.a  |       694(+694) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a     |         94(+94) |       0(+0) |         0(+0) |
-| [lib]/c.a              |   36984(+36984) | 2572(+2572) |       97(+97) |
+| [lib]/c.a              |   40940(+40940) | 2572(+2572) |       97(+97) |
 | [lib]/gcc.a            |     7148(+7148) |       0(+0) |         0(+0) |
-| [lib]/mbed-os-static.a |   57186(+57186) |   460(+460) | 10269(+10269) |
+| [lib]/mbed-os-static.a |   57546(+57546) |   460(+460) | 10269(+10269) |
 | [lib]/misc             |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a          |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a         |     5356(+5356) |       8(+8) |       44(+44) |
-| main.cpp.obj           |     1184(+1184) |     52(+52) |   5996(+5996) |
-| Subtotals              | 115744(+115744) | 3104(+3104) | 20624(+20624) |
-Total Static RAM memory (data + bss): 23728(+23728) bytes
-Total Flash memory (text + data): 118848(+118848) bytes
+| main.cpp.obj           |     1188(+1188) |     16(+16) |   6008(+6008) |
+| Subtotals              | 120724(+120724) | 3064(+3064) | 20640(+20640) |
+Total Static RAM memory (data + bss): 23704(+23704) bytes
+Total Flash memory (text + data): 123788(+123788) bytes
 
Flash used: 142584&nbsp;(6%) / total: 2097152
SRAM used: 23992&nbsp;(4%) / total: 524288

@github-actions
Copy link

github-actions bot commented Mar 15, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 140204 (53%) 121940 (46%) 29512 (5%)
os 222508 (14%) 1342164 (85%) 31144 (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 ✔️ 222508 (10%) ø 31144 (5%) ø
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 ✔️ 149448 (7%)
149224 (7%)
📉
-224 (0%)
30464 (5%)
30416 (5%)
📉
-48 (0%)
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 ✔️ 127580 (6%) ø 20216 (3%) ø
spike_lk_flash_memory ✔️ 87352 (4%) ø 17512 (3%) ø
spike_lk_lcd ✔️ 150432 (7%)
155544 (7%)
📈
5112 (3%)
30088 (5%)
30064 (5%)
📉
-24 (0%)
spike_lk_led ✔️ 88808 (4%) ø 19400 (3%) ø
spike_lk_led_kit ✔️ 109196 (5%) ø 20576 (3%) ø
spike_lk_log_kit ✔️ 92000 (4%) ø 18168 (3%) ø
spike_lk_motors ✔️ 86576 (4%) ø 17552 (3%) ø
spike_lk_reinforcer ✔️ 91872 (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
spike_lk_cg_animations (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-ON/spike_lk_cg_animations-map.txt	2022-03-15 22:58:01.622331503 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/spike_lk_cg_animations-map.txt	2022-03-15 22:58:01.830332715 +0000
@@ -1,21 +1,20 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       214(+214) |       7(+7) |       42(+42) |
-| [lib]/CoreFs.a          |         40(+40) |       0(+0) |         0(+0) |
+| [fill]                  |       180(+180) |       3(+3) |       42(+42) |
 | [lib]/CoreSTM32Hal.a    |       826(+826) |       0(+0) |         0(+0) |
-| [lib]/CoreVideo.a       |     6502(+6502) |       1(+1) |   4160(+4160) |
+| [lib]/CoreVideo.a       |     6484(+6484) |       1(+1) |   4160(+4160) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/UIAnimationKit.a  |       508(+508) |       0(+0) |         0(+0) |
 | [lib]/c.a               |   37008(+37008) | 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  |   64032(+64032) |   460(+460) | 10305(+10305) |
 | [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            |     3176(+3176) |     52(+52) | 12396(+12396) |
-| Subtotals               | 126000(+126000) | 3104(+3104) | 27072(+27072) |
-Total Static RAM memory (data + bss): 30176(+30176) bytes
-Total Flash memory (text + data): 129104(+129104) bytes
+| main.cpp.obj            |     3140(+3140) |       8(+8) | 12396(+12396) |
+| Subtotals               | 125872(+125872) | 3056(+3056) | 27072(+27072) |
+Total Static RAM memory (data + bss): 30128(+30128) bytes
+Total Flash memory (text + data): 128928(+128928) bytes
 
Flash used: 149224&nbsp;(7%) / total: 2097152
SRAM used: 30416&nbsp;(5%) / total: 524288
spike_lk_lcd (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-ON/spike_lk_lcd-map.txt	2022-03-15 22:58:04.690349380 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/spike_lk_lcd-map.txt	2022-03-15 22:58:04.902350616 +0000
@@ -1,20 +1,20 @@
 | Module                  |           .text |       .data |          .bss |
 |-------------------------|-----------------|-------------|---------------|
-| [fill]                  |       230(+230) |       7(+7) |       34(+34) |
-| [lib]/CoreFs.a          |         40(+40) |       0(+0) |         0(+0) |
+| [fill]                  |       206(+206) |       3(+3) |       38(+38) |
 | [lib]/CoreSTM32Hal.a    |       826(+826) |       0(+0) |         0(+0) |
-| [lib]/CoreVideo.a       |     6568(+6568) |       1(+1) |   4160(+4160) |
+| [lib]/CoreVideo.a       |     6550(+6550) |       1(+1) |   4160(+4160) |
 | [lib]/CriticalSection.a |           8(+8) |       0(+0) |         0(+0) |
+| [lib]/FileSystemKit.a   |       694(+694) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |         94(+94) |       0(+0) |         0(+0) |
-| [lib]/c.a               |   37008(+37008) | 2572(+2572) |       97(+97) |
+| [lib]/c.a               |   40964(+40964) | 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  |   64526(+64526) |   460(+460) | 10305(+10305) |
+| [lib]/mbed-os-static.a  |   64886(+64886) |   460(+460) | 10305(+10305) |
 | [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            |     3940(+3940) |     60(+60) | 12020(+12020) |
-| Subtotals               | 126832(+126832) | 3112(+3112) | 26688(+26688) |
-Total Static RAM memory (data + bss): 29800(+29800) bytes
-Total Flash memory (text + data): 129944(+129944) bytes
+| main.cpp.obj            |     4056(+4056) |     24(+24) | 12032(+12032) |
+| Subtotals               | 131876(+131876) | 3072(+3072) | 26704(+26704) |
+Total Static RAM memory (data + bss): 29776(+29776) bytes
+Total Flash memory (text + data): 134948(+134948) bytes
 
Flash used: 155544&nbsp;(7%) / total: 2097152
SRAM used: 30064&nbsp;(5%) / total: 524288

@YannLocatelli YannLocatelli force-pushed the yann/feature/videokit/replace-deprecated-FIL branch 3 times, most recently from bdabf97 to acba950 Compare March 15, 2022 19:19
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 👍

@@ -60,8 +59,9 @@ auto CoreJPEG::getWidthOffset() -> uint32_t
return width_offset;
}

void CoreJPEG::displayImage(FIL *file)
void CoreJPEG::displayImage(interface::File *file)
Copy link
Member

Choose a reason for hiding this comment

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

c'est pas vraiment lié au changement, mais je vois qu'on utilise un pointer mais qu'on check pas qu'il est pas nullptr. on ne peut pas passer une référence plutôt?

@ladislas ladislas force-pushed the yann/feature/videokit/replace-deprecated-FIL branch from acba950 to c024773 Compare March 15, 2022 22:51
@ladislas ladislas changed the title 🏗 (file): Replace FIL by interface::File in Video + Remove CoreFatFs and CoreFs 🏗 (file): Replace FIL by interface::File in Video Mar 15, 2022
@ladislas ladislas merged commit ecf5db3 into develop Mar 15, 2022
@ladislas ladislas deleted the yann/feature/videokit/replace-deprecated-FIL branch March 15, 2022 22:51
@sonarcloud
Copy link

sonarcloud bot commented Mar 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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

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