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

ladislas/feature/cleanup makefile #1068

Merged
merged 4 commits into from
Oct 18, 2022
Merged

ladislas/feature/cleanup makefile #1068

merged 4 commits into from
Oct 18, 2022

Conversation

ladislas
Copy link
Member

  • 🔨 (tools): Remove term target
  • 🎨 (Makefile): Reorganize configs, arguments
  • 🔨 (Makefile): Rename FIRMWARE_VERSION -> OS_VERSION
  • 🔨 (Makefile): Add target firmware_no_cleanup

@ladislas ladislas self-assigned this Oct 17, 2022
@ladislas ladislas added the 01 - type: task Something to do label Oct 17, 2022
@ladislas ladislas added this to the Future Release milestone Oct 17, 2022
@github-actions
Copy link

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 169636 (64%) 92508 (35%) 30920 (5%)
os 407848 (26%) 1156824 (73%) 79224 (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 ✔️ ✅ ✅ 407848 (19%) ø 79224 (15%) ø
bootloader ✔️ ✅ ✅ 169636 (8%) ø 30920 (5%) ø
spike_lk_audio ✔️ ✅ ✅ 125076 (5%) ø 14568 (2%) ø
spike_lk_behavior_kit ✔️ ✅ ✅ 189752 (9%) ø 48120 (9%) ø
spike_lk_ble ✔️ ✅ ✅ 228768 (10%) ø 28200 (5%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 82948 (3%) ø 11544 (2%) ø
spike_lk_boost_ut ✔️ ✅ ✅ 355600 (16%) ø 18000 (3%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 144632 (6%) ø 46528 (8%) ø
spike_lk_color_kit ✔️ ✅ ✅ 65712 (3%) ø 13744 (2%) ø
spike_lk_command_kit ✔️ ✅ ✅ 192520 (9%) ø 50944 (9%) ø
spike_lk_config_kit ✔️ ✅ ✅ 126956 (6%) ø 14312 (2%) ø
spike_lk_coreled ✔️ ✅ ✅ 76164 (3%) ø 13688 (2%) ø
spike_lk_event_queue ✔️ ✅ ✅ 74736 (3%) ø 12072 (2%) ø
spike_lk_file_manager_kit ✔️ ✅ ✅ 139016 (6%) ø 14416 (2%) ø
spike_lk_file_reception ✔️ ✅ ✅ 327112 (15%) ø 27576 (5%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 63880 (3%) ø 11448 (2%) ø
spike_lk_fs ✔️ ✅ ✅ 174616 (8%) ø 47888 (9%) ø
spike_lk_lcd ✔️ ✅ ✅ 162236 (7%) ø 46616 (8%) ø
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_qdac ✔️ ✅ ✅ 78564 (3%) ø 11816 (2%) ø
spike_lk_reinforcer ✔️ ✅ ✅ 103480 (4%) ø 14608 (2%) ø
spike_lk_rfid ✔️ ✅ ✅ 80920 (3%) ø 11520 (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 ✔️ ✅ ✅ 114244 (5%) ø 14056 (2%) ø
spike_lk_ticker_timeout ✔️ ✅ ✅ 69052 (3%) ø 11632 (2%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 126236 (6%) ø 15304 (2%) ø
spike_lk_update_process_app_update ✔️ ✅ ✅ 77632 (3%) ø 12352 (2%) ø
spike_lk_watchdog_isr ✔️ ✅ ✅ 82032 (3%) ø 13288 (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

No differenes where found in map files.

@github-actions
Copy link

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 182012 (69%) 80132 (30%) 37456 (7%)
os 446020 (28%) 1118652 (71%) 86280 (16%)
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 ✔️ ✅ ✅ 446020 (21%) ø 86280 (16%) ø
bootloader ✔️ ✅ ✅ 182012 (8%) ø 37456 (7%) ø
spike_lk_audio ✔️ ✅ ✅ 135068 (6%) ø 20984 (4%) ø
spike_lk_behavior_kit ✔️ ✅ ✅ 198252 (9%) ø 54536 (10%) ø
spike_lk_ble ✔️ ✅ ✅ 236652 (11%) ø 34856 (6%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 92236 (4%) ø 18064 (3%) ø
spike_lk_boost_ut ✔️ ✅ ✅ 367784 (17%) ø 24672 (4%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 152264 (7%) ø 53064 (10%) ø
spike_lk_color_kit ✔️ ✅ ✅ 88352 (4%) ø 20216 (3%) ø
spike_lk_command_kit ✔️ ✅ ✅ 202716 (9%) ø 57872 (11%) ø
spike_lk_config_kit ✔️ ✅ ✅ 138868 (6%) ø 20976 (4%) ø
spike_lk_coreled ✔️ ✅ ✅ 87916 (4%) ø 20104 (3%) ø
spike_lk_event_queue ✔️ ✅ ✅ 84088 (4%) ø 18744 (3%) ø
spike_lk_file_manager_kit ✔️ ✅ ✅ 153984 (7%) ø 21336 (4%) ø
spike_lk_file_reception ✔️ ✅ ✅ 331180 (15%) ø 34072 (6%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 86712 (4%) ø 18056 (3%) ø
spike_lk_fs ✔️ ✅ ✅ 173976 (8%) ø 47976 (9%) ø
spike_lk_lcd ✔️ ✅ ✅ 171852 (8%) ø 53288 (10%) ø
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_qdac ✔️ ✅ ✅ 91508 (4%) ø 18616 (3%) ø
spike_lk_reinforcer ✔️ ✅ ✅ 112188 (5%) ø 21024 (4%) ø
spike_lk_rfid ✔️ ✅ ✅ 84700 (4%) ø 18024 (3%) ø
spike_lk_sensors_battery ✔️ ✅ ✅ 87056 (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 ✔️ ✅ ✅ 136188 (6%) ø 20896 (3%) ø
spike_lk_ticker_timeout ✔️ ✅ ✅ 82584 (3%) ø 18072 (3%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 148044 (7%) ø 21912 (4%) ø
spike_lk_update_process_app_update ✔️ ✅ ✅ 100328 (4%) ø 19080 (3%) ø
spike_lk_watchdog_isr ✔️ ✅ ✅ 87940 (4%) ø 19960 (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

No differenes where found in map files.

@sonarqubecloud
Copy link

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

@codecov
Copy link

codecov bot commented Oct 17, 2022

Codecov Report

Merging #1068 (45ac10e) into develop (0916527) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #1068   +/-   ##
========================================
  Coverage    96.00%   96.00%           
========================================
  Files          133      133           
  Lines         3178     3178           
========================================
  Hits          3051     3051           
  Misses         127      127

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

YannLocatelli
YannLocatelli approved these changes Oct 17, 2022
View reviewed changes
Makefile
Comment on lines +111 to +113
firmware_no_cleanup:
python3 tools/check_version.py ./config/os_version
./tools/firmware/build_firmware.sh -v $(OS_VERSION)
Copy link
Member

Choose a reason for hiding this comment

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

What's this target for?

Copy link
Member Author

Choose a reason for hiding this comment

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

when you're already configured the project to build the firmware and make changes in os/main.cpp you don't want to clean up everything and start from scratch each time.

especially when you live in Bretagne and the internet is super slow and it takes ~5/10min to download the dependencies for the project 😂

@ladislas ladislas merged commit 1e62330 into develop Oct 18, 2022
@ladislas ladislas deleted the ladislas/feature/cleanup-makefile branch October 18, 2022 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YannLocatelli YannLocatelli YannLocatelli approved these changes

Assignees

@ladislas ladislas

Labels
01 - type: task Something to do
Projects
None yet
Milestone
Future Release
Development

Successfully merging this pull request may close these issues.
2 participants
@ladislas @YannLocatelli