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

Addition of CAM postprocessor for the Masso controller #18845

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tried to make refactored linux and masso as compatable line by line t…
…o support fil diffing
  • Loading branch information
ShamanTcler committed Dec 11, 2024
commit efbaeccf74c1e0827aa6248ff9fc90901a20f2c1
2 changes: 1 addition & 1 deletion src/Mod/CAM/Path/Post/scripts/refactored_linuxcnc_post.py
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. *
# * *
Expand All @@ -26,7 +27,6 @@
# * Note: refactored_masso_g3_Post.py is a modified clone of this file *
Copy link
Contributor

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

Copy link
Contributor

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 ?

Copy link
Author

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.

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
Author

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.

# * any changes to this file should be applied to the other *
# * *
# * *
# ***************************************************************************

import argparse
Expand Down
7 changes: 6 additions & 1 deletion src/Mod/CAM/Path/Post/scripts/refactored_masso _g3_post.py
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. *
# * *
Expand All @@ -23,6 +23,11 @@
# * *
# ***************************************************************************

# ***************************************************************************
# * Note: this is copy & mod of refactored_linuxcnc_post.py *
# * *
# * *
# ***************************************************************************

import argparse

Expand Down