Implement substitutions using the deploy.toml #1670
+94
−32
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
oleflb
requested changes
Mar 7, 2025
tools/pepsi/src/deploy_config.rs
Outdated
Comment on lines
123
to
135
| fn assignments(&self) -> HashMap<PlayerNumber, NaoAddress> { | ||
| let mut assignments: HashMap<_, _> = self | ||
| .assignments | ||
| .iter() | ||
| .map(|assignment| (assignment.player_number, assignment.nao_address)) | ||
| .collect(); | ||
|
|
||
| for substitution in &self.substitutions { | ||
| assignments.insert(substitution.player_number, substitution.nao_address); | ||
| } | ||
|
|
||
| assignments | ||
| } |
There was a problem hiding this comment.
If you had a duplicate player number in the assignments, you would no longer throw an error anymore, correct? I don't think that's what we want
There was a problem hiding this comment.
Good point, I now reintroduced a check for duplicates in the initial assignment.
julianschuler
force-pushed
the
substitutions
branch
from
61bb4d0 to
3499176
Compare
|
Ok, iirc you wanted to check the correctness of assignments separately from the substitutions, right? Please ping me when finished |
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.
Why? What?
Blocked in #1669.
This PR implements in-game substitutions using the
deploy.toml.The substitutions specified in the
deploy.tomlare applied in order, with the final assignment determining the currently playing robots (for pregame). The postgame is applied to all NAOs listed in thedeploy.tomlto ensure that all logs are retrieved.Resolves #1660.
ToDo / Known Issues
None.
Ideas for Next Iterations (Not This PR)
None.
How to Test
Now, add a substitution to the
deploy.tomland observe how the behavior of the pre- and postgame commands change regarding their player number assignments and NAOs to upload to/download from.