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

Fix option parser: Match any character as option name #1481

Merged
merged 2 commits into from
Oct 18, 2018
Merged

Fix option parser: Match any character as option name #1481

merged 2 commits into from
Oct 18, 2018

Conversation

brusherru
Copy link
Contributor

It fixes #1479

@brusherru brusherru self-assigned this Oct 18, 2018
@brusherru brusherru requested a review from a team October 18, 2018 13:45
nkrkv
nkrkv requested changes Oct 18, 2018
View reviewed changes
Copy link
Member

@nkrkv nkrkv left a comment

Choose a reason for hiding this comment

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

Please merge to 0.25.x

Should we have some unit tests?

@brusherru brusherru changed the base branch from master to 0.25.x October 18, 2018 14:09
evgenykochetkov
evgenykochetkov reviewed Oct 18, 2018
View reviewed changes
packages/xod-client-browser/src/containers/App.jsx Outdated
@@ -107,7 +107,7 @@ class App extends client.App {
const { project } = this.props;

const xodballJSON = XP.toXodball(project);
const xodballName = XP.getProjectName(project);
const xodballName = XP.getProjectName(project) || 'my-project';
Copy link
Contributor

Choose a reason for hiding this comment

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

???

Copy link
Contributor Author

@brusherru brusherru Oct 18, 2018 •
edited

Choose a reason for hiding this comment

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

Will rebase very soon and it will go away :)

@brusherru
Copy link
Contributor Author

@nkrkv updated test suite and added support for any character for option group name. Check it out, please

nkrkv
nkrkv reviewed Oct 18, 2018
View reviewed changes
Copy link
Member

@nkrkv nkrkv left a comment

Choose a reason for hiding this comment

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

Are you sure arduino-cli handles all options for Arduino Pro correctly on every platform? They contain special symbols that going to be a part of the filename.

@brusherru
Copy link
Contributor Author

brusherru commented Oct 18, 2018 •
edited

This affects only human-readable names, so in the FQBN will still contain names without spaces and special chars (RegExp: ([a-zA-Z0-9_]+), third group in the boardOptionRegExp).

Just tested upload to be sure I am right and it tries to upload with FQBN: arduino:avr:pro:cpu=8MHzatmega168 for the choosen ATmega168 (3.3V, 8 MHz).

So it should work fine.

nkrkv
nkrkv approved these changes Oct 18, 2018
View reviewed changes
Copy link
Member

@nkrkv nkrkv left a comment

Choose a reason for hiding this comment

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

LGTM

evgenykochetkov
evgenykochetkov approved these changes Oct 18, 2018
View reviewed changes
Copy link
Contributor

@evgenykochetkov evgenykochetkov left a comment

Choose a reason for hiding this comment

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

👍🏻

@brusherru brusherru merged commit a76be3a into 0.25.x Oct 18, 2018
@brusherru brusherru deleted the fix-1479-upload-to-pro branch October 18, 2018 16:25
@evgenykochetkov evgenykochetkov added the hotfix Issue/PR for a patch release label Oct 19, 2018
@brusherru brusherru mentioned this pull request Oct 19, 2018
Merged
This was referenced Oct 19, 2018
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkrkv nkrkv nkrkv approved these changes

@evgenykochetkov evgenykochetkov evgenykochetkov approved these changes

Assignees

@brusherru brusherru

Labels
hotfix Issue/PR for a patch release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@brusherru @nkrkv @evgenykochetkov