Skip to content

Commit

Permalink
Merge branch 'kh/parametricBolts' of
Browse files Browse the repository at this point in the history
https://github.com/OperationSmallKat/Marcos.git into main

Conflicts:
	MarcosCad.groovy
  • Loading branch information
madhephaestus committed Jun 19, 2023
2 parents 8a840d0 + 822e10c commit c72509f
Show file tree
Hide file tree
Showing 4 changed files with 546 additions and 642 deletions.
8 changes: 4 additions & 4 deletions Marcos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<DHParameters>
<Delta>-5.0</Delta>
<Theta>0.01</Theta>
<Radius>38.0</Radius>
<Radius>31.0</Radius>
<Alpha>-89.97</Alpha>
</DHParameters>

Expand Down Expand Up @@ -273,7 +273,7 @@
<DHParameters>
<Delta>-5.0</Delta>
<Theta>0.01</Theta>
<Radius>38.0</Radius>
<Radius>31.0</Radius>
<Alpha>-89.97</Alpha>
</DHParameters>

Expand Down Expand Up @@ -474,7 +474,7 @@
<DHParameters>
<Delta>-5.0</Delta>
<Theta>0.01</Theta>
<Radius>38.0</Radius>
<Radius>31.0</Radius>
<Alpha>-89.97</Alpha>
</DHParameters>

Expand Down Expand Up @@ -675,7 +675,7 @@
<DHParameters>
<Delta>-5.0</Delta>
<Theta>0.0</Theta>
<Radius>38.0</Radius>
<Radius>31.0</Radius>
<Alpha>-90.0</Alpha>
</DHParameters>

Expand Down
Loading

0 comments on commit c72509f

Please sign in to comment.