Commit bf7aa25
committed
feat(rs274ngc): MAX_UNWIND_TURNS auto rotary G0 rebase via G92
Add [AXIS_<L>] MAX_UNWIND_TURNS = N. On a G0 absolute move with the
rotary word, if the programmed (work-frame) delta exceeds N full turns,
fold the whole turns into the axis (G92) offset so the motor takes the
shortest path (within +/- 180 deg) to the target's angular position
while the work-frame position still reaches the commanded target. The
motion-side accumulated position is unchanged, so stepgens, encoders and
PID see no discontinuity.
Riding the existing G92 plumbing means the DRO, #<_a> and #5423 all
report the programmed value with no special-casing; the accumulated
turns appear as a G92 offset (#5214-#5216).
On re-home or estop reset the interpreter resynchronizes and detects the
frame re-anchor (a >180 deg work-frame jump on a managed axis with a
live offset); it collapses the stale offset back into the work frame and
re-emits the G92 so canon agrees, so a fresh home starts clean.
Gated to trivkins 1:1 axis-to-joint mapping; coupled kinematics (5-axis
TCP, gantry rotary) unsupported. Mutually exclusive with WRAPPED_ROTARY
(startup warning if both set on the same axis). Default 0 (disabled).1 parent f108dbd commit bf7aa25
4 files changed
Lines changed: 152 additions & 3 deletions
File tree
- docs/src/config
- src/emc/rs274ngc
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1017 | 1017 | | |
1018 | 1018 | | |
1019 | 1019 | | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
| 1023 | + | |
| 1024 | + | |
| 1025 | + | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
1020 | 1044 | | |
1021 | 1045 | | |
1022 | 1046 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5399 | 5399 | | |
5400 | 5400 | | |
5401 | 5401 | | |
| 5402 | + | |
| 5403 | + | |
| 5404 | + | |
| 5405 | + | |
| 5406 | + | |
| 5407 | + | |
| 5408 | + | |
| 5409 | + | |
| 5410 | + | |
| 5411 | + | |
| 5412 | + | |
| 5413 | + | |
| 5414 | + | |
| 5415 | + | |
| 5416 | + | |
| 5417 | + | |
| 5418 | + | |
| 5419 | + | |
| 5420 | + | |
| 5421 | + | |
| 5422 | + | |
| 5423 | + | |
| 5424 | + | |
| 5425 | + | |
| 5426 | + | |
| 5427 | + | |
| 5428 | + | |
| 5429 | + | |
| 5430 | + | |
| 5431 | + | |
| 5432 | + | |
| 5433 | + | |
| 5434 | + | |
| 5435 | + | |
| 5436 | + | |
| 5437 | + | |
| 5438 | + | |
| 5439 | + | |
| 5440 | + | |
| 5441 | + | |
| 5442 | + | |
| 5443 | + | |
| 5444 | + | |
| 5445 | + | |
| 5446 | + | |
| 5447 | + | |
| 5448 | + | |
5402 | 5449 | | |
5403 | 5450 | | |
5404 | 5451 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
811 | 811 | | |
812 | 812 | | |
813 | 813 | | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
814 | 823 | | |
815 | 824 | | |
816 | 825 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
859 | 859 | | |
860 | 860 | | |
861 | 861 | | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
862 | 865 | | |
863 | 866 | | |
864 | 867 | | |
| |||
888 | 891 | | |
889 | 892 | | |
890 | 893 | | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
891 | 916 | | |
892 | 917 | | |
893 | 918 | | |
| |||
2033 | 2058 | | |
2034 | 2059 | | |
2035 | 2060 | | |
2036 | | - | |
2037 | | - | |
2038 | | - | |
| 2061 | + | |
| 2062 | + | |
| 2063 | + | |
| 2064 | + | |
| 2065 | + | |
| 2066 | + | |
| 2067 | + | |
| 2068 | + | |
| 2069 | + | |
| 2070 | + | |
| 2071 | + | |
| 2072 | + | |
| 2073 | + | |
| 2074 | + | |
| 2075 | + | |
| 2076 | + | |
| 2077 | + | |
| 2078 | + | |
| 2079 | + | |
| 2080 | + | |
| 2081 | + | |
| 2082 | + | |
| 2083 | + | |
| 2084 | + | |
| 2085 | + | |
| 2086 | + | |
| 2087 | + | |
| 2088 | + | |
| 2089 | + | |
| 2090 | + | |
| 2091 | + | |
| 2092 | + | |
| 2093 | + | |
| 2094 | + | |
| 2095 | + | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
2039 | 2108 | | |
2040 | 2109 | | |
2041 | 2110 | | |
| |||
0 commit comments