-
-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Addition of CAM postprocessor for the Masso controller #18845
Open
ShamanTcler
wants to merge
12
commits into
FreeCAD:main
Choose a base branch
from
ShamanTcler:main
base: main
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.
+559
−2
Open
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
12d8ec2
Mods to accommodate tool order in Gcode. Some controllers want T# M6 …
ShamanTcler 6580761
Added tests and additional comments
ShamanTcler 56253f3
Working on the testing framework
ShamanTcler efbaecc
Tried to make refactored linux and masso as compatable line by line t…
ShamanTcler 0b96be3
A space in the file name caused all sorts of grief ... Thanks Larry
ShamanTcler a32eceb
Merge branch 'FreeCAD:main' into main
ShamanTcler 18282f7
added files to , swapped tool order in testrefactored_masso
ShamanTcler a4ec52a
Added note regarding how files are "clones" of one another
ShamanTcler ba8124e
Added space in comment line for consistent formatting.
ShamanTcler 66f92c3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 57687f0
Updated formatting and comments
ShamanTcler 2d644a2
Merge branch 'main' of https://github.com/ShamanTcler/FreeCAD_Masso i…
ShamanTcler 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
Tried to make refactored linux and masso as compatable line by line t…
…o support fil diffing
- Loading branch information
commit efbaeccf74c1e0827aa6248ff9fc90901a20f2c1
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 |
---|---|---|
@@ -1,6 +1,7 @@ | ||
# *************************************************************************** | ||
# * Copyright (c) 2014 sliptonic <[email protected]> * | ||
# * Copyright (c) 2022 Larry Woestman <[email protected]> * | ||
# * Copyright (c) 2024 Carl Slater <[email protected]> | ||
# * * | ||
# * This file is part of the FreeCAD CAx development system. * | ||
# * * | ||
|
@@ -26,7 +27,6 @@ | |
# * Note: refactored_masso_g3_Post.py is a modified clone of this file * | ||
# * any changes to this file should be applied to the other * | ||
# * * | ||
# * * | ||
# *************************************************************************** | ||
|
||
import argparse | ||
|
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 |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# *************************************************************************** | ||
# * Copyright (c) 2014 sliptonic <[email protected]> * | ||
# * Copyright (c) 2022 Larry Woestman <[email protected]> * | ||
# * Copyright (c) 2022 Carl Slater <[email protected]> | ||
# * Copyright (c) 2024 Carl Slater <[email protected]> | ||
# * * | ||
# * This file is part of the FreeCAD CAx development system. * | ||
# * * | ||
|
@@ -23,6 +23,11 @@ | |
# * * | ||
# *************************************************************************** | ||
|
||
# *************************************************************************** | ||
# * Note: this is copy & mod of refactored_linuxcnc_post.py * | ||
# * * | ||
# * * | ||
# *************************************************************************** | ||
|
||
import argparse | ||
|
||
|
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.
lint: fix end of line asterisk
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.
There are 3-4 places where the asterisk is not uniform do you mind fixing these ?
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.
First, of course I will make the changes. However, when I look at the code in my editor it looks fine. I am assuming I have a tab vs space substitution.
Is see "lint" is the tool you used to find the issues. Would you mind giving me the command line arguments, so I can generate the issues myself?
In my defense, I did search the web for "FreeCAD Pull Request procedure" and came up pretty empty. I did look at the Developers Handbook. I did see the mention of "Black" as a Python formatter ... I am a C++ kinda guy, so it is a new tool to me. Running Visual Studio Code, I see there is an extension for "Black" ... is this what is used? I ask because I know how out of date the wiki can be.
Thank you for your time and patience.
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.
raw file: https://raw.githubusercontent.com/FreeCAD/FreeCAD/66f92c3bad29093f27f92bc27a421079563c3c3d/src/Mod/CAM/CAMTests/TestRefactoredMassoG3Post.py
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.
Ok updated 4 files with corrected comment alignment, and check it all back in again.
Did a clean build and re-ran the test framework. Only error from the Framework was for an area I never touched.
FAIL: test01 (CAMTests.TestPathToolController.TestPathToolController.test01)
Verify ToolController template roundtrip.
I am afraid that is an issue for Sliptonic.