hugo/feature/Internationalize ActivityKit and RC #1049
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
HPezz
commented
Sep 29, 2022
•
HPezz
commented
- Validated on robot
File comparision analysis report🔖 Info
Click to show memory sections📝 SummaryClick to show summary
🗺️ Map files diff outputClick to show diff list
|
File comparision analysis report🔖 Info
Click to show memory sections📝 SummaryClick to show summary
🗺️ Map files diff outputClick to show diff list
|
Codecov Report
@@ Coverage Diff @@
## develop #1049 +/- ##
========================================
Coverage 95.99% 96.00%
========================================
Files 133 133
Lines 3173 3178 +5
========================================
+ Hits 3046 3051 +5
Misses 127 127
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
aa0cf8e
to
8d25ed6
Compare
HPezz
changed the base branch from
develop
to
hugo/feature/Add-language-byte-in-MagicCard
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
8d25ed6
to
73fdf3a
Compare
HPezz
force-pushed
the
hugo/feature/Add-language-byte-in-MagicCard
branch
2 times, most recently
from
89d51ff
to
4097645
Compare
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
73fdf3a
to
b9e7ed9
Compare
|
Added the following comment Suggestion. Add void startAutonomousActivityMode() final
{
_lcd.turnOn();
auto card = _rfidkit.getLastMagicCardActivated();
_activitykit.displayMainMenu(card);
} |
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
4 times, most recently
from
b2ac5fc
to
75129f8
Compare
HPezz
force-pushed
the
hugo/feature/Add-language-byte-in-MagicCard
branch
2 times, most recently
from
46e154b
to
1a77f51
Compare
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
75129f8
to
172a27b
Compare
ladislas
reviewed
Oct 10, 2022
Comment on lines
37
to
44
| void ActivityKit::displayMainMenu(const MagicCard &card) | ||
| { | ||
| if (card.getLanguage() == Language::fr_FR) { | ||
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-fr_FR.jpg"); | ||
| } else { | ||
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-en_US.jpg"); | ||
| } | ||
| } |
There was a problem hiding this comment.
shouldn't we check first if the card is indeed the dire_roll?
Suggested change
| void ActivityKit::displayMainMenu(const MagicCard &card) | |
| { | |
| if (card.getLanguage() == Language::fr_FR) { | |
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-fr_FR.jpg"); | |
| } else { | |
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-en_US.jpg"); | |
| } | |
| } | |
| void ActivityKit::displayMainMenu(const MagicCard &card) | |
| { | |
| if (card != MagicCard::dire_roll) { | |
| return; | |
| } | |
| if (card.getLanguage() == Language::fr_FR) { | |
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-fr_FR.jpg"); | |
| } else { | |
| _videokit.displayImage("/fs/home/img/system/robot-misc-choose_activity-en_US.jpg"); | |
| } | |
| } |
| @@ -196,7 +196,9 @@ class RobotController : public interface::RobotController | |||
| void startAutonomousActivityMode() final | |||
| { | |||
| _lcd.turnOn(); | |||
| _behaviorkit.displayAutonomousActivitiesPrompt(); | |||
|
|
|||
| auto card = _rfidkit.getLastMagicCardActivated(); | |||
There was a problem hiding this comment.
this is smart but are you absolutely certain that it will work if:
- the user puts 2 cards (dice + something else)
- dice is read
- then the other one is read
- this function is called
?
There was a problem hiding this comment.
The execution speed between the dice_roll detection and the main menu display is so tiny that we couldn't put an other card immediately upon the dice roll detection, even willingly.
Base automatically changed from
hugo/feature/Add-language-byte-in-MagicCard
to
develop
October 10, 2022 14:37
ladislas
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
172a27b
to
6db1e51
Compare
HPezz
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
2 times, most recently
from
172a27b
to
944f403
Compare
ladislas
force-pushed
the
hugo/feature/Internationalize-ActivityKit-and-RC
branch
from
944f403
to
d4011bb
Compare
|
Kudos, SonarCloud Quality Gate passed! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.