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

Auto uppercase Gcode except for codes in a configurable blacklist #2177

Closed
wants to merge 9 commits into from

Conversation

pbackx
Copy link
Contributor

@pbackx pbackx commented Oct 25, 2017

What does this PR do and why is it necessary?

This PR completes the previous PR by @agarwali #1321
It implements the changes discussed in #1026

How was it tested? How can it be tested by the reviewer?

I tested this manually by changing the uppercase blacklist setting and trying some commands in the terminal.
These changes are mostly JavaScript and I couldn't find any JavaScript tests (please correct me if I'm wrong, I'm very new to this project)

Any background context you want to provide?

I noticed this issue and PR hadn't been updated in a while and found it a nice introduction to some of OctoPrint's frontend code.

What are the relevant tickets if any?

#1026

Further notes

I'm not very good at rebasing and squashing commits in Git. I also didn't want to remove @agarwali and @eykrevooh from the commit history. But if the number of commits bothers you, I can try to figure out how to do this 😄

agarwali and others added 9 commits April 30, 2016 19:36
Added new config setting: auto uppercase blacklist that is configurable in the advanced option of the serial tab, with M117 included in the default settings of the blacklist.
Changed the sendCommand method in the TerminalViewModel to auto uppercase the entire gcode command except when gcode is in the blacklist.
Updated documentaion to include the defualt auto uppercase blacklist command M117.

Resolves: OctoPrint#1026
# Conflicts:
#	AUTHORS.md
#	docs/configuration/config_yaml.rst
#	src/octoprint/server/api/settings.py
#	src/octoprint/settings.py
# Conflicts:
#	AUTHORS.md
#	docs/configuration/config_yaml.rst
#	src/octoprint/server/api/settings.py
#	src/octoprint/settings.py
…into dev/GCodeAutoUppercase

# Conflicts:
#	docs/configuration/config_yaml.rst
@pbackx pbackx changed the title Dev/g code auto uppercase Auto uppercase Gcode except for codes in a configurable blacklist Oct 25, 2017
@foosel
Copy link
Member

foosel commented Oct 26, 2017

Awesome 👍 I was hoping someone would do this since :)

To get this into OctoPrint ASAP, how about this: I'll rebase this to get rid of the merge commits and then we'll get this into the maintenance branch. Sounds good? Alternative you can of course also try your hand at that yourself, I just think it might get tricky and git can be a bit frustrating in such cases 😅

@pbackx
Copy link
Contributor Author

pbackx commented Oct 30, 2017

No, you go ahead with the rebasing. I'm fine with whatever way you solve this 😄

@foosel
Copy link
Member

foosel commented Nov 3, 2017

Ok, this has now been rebased against devel and then cherry picked as 51406b7 and ce16f86 to maintenance.

I also added support for GCODE subcodes (e.g. M106.1) while at it.

Closing this manually because Github doesn't properly detect the cherry pick - don't be alarmed by that :) Thanks again for finalizing this so it could be merged! 👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants