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

hugo/feature/Add Fly animation #525

Merged
merged 2 commits into from
Mar 9, 2022
Merged

hugo/feature/Add Fly animation #525

merged 2 commits into from
Mar 9, 2022

Conversation

HPezz
Copy link
Contributor

@HPezz HPezz commented Mar 3, 2022

  • ✨ (led animation): Add Fly animation
  • 🎨 (spikes): Upgrade lk_led_spike

@codecov
Copy link

codecov bot commented Mar 3, 2022 •
edited
Loading

Codecov Report

Merging #525 (608283a) into develop (633575a) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           develop      #525   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           96        96           
  Lines         1471      1471           
=========================================
  Hits          1471      1471

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 633575a...608283a. Read the comment docs.

@github-actions
Copy link

github-actions bot commented Mar 3, 2022 •
edited
Loading

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 137588 (52%) 124556 (47%) 29360 (5%)
os 88648 (5%) 1476024 (94%) 18352 (3%)
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 ✔️ ✅ ✅ 88648 (4%) ø 18352 (3%) ø
bootloader ✔️ ✅ ✅ 137588 (6%) ø 29360 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ ✅ ✅ 256728 (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 ✔️ ✅ ✅ 182392 (8%) ø 29304 (5%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 91192 (4%) ø 17472 (3%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 149384 (7%) ø 30464 (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 ✔️ ✅ ✅ 329452 (15%) ø 33480 (6%) ø
spike_lk_filesystem_kit ✔️ ✅ ✅ 125948 (6%) ø 20280 (3%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 87352 (4%) ø 17512 (3%) ø
spike_lk_lcd ✔️ ✅ ✅ 149792 (7%) ø 30096 (5%) ø
spike_lk_led ✔️ ✅ ✅ 88808 (4%) ø 19400 (3%) ø
spike_lk_led_kit ✔️ ❌ ❌ 91420 (4%)
92540 (4%)		 📈
1120 (1%)		 20184 (3%)
20200 (3%)		 📈
16 (0%)
spike_lk_log_kit ✔️ ✅ ✅ 92000 (4%) ø 18168 (3%) ø
spike_lk_motors ✔️ ✅ ✅ 86576 (4%) ø 17552 (3%) ø
spike_lk_rfid ✔️ ✅ ✅ 91008 (4%) ø 17472 (3%) ø
spike_lk_sensors_battery ✔️ ✅ ✅ 86744 (4%) ø 18056 (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_ticker_timeout ✔️ ✅ ✅ 83224 (3%) ø 17592 (3%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 143764 (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_led_kit (click to expand) 
--- build_artifacts/base_ref-build-enable_log_debug-ON/spike_lk_led_kit-map.txt	2022-03-09 14:29:04.505543028 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/spike_lk_led_kit-map.txt	2022-03-09 14:29:04.721545365 +0000
@@ -1,20 +1,20 @@
 | Module                  |         .text |       .data |          .bss |
 |-------------------------|---------------|-------------|---------------|
-| [fill]                  |     158(+158) |       8(+8) |       32(+32) |
+| [fill]                  |     162(+162) |       8(+8) |       32(+32) |
 | [lib]/ColorKit.a        |     864(+864) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a         |       28(+28) |       0(+0) |         0(+0) |
 | [lib]/CriticalSection.a |         8(+8) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a      |       94(+94) |       0(+0) |         0(+0) |
-| [lib]/LedKit.a          |   1198(+1198) |       0(+0) |         0(+0) |
+| [lib]/LedKit.a          |   2214(+2214) |       0(+0) |         0(+0) |
 | [lib]/c.a               | 26052(+26052) | 2472(+2472) |       58(+58) |
 | [lib]/gcc.a             |   7148(+7148) |       0(+0) |         0(+0) |
 | [lib]/m.a               |     564(+564) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a  | 34292(+34292) |   444(+444) |   9990(+9990) |
 | [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            |   4234(+4234) |       0(+0) |   6808(+6808) |
-| Subtotals               | 80724(+80724) | 2936(+2936) | 16960(+16960) |
-Total Static RAM memory (data + bss): 19896(+19896) bytes
-Total Flash memory (text + data): 83660(+83660) bytes
+| main.cpp.obj            |   4302(+4302) |       0(+0) |   6824(+6824) |
+| Subtotals               | 81812(+81812) | 2936(+2936) | 16976(+16976) |
+Total Static RAM memory (data + bss): 19912(+19912) bytes
+Total Flash memory (text + data): 84748(+84748) bytes
 
Flash used: 92540&nbsp;(4%) / total: 2097152
SRAM used: 20200&nbsp;(3%) / total: 524288

@github-actions
Copy link

github-actions bot commented Mar 3, 2022 •
edited
Loading

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 137588 (52%) 124556 (47%) 29360 (5%)
os 74772 (4%) 1489900 (95%) 12328 (2%)
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 ✔️ ✅ ✅ 74772 (3%) ø 12328 (2%) ø
bootloader ✔️ ✅ ✅ 137588 (6%) ø 29360 (5%) ø
certs_emc_ble_bt_lcd_led_motors ✔️ ✅ ✅ 249184 (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 ✔️ ✅ ✅ 173124 (8%) ø 23352 (4%) ø
spike_lk_bluetooth ✔️ ✅ ✅ 73256 (3%) ø 11448 (2%) ø
spike_lk_cg_animations ✔️ ✅ ✅ 141112 (6%) ø 24464 (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 ✔️ ✅ ✅ 324516 (15%) ø 27520 (5%) ø
spike_lk_filesystem_kit ✔️ ✅ ✅ 102036 (4%) ø 14048 (2%) ø
spike_lk_flash_memory ✔️ ✅ ✅ 63880 (3%) ø 11448 (2%) ø
spike_lk_lcd ✔️ ✅ ✅ 136976 (6%) ø 24024 (4%) ø
spike_lk_led ✔️ ✅ ✅ 65744 (3%) ø 13392 (2%) ø
spike_lk_led_kit ✔️ ❌ ❌ 83420 (3%)
84540 (4%)		 📈
1120 (1%)		 14248 (2%)
14264 (2%)		 📈
16 (0%)
spike_lk_log_kit ✔️ ✅ ✅ 68528 (3%) ø 11912 (2%) ø
spike_lk_motors ✔️ ✅ ✅ 62528 (2%) ø 11488 (2%) ø
spike_lk_rfid ✔️ ✅ ✅ 73072 (3%) ø 11448 (2%) ø
spike_lk_sensors_battery ✔️ ✅ ✅ 63072 (3%) ø 11984 (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_ticker_timeout ✔️ ✅ ✅ 69052 (3%) ø 11632 (2%) ø
spike_lk_update_process_app_base ✔️ ✅ ✅ 121348 (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_led_kit (click to expand) 
--- build_artifacts/base_ref-build-enable_log_debug-OFF/spike_lk_led_kit-map.txt	2022-03-09 14:28:56.544475309 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/spike_lk_led_kit-map.txt	2022-03-09 14:28:56.776478025 +0000
@@ -1,19 +1,19 @@
 | Module                 |         .text |       .data |          .bss |
 |------------------------|---------------|-------------|---------------|
-| [fill]                 |     148(+148) |       8(+8) |       28(+28) |
+| [fill]                 |     152(+152) |       8(+8) |       28(+28) |
 | [lib]/ColorKit.a       |     864(+864) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a        |       28(+28) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a     |       94(+94) |       0(+0) |         0(+0) |
-| [lib]/LedKit.a         |   1198(+1198) |       0(+0) |         0(+0) |
+| [lib]/LedKit.a         |   2214(+2214) |       0(+0) |         0(+0) |
 | [lib]/c.a              | 26028(+26028) | 2472(+2472) |       58(+58) |
 | [lib]/gcc.a            |   7084(+7084) |       0(+0) |         0(+0) |
 | [lib]/m.a              |     204(+204) |       0(+0) |         0(+0) |
 | [lib]/mbed-os-static.a | 30752(+30752) |   444(+444) |   9954(+9954) |
 | [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           |   2268(+2268) |       0(+0) |     912(+912) |
-| Subtotals              | 74244(+74244) | 2936(+2936) | 11024(+11024) |
-Total Static RAM memory (data + bss): 13960(+13960) bytes
-Total Flash memory (text + data): 77180(+77180) bytes
+| main.cpp.obj           |   2336(+2336) |       0(+0) |     928(+928) |
+| Subtotals              | 75332(+75332) | 2936(+2936) | 11040(+11040) |
+Total Static RAM memory (data + bss): 13976(+13976) bytes
+Total Flash memory (text + data): 78268(+78268) bytes
 
Flash used: 84540&nbsp;(4%) / total: 2097152
SRAM used: 14264&nbsp;(2%) / total: 524288

@HPezz HPezz marked this pull request as draft March 4, 2022 10:24
@HPezz HPezz force-pushed the hugo/feature/Add-Fly-animation branch from adcb780 to 63b09a2 Compare March 7, 2022 14:43
@HPezz HPezz marked this pull request as ready for review March 7, 2022 15:35
ladislas
ladislas requested changes Mar 8, 2022
View reviewed changes
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 👍 modulo deux/trois changements

libs/LedKit/source/Fly.cpp Outdated
Comment on lines 13 to 17
static constexpr auto kInputMaxStage0 = 50;
static constexpr auto kInputMaxStage1to2 = 30;
static constexpr auto kInputMaxStage3 = 10;
static constexpr auto kInputMaxValue4to7 = 6;
static constexpr auto kThresholdDown = 0.3F;
Copy link
Member

Choose a reason for hiding this comment

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

je les mettrai quand même dans les stages directement.

spikes/lk_led_kit/main.cpp Outdated
rtos::ThisThread::sleep_for(40s);

ledkit.stop();
rtos::ThisThread::sleep_for(1s);
}
Copy link
Member

Choose a reason for hiding this comment

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

je pense qu'il faut que tu fasses un rebase sur develop pour retirer ce changement.

ladislas
ladislas reviewed Mar 8, 2022
View reviewed changes
libs/LedKit/include/internal/Fly.h Outdated
@@ -0,0 +1,64 @@
// Leka - LekaOS
// Copyright 2021 APF France handicap
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
// Copyright 2021 APF France handicap
// Copyright 2022 APF France handicap

@HPezz HPezz force-pushed the hugo/feature/Add-Fly-animation branch from 63b09a2 to 608283a Compare March 8, 2022 15:27
@ladislas ladislas force-pushed the hugo/feature/Add-Fly-animation branch from 608283a to e0e3b7f Compare March 9, 2022 14:16
@ladislas ladislas merged commit 084c7e9 into develop Mar 9, 2022
@ladislas ladislas deleted the hugo/feature/Add-Fly-animation branch March 9, 2022 14:20
@sonarcloud
Copy link

sonarcloud bot commented Mar 9, 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 3 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ladislas ladislas ladislas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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