-
Notifications
You must be signed in to change notification settings - Fork 36
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
Add files via upload #5
Open
grotius-cnc
wants to merge
2
commits into
dillonhuff:master
Choose a base branch
from
grotius-cnc:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| #include "interface.h" | ||
|
|
||
| interface::interface() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| void interface::read_gcode_file(std::string filename){ | ||
|
|
||
| enum g_type { | ||
| G0=0, | ||
| G1=1, | ||
| G2=2, | ||
| G3=3 | ||
| }; | ||
|
|
||
| //https://github.com/dillonhuff/gpr/ | ||
| using namespace gpr; | ||
|
|
||
| std::ifstream t(filename.c_str()); | ||
| std::string file_contents((std::istreambuf_iterator<char>(t)), | ||
| std::istreambuf_iterator<char>()); | ||
|
|
||
| gcode_program p = parse_gcode(file_contents); | ||
|
|
||
| for(int i=0; i<p.num_blocks(); i++){ | ||
| //std::cout<<"gcode line chunck size:"<<p.get_block(i).size()<<std::endl; // Text editor line +1. | ||
|
|
||
| for(int chunk=0; chunk<p.get_block(i).size(); chunk++){ | ||
|
|
||
| /* | ||
| std::cout<<"chunk data: "<<p.get_block(i).get_chunk(chunk)<<std::endl; // Text editor line +1. | ||
| if(p.get_block(i).get_chunk(chunk).tp()==CHUNK_TYPE_WORD_ADDRESS){ // tp=type | ||
| std::cout<<"chunk word id: "<<p.get_block(i).get_chunk(chunk).get_word()<<std::endl; // the chunk Id. | ||
|
|
||
| block b=p.get_block(i); | ||
| if(b.get_chunk(chunk).get_address().tp()==ADDRESS_TYPE_DOUBLE){ | ||
| std::cout<<"chunk double value: "<<b.get_chunk(chunk).get_address().double_value()<<std::endl; | ||
| } | ||
|
|
||
| if(b.get_chunk(chunk).get_address().tp()==ADDRESS_TYPE_INTEGER){ | ||
| std::cout<<"chunk integer value: "<<b.get_chunk(chunk).get_address().int_value()<<std::endl; | ||
| } | ||
|
|
||
| if(b.get_chunk(chunk).tp()==CHUNK_TYPE_COMMENT){ | ||
| std::cout<<"chunk comment: "<<b.get_chunk(chunk).get_comment_text()<<std::endl; // the chunk Id. | ||
| } | ||
| } | ||
| */ | ||
|
|
||
| // Find the character : g,G | ||
| char a='0'; | ||
| if(p.get_block(i).get_chunk(chunk).tp()==CHUNK_TYPE_WORD_ADDRESS){ // tp=type | ||
| a=p.get_block(i).get_chunk(chunk).get_word(); | ||
| } | ||
| char axisletter; | ||
| int gtype=11111; | ||
| double X=0,Y=0,Z=0,I=0,J=0,F=0; | ||
|
|
||
| if(a=='G' || a=='g'){ | ||
| // std::cout<<"G found"<<std::endl; | ||
| // Find 0,1,2,3 | ||
| gtype=p.get_block(i).get_chunk(chunk).get_address().int_value(); | ||
| // std::cout<<"G type:"<<gtype<<std::endl; | ||
|
|
||
| if(gtype==0){ | ||
| // std::cout<<"G0, draw a rapid"<<std::endl; | ||
|
|
||
| for(int j=chunk+1; j<p.get_block(i).size(); j++){ | ||
| // Get the xyz values. | ||
| axisletter=p.get_block(i).get_chunk(j).get_word(); | ||
| if(axisletter=='X' || axisletter=='x'){ | ||
| X=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Y' || axisletter=='y'){ | ||
| Y=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Z' || axisletter=='z'){ | ||
| Z=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| } | ||
| std::cout<<"g0 x:"<<X<<" y:"<<Y<<" z:"<<Z<<" f:"<<F<<std::endl; | ||
| } | ||
| if(gtype==1){ | ||
| // std::cout<<"G1, draw a line"<<std::endl; | ||
|
|
||
| for(int j=chunk+1; j<p.get_block(i).size(); j++){ | ||
| // Get the xyz values. | ||
| axisletter=p.get_block(i).get_chunk(j).get_word(); | ||
| if(axisletter=='X' || axisletter=='x'){ | ||
| X=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Y' || axisletter=='y'){ | ||
| Y=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Z' || axisletter=='z'){ | ||
| Z=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='F' || axisletter=='f'){ | ||
| F=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| } | ||
| std::cout<<"g1 x:"<<X<<" y:"<<Y<<" z:"<<Z<<" f:"<<F<<std::endl; | ||
| } | ||
| if(gtype==2){ | ||
| // std::cout<<"G2, draw a cw arc"<<std::endl; | ||
|
|
||
| for(int j=chunk+1; j<p.get_block(i).size(); j++){ | ||
| // Get the xyz values. | ||
| axisletter=p.get_block(i).get_chunk(j).get_word(); | ||
| if(axisletter=='X' || axisletter=='x'){ | ||
| X=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Y' || axisletter=='y'){ | ||
| Y=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Z' || axisletter=='z'){ | ||
| Z=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='I' || axisletter=='i'){ | ||
| I=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='J' || axisletter=='j'){ | ||
| J=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='F' || axisletter=='f'){ | ||
| F=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| } | ||
| std::cout<<"g2 x:"<<X<<" y:"<<Y<<" z:"<<Z<<" i:"<<I<<" j:"<<J<<" f:"<<F<<std::endl; | ||
| } | ||
| if(gtype==3){ | ||
| // std::cout<<"G3, draw a ccw arc"<<std::endl; | ||
|
|
||
| for(int j=chunk+1; j<p.get_block(i).size(); j++){ | ||
| // Get the xyz values. | ||
| axisletter=p.get_block(i).get_chunk(j).get_word(); | ||
| if(axisletter=='X' || axisletter=='x'){ | ||
| X=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Y' || axisletter=='y'){ | ||
| Y=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='Z' || axisletter=='z'){ | ||
| Z=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='I' || axisletter=='i'){ | ||
| I=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='J' || axisletter=='j'){ | ||
| J=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| if(axisletter=='F' || axisletter=='f'){ | ||
| F=p.get_block(i).get_chunk(j).get_address().double_value(); | ||
| } | ||
| } | ||
| std::cout<<"g3 x:"<<X<<" y:"<<Y<<" z:"<<Z<<" i:"<<I<<" j:"<<J<<" f:"<<F<<std::endl; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| std::cout<<" "<<std::endl; // the chunk Id. | ||
|
|
||
|
|
||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #ifndef INTERFACE_H | ||
| #define INTERFACE_H | ||
|
|
||
| #include <iostream> | ||
| #include <fstream> | ||
| #include <libgcode/parser.h> | ||
|
|
||
| class interface | ||
| { | ||
| public: | ||
| interface(); | ||
| !// A Function to print out the fancy gcode file. | ||
| void read_gcode_file(std::string filename); | ||
| }; | ||
|
|
||
| #endif // INTERFACE_H |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you remove this commented out block of code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is nice reference (debug) code. I would prefer it stay's there for info.