Skip to content

Commit

Permalink
more worky
Browse files Browse the repository at this point in the history
  • Loading branch information
Ross MacLeod committed Oct 18, 2020
1 parent 03213ac commit 7bbeec0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
8 changes: 4 additions & 4 deletions config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ X = 1122
Y = 0

FAST_FEED = 1000
SLOW_FEED = 50
SLOW_FEED = 10

RETRACT_Z = 2
RETRACT_Z = 5

Z_MAX_TRAVEL = 400
Z_MAX_TRAVEL = 370

SPINDLE_ZERO_HEIGHT = 386.1696

Expand Down Expand Up @@ -116,7 +116,7 @@ MDI_COMMAND=...
MDI_COMMAND=G10 L20 P1 X0
MDI_COMMAND=G10 L20 P1 Y0
MDI_COMMAND=G10 L20 P1 Z0
MDI_COMMAND=o<safe_to_g54_zero> call
MDI_COMMAND=o<go_to_g54> call

[TRAJ]
SPINDLES = 1
Expand Down
2 changes: 0 additions & 2 deletions macros/tool_touch_off.ngc
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ m66 e0 l0 (force a synch)

#<new_tlo> = [abs[#<_ini[toolsetter]spindle_zero_height> + #<z_slow_probe>]]

(debug, probed fast at #<z_fast_probe>, slow at #<z_slow_probe>, new TLO = #<new_tlo>)

g10 l1 p[#<load_spindle_tool_number_2>] z[#<new_tlo>]

o<restore> call [#<save_metric>] [#<save_absolute>] [#<save_feed>] [#<save_coord_system>]
Expand Down
23 changes: 23 additions & 0 deletions tools-from-fusion.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

import sys

hdr = sys.stdin.readline().strip().split("\t")
col = {}
for i, tok in enumerate(hdr):
col[tok] = i

for l in sys.stdin:
l = l.strip()
toks = l.split("\t")
descr = "{} {} ({} {})".format(
toks[col["diameter"]], toks[col["type"]].split(" ")[0],
toks[col["manufacturer"]], toks[col["product-id"]]
)
sys.stdout.write("T{} P{} D{} Z+50 ; {}\n".format(
toks[col["number"]], toks[col["diameter-offset"]], toks[col["diameter"]], descr
))



0 comments on commit 7bbeec0

Please sign in to comment.