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

Add support for .ssp files #493

Merged
merged 9 commits into from
Dec 10, 2019
Merged

Add support for .ssp files #493

merged 9 commits into from
Dec 10, 2019

Conversation

markaren
Copy link
Contributor

@markaren markaren commented Dec 2, 2019 •
edited
Loading

This PR adds support for .ssp files.

Adds ControlledDrivetrain.spp downloaded (and converted to SSP 1.0) from here. Not sure if that is ok or not.

Closes #491

@markaren markaren changed the title Add support for .spp files Add support for .ssp files Dec 2, 2019
@markaren
Copy link
Contributor Author

markaren commented Dec 2, 2019

Adds ControlledDrivetrain.spp

Better to just package one of the cse-demos ?

@markaren
Copy link
Contributor Author

markaren commented Dec 2, 2019

I decided to just package the already used demo case

kyllingstad
kyllingstad requested changes Dec 10, 2019
View reviewed changes
Copy link
Member

@kyllingstad kyllingstad left a comment

Choose a reason for hiding this comment

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

This is great, but I'd be very happy if we can avoid the global variable.

src/cpp/ssp_parser.cpp Outdated Show resolved Hide resolved
kyllingstad
kyllingstad requested changes Dec 10, 2019
View reviewed changes
src/cpp/ssp_parser.cpp Outdated Show resolved Hide resolved
src/cpp/ssp_parser.cpp Outdated Show resolved Hide resolved
src/cpp/ssp_parser.cpp Outdated Show resolved Hide resolved
kyllingstad
kyllingstad approved these changes Dec 10, 2019
View reviewed changes
Copy link
Member

@kyllingstad kyllingstad left a comment

Choose a reason for hiding this comment

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

Great!

@markaren markaren changed the base branch from feature/external-ssp-ssv to master December 10, 2019 09:45
@markaren
Copy link
Contributor Author

Changing the base should not have resulted in a conflict here?

@markaren
Merge branch 'master' into feature/492-ssp-archive-support
f00edd6 
# Conflicts:
#	src/cpp/ssp_parser.cpp
@markaren
Copy link
Contributor Author

Waiting for Jenkins on this one.

@markaren markaren merged commit 1413f4e into master Dec 10, 2019
@markaren markaren deleted the feature/492-ssp-archive-support branch December 10, 2019 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kyllingstad kyllingstad kyllingstad approved these changes

@ljamt ljamt Awaiting requested review from ljamt

@hplatou hplatou Awaiting requested review from hplatou

@eidekrist eidekrist Awaiting requested review from eidekrist

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

Successfully merging this pull request may close these issues.

Support .ssp files
2 participants
@markaren @kyllingstad