Skip to content

XXX: backport test. - #2

Merged
oursland merged 1 commit into
mainfrom
backport-test
Jul 22, 2025
Merged

XXX: backport test.#2
oursland merged 1 commit into
mainfrom
backport-test

Conversation

@oursland

Copy link
Copy Markdown
Owner

Issues

Before and After Images

@oursland
oursland merged commit 882853e into main Jul 22, 2025
11 of 12 checks passed
@github-actions

Copy link
Copy Markdown

Backport failed for release/FreeCAD-1-0: couldn't find remote ref release/FreeCAD-1-0.
Please ensure that this Github repo has a branch named release/FreeCAD-1-0.

@github-actions

Copy link
Copy Markdown

Backport failed for releases/FreeCAD-1-0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin releases/FreeCAD-1-0
git worktree add -d .worktree/backport-2-to-releases/FreeCAD-1-0 origin/releases/FreeCAD-1-0
cd .worktree/backport-2-to-releases/FreeCAD-1-0
git switch --create backport-2-to-releases/FreeCAD-1-0
git cherry-pick -x 1432adf10bc9d51667d2a0dc9a4090f9d05e1cc4

oursland pushed a commit that referenced this pull request Oct 31, 2025
- Fix hint text to say 'pick symmetry line or symmetry point' for two points + symmetry point workflow
- Add missing sequence {SelVertexOrRoot, SelVertexOrRoot, SelVertexOrRoot} to allowedSelSequences
- Add case 8 to handle two points + symmetry point constraint creation
- Fix duplicate constraint creation by adding return statement in case 8
- Add getSelection().clearSelection() for consistency

Fixes reviewer comment #2 from PR FreeCAD#22282
oursland pushed a commit that referenced this pull request Jan 28, 2026
oursland pushed a commit that referenced this pull request Jan 28, 2026
* CAM: Drilling - Fix regression after FreeCAD#26584

* CAM: Linking generator - Fix machinestate handling

Fix linking generator for drilling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add remaining logic to terminate canned cycles appropriately (#2)

* sorted heights

* Refactor buildPostList

Introduces early tool prep to the buildpostables.
Allows emitting a T command early to give tool changer
time to index the tool before the M6 tool change command is emitted.

updates unit testing for this use case

Not implemented in postprocessors yet.

fix

* Helper and tests for terminating canned cycles

fix cycle termination

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* CAM: setFeedRate now aware of drilling semantics (#3)

Remove retract plane property
machinestate properly handling z position

* next bugs (#4)

* setFeedRate now aware of drilling semantics
Remove retract plane property
machinestate properly handling z position

* unnecessary import.
Improved linking

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix rendering of canned cycles in G99 mode (FreeCAD#5)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix for collision  (FreeCAD#6)

* collision bug fix

* fix local variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: sliptonic <shopinthewoods@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@oursland
oursland deleted the backport-test branch April 5, 2026 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant