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

hugo/feature/Add ShapeRecognition activity #1015

Merged
merged 2 commits into from
Sep 22, 2022

Conversation

HPezz
Copy link
Contributor

@HPezz HPezz commented Sep 9, 2022

  • Validated on robot

@HPezz HPezz changed the base branch from develop to hugo/feature/Add-SuperSimon-activity September 9, 2022 13:39
@github-actions
Copy link

github-actions bot commented Sep 9, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 182012 (69%) 80132 (30%) 37456 (7%)
os 445284 (28%) 1119388 (71%) 86008 (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 ✔️ 442996 (21%)
445284 (21%)
📈
2288 (0%)
85640 (16%)
86008 (16%)
📈
368 (0%)
bootloader ✔️ 182012 (8%) ø 37456 (7%) ø
spike_lk_audio ✔️ 135068 (6%) ø 20984 (4%) ø
spike_lk_behavior_kit ✔️ 198252 (9%) ø 54536 (10%) ø
spike_lk_ble ✔️ 236428 (11%) ø 34712 (6%) ø
spike_lk_bluetooth ✔️ 92236 (4%) ø 18064 (3%) ø
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 ✔️ 84636 (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
LekaOS (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-09-22 10:23:07.293981148 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-ON/LekaOS-map.txt	2022-09-22 10:23:07.681988496 +0000
@@ -1,48 +1,48 @@
 | Module                     |           .text |       .data |          .bss |
 |----------------------------|-----------------|-------------|---------------|
-| [fill]                     |       596(+596) |     18(+18) |     220(+220) |
-| [lib]/ActivityKit.a        |   17442(+17442) |       0(+0) |         0(+0) |
+| [fill]                     |       592(+592) |     18(+18) |     224(+224) |
+| [lib]/ActivityKit.a        |   19444(+19444) |       0(+0) |         0(+0) |
 | [lib]/BLEKit.a             |     1292(+1292) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a         |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a        |     1854(+1854) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a           |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a         |     1120(+1120) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a        |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreBufferedSerial.a |         62(+62) |       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]/CoreRFIDReader.a     |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a            |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreSTM32Hal.a       |       930(+930) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a        |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CoreVideo.a          |     7944(+7944) |       1(+1) | 30800(+30800) |
 | [lib]/CriticalSection.a    |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/EventLoopKit.a       |       348(+348) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a     |     1432(+1432) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a        |       750(+750) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a         |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a             |   19410(+19410) |       0(+0) |       10(+10) |
 | [lib]/RFIDKit.a            |     1062(+1062) |       0(+0) |         8(+8) |
 | [lib]/ReinforcerKit.a      |     1484(+1484) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a    |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/Utils.a              |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/VideoKit.a           |       774(+774) |       0(+0) |       36(+36) |
 | [lib]/bootutil.a           |     1362(+1362) |     12(+12) |     132(+132) |
 | [lib]/c.a                  |   48840(+48840) | 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     | 174464(+174464) |   773(+773) | 19735(+19735) |
 | [lib]/misc                 |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a              |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a             |   10732(+10732) |     16(+16) |     204(+204) |
-| main.cpp.obj               |   96496(+96496) |   548(+548) | 30058(+30058) |
-| Subtotals                  | 400612(+400612) | 3944(+3944) | 81328(+81328) |
-Total Static RAM memory (data + bss): 85272(+85272) bytes
-Total Flash memory (text + data): 404556(+404556) bytes
+| main.cpp.obj               |   96738(+96738) |   548(+548) | 30422(+30422) |
+| Subtotals                  | 402852(+402852) | 3944(+3944) | 81696(+81696) |
+Total Static RAM memory (data + bss): 85640(+85640) bytes
+Total Flash memory (text + data): 406796(+406796) bytes
 
Flash used: 445284 (21%) / total: 2097152
SRAM used: 86008 (16%) / total: 524288

@codecov
Copy link

codecov bot commented Sep 9, 2022

Codecov Report

❗ No coverage uploaded for pull request base (hugo/feature/Add-SuperSimon-activity@bd777e8). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 2dcea08 differs from pull request most recent head 9fd66a4. Consider uploading reports for the commit 9fd66a4 to get more accurate results

@@                           Coverage Diff                           @@
##             hugo/feature/Add-SuperSimon-activity    #1015   +/-   ##
=======================================================================
  Coverage                                        ?   96.03%           
=======================================================================
  Files                                           ?      133           
  Lines                                           ?     3106           
  Branches                                        ?        0           
=======================================================================
  Hits                                            ?     2983           
  Misses                                          ?      123           
  Partials                                        ?        0           

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

@github-actions
Copy link

github-actions bot commented Sep 9, 2022

File comparision analysis report

🔖 Info

Target Flash Used (%) Flash Available (%) Static RAM (%)
bootloader 169636 (64%) 92508 (35%) 30920 (5%)
os 407192 (26%) 1157480 (73%) 79080 (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 ✔️ 404904 (19%)
407192 (19%)
📈
2288 (0%)
78712 (15%)
79080 (15%)
📈
368 (0%)
bootloader ✔️ 169636 (8%) ø 30920 (5%) ø
spike_lk_audio ✔️ 125076 (5%) ø 14568 (2%) ø
spike_lk_behavior_kit ✔️ 189752 (9%) ø 48120 (9%) ø
spike_lk_ble ✔️ 228544 (10%) ø 28056 (5%) ø
spike_lk_bluetooth ✔️ 82948 (3%) ø 11544 (2%) ø
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
LekaOS (click to expand)
--- build_artifacts/base_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-09-22 10:23:34.498799424 +0000
+++ build_artifacts/head_ref-build-enable_log_debug-OFF/LekaOS-map.txt	2022-09-22 10:23:34.890795878 +0000
@@ -1,48 +1,48 @@
 | Module                     |           .text |       .data |          .bss |
 |----------------------------|-----------------|-------------|---------------|
-| [fill]                     |       606(+606) |     18(+18) |     199(+199) |
-| [lib]/ActivityKit.a        |   17442(+17442) |       0(+0) |         0(+0) |
+| [fill]                     |       618(+618) |     18(+18) |     203(+203) |
+| [lib]/ActivityKit.a        |   19444(+19444) |       0(+0) |         0(+0) |
 | [lib]/BLEKit.a             |     1292(+1292) |       0(+0) |         0(+0) |
 | [lib]/BatteryKit.a         |       324(+324) |       0(+0) |         0(+0) |
 | [lib]/BehaviorKit.a        |     1854(+1854) |       0(+0) |         0(+0) |
 | [lib]/ColorKit.a           |       864(+864) |       0(+0) |         0(+0) |
 | [lib]/CommandKit.a         |     1120(+1120) |       0(+0) |         0(+0) |
 | [lib]/CoreBattery.a        |       472(+472) |       0(+0) |         0(+0) |
 | [lib]/CoreBufferedSerial.a |         62(+62) |       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]/CoreRFIDReader.a     |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/CoreSPI.a            |         28(+28) |       0(+0) |         0(+0) |
 | [lib]/CoreSTM32Hal.a       |       930(+930) |       0(+0) |         0(+0) |
 | [lib]/CoreTimeout.a        |       204(+204) |       0(+0) |         0(+0) |
 | [lib]/CoreVideo.a          |     7944(+7944) |       1(+1) | 30800(+30800) |
 | [lib]/CriticalSection.a    |           8(+8) |       0(+0) |         0(+0) |
 | [lib]/EventLoopKit.a       |       348(+348) |       0(+0) |         0(+0) |
 | [lib]/FileManagerKit.a     |     1432(+1432) |       0(+0) |         0(+0) |
 | [lib]/FirmwareKit.a        |       750(+750) |       0(+0) |         0(+0) |
 | [lib]/HelloWorld.a         |         94(+94) |       0(+0) |         0(+0) |
 | [lib]/LedKit.a             |   19410(+19410) |       0(+0) |       10(+10) |
 | [lib]/RFIDKit.a            |     1062(+1062) |       0(+0) |         8(+8) |
 | [lib]/ReinforcerKit.a      |     1484(+1484) |       0(+0) |         0(+0) |
 | [lib]/SerialNumberKit.a    |       588(+588) |       0(+0) |         0(+0) |
 | [lib]/Utils.a              |         34(+34) |       0(+0) |         0(+0) |
 | [lib]/VideoKit.a           |       774(+774) |       0(+0) |       36(+36) |
 | [lib]/bootutil.a           |     1362(+1362) |     12(+12) |     132(+132) |
 | [lib]/c.a                  |   49944(+49944) | 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     | 173212(+173212) |   773(+773) | 19647(+19647) |
 | [lib]/misc                 |       188(+188) |       4(+4) |       28(+28) |
 | [lib]/nosys.a              |         32(+32) |       0(+0) |         0(+0) |
 | [lib]/stdc++.a             |   10684(+10684) |     16(+16) |     204(+204) |
-| main.cpp.obj               |   59050(+59050) |   548(+548) | 23239(+23239) |
-| Subtotals                  | 362980(+362980) | 3944(+3944) | 74400(+74400) |
-Total Static RAM memory (data + bss): 78344(+78344) bytes
-Total Flash memory (text + data): 366924(+366924) bytes
+| main.cpp.obj               |   59276(+59276) |   548(+548) | 23603(+23603) |
+| Subtotals                  | 365220(+365220) | 3944(+3944) | 74768(+74768) |
+Total Static RAM memory (data + bss): 78712(+78712) bytes
+Total Flash memory (text + data): 369164(+369164) bytes
 
Flash used: 407192 (19%) / total: 2097152
SRAM used: 79080 (15%) / total: 524288

@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from 3633449 to dda1778 Compare September 9, 2022 16:54
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from f627356 to 1cc8ac6 Compare September 9, 2022 16:57
@HPezz HPezz self-assigned this Sep 9, 2022
@HPezz HPezz added 01 - type: story Clear roadmap to implement a new feature, refactor code, etc. 01 - type: task Something to do labels Sep 9, 2022
@HPezz HPezz added this to the Next Release milestone Sep 9, 2022
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 1cc8ac6 to 7328a07 Compare September 12, 2022 12:06
@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from dda1778 to 831e956 Compare September 15, 2022 15:16
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 7328a07 to 94fdd65 Compare September 15, 2022 15:28
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.

First activity review, very interesting 👍

I have a few questions to discuss on Monday :)

libs/ActivityKit/include/activities/ShapeRecognition.h Outdated Show resolved Hide resolved
libs/ActivityKit/include/activities/ShapeRecognition.h Outdated Show resolved Hide resolved
libs/ActivityKit/include/activities/ShapeRecognition.h Outdated Show resolved Hide resolved
++_score;

if (_score == kScoreToWin) {
_backup_callback(MagicCard::dice_roll);
Copy link
Member

Choose a reason for hiding this comment

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

this is strange -- you're creating an invisible but very strong dependency on something and Activity can' possibly know: what the backup callback would do.

We need to find a better way of exiting an app than that.

If we change the main callback in the Robot Controller, it might break all the activities which should not be the case as they are not at all related

libs/ActivityKit/source/activities/ShapeRecognition.cpp Outdated Show resolved Hide resolved
libs/ActivityKit/source/activities/ShapeRecognition.cpp Outdated Show resolved Hide resolved
libs/ActivityKit/source/activities/ShapeRecognition.cpp Outdated Show resolved Hide resolved
libs/ActivityKit/include/activities/ShapeRecognition.h Outdated Show resolved Hide resolved
Copy link
Member

@YannLocatelli YannLocatelli left a comment

Choose a reason for hiding this comment

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

Quick review

@@ -56,6 +56,7 @@
#include "RobotController.h"
#include "SDBlockDevice.h"
#include "SerialNumberKit.h"
#include "ShapeRecognition.h"
Copy link
Member

Choose a reason for hiding this comment

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

Could we have a header for all autonomous activities in order to avoid to overcrowd the included files here?

Suggested change
#include "ShapeRecognition.h"
#include "AutonomousActivities.h"
Suggested change
#include "ShapeRecognition.h"
#include "Activities.h"

Comment on lines 29 to 42
RFIDKit &_rfidkit;
interface::VideoKit &_videokit;
ReinforcerKit &_reinforcerkit;

static constexpr uint8_t kRoundsNumber = 5;
static constexpr uint8_t kNumberOfShapes = 4 * 2;

uint8_t _score = 0;
std::optional<Shape> _current_shape {};
std::function<void(const MagicCard &)> _backup_callback {};
std::array<Shape, kNumberOfShapes> _shapes = {Shape::square, Shape::square, Shape::circle, Shape::circle,
Shape::triangle, Shape::triangle, Shape::star, Shape::star};

void launchNextRound();
Copy link
Member

Choose a reason for hiding this comment

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

Guidestyle point

Private methods come first before private members

Comment on lines 21 to 35
auto on_tag_detected_callback = [this](const MagicCard &card) {
if (card == _current_shape->card) {
_reinforcerkit.playDefault();
++_score;

if (_score == kRoundsNumber) {
_backup_callback(MagicCard::dice_roll);
return;
}

launchNextRound();
} else {
_backup_callback(card);
}
};
Copy link
Member

Choose a reason for hiding this comment

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

I have a question, why this lambda isn't a private method?

Copy link
Member

Choose a reason for hiding this comment

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

About lambda vs std::bind [Link]

@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from 831e956 to 685ff14 Compare September 20, 2022 10:06
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 79eeecd to 30bd601 Compare September 20, 2022 10:09
@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from 685ff14 to 7b788a4 Compare September 20, 2022 14:47
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 30bd601 to 06d5650 Compare September 20, 2022 14:49
@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from 7b788a4 to b88df8a Compare September 22, 2022 07:57
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 06d5650 to 7b61938 Compare September 22, 2022 07:57
@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from b88df8a to ccca540 Compare September 22, 2022 09:17
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch 3 times, most recently from c52bf66 to 2dcea08 Compare September 22, 2022 09:25
@HPezz HPezz force-pushed the hugo/feature/Add-SuperSimon-activity branch from ccca540 to bd777e8 Compare September 22, 2022 10:07
@HPezz HPezz force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 2dcea08 to 9fd66a4 Compare September 22, 2022 10:12
@ladislas ladislas force-pushed the hugo/feature/Add-SuperSimon-activity branch from bd777e8 to 23f3098 Compare September 22, 2022 10:14
Base automatically changed from hugo/feature/Add-SuperSimon-activity to develop September 22, 2022 10:15
@ladislas ladislas force-pushed the hugo/feature/Add-ShapeRecognition-activity branch from 9fd66a4 to 99298e6 Compare September 22, 2022 10:15
@ladislas ladislas merged commit d2ef151 into develop Sep 22, 2022
@ladislas ladislas deleted the hugo/feature/Add-ShapeRecognition-activity branch September 22, 2022 10:16
@sonarcloud
Copy link

sonarcloud bot commented Sep 22, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot E 16 Security Hotspots
Code Smell A 8 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
01 - type: story Clear roadmap to implement a new feature, refactor code, etc. 01 - type: task Something to do
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants