Merge branch 'master' of ppi.ddns.net:thad/linuxcnc

configs/lagun_gmoccapy/linuxcnc.var

@@ -27,9 +27,9 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	0.488159
-5222	-0.501329
-5223	-1.515298
+5221	7.046981
+5222	0.266575
+5223	-2.928337
 5224	0.000000
 5225	0.000000
 5226	0.000000

configs/lagun_gmoccapy/linuxcnc.var.bak

@@ -27,9 +27,9 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	0.488159
-5222	-0.501329
-5223	-1.515298
+5221	7.046981
+5222	0.266575
+5223	-2.928337
 5224	0.000000
 5225	0.000000
 5226	0.000000

configs/lagun_gmoccapy/my_LinuxCNC_machine.pref

@@ -35,7 +35,7 @@ audio_enabled = True
 audio_alert = /usr/share/sounds/freedesktop/stereo/dialog-warning.oga
 audio_error = /usr/share/sounds/freedesktop/stereo/dialog-error.oga
 grid_size = 1.0
-view = z
+view = p
 mouse_btn_mode = 4
 hide_cursor = False
 hide_tooltips = False
@@ -73,8 +73,8 @@ run_from_line = no_run
 unlock_way = use
 show_preview_on_offset = False
 use_keyboard_shortcuts = True
-offset_axis_y = -0.1
-offset_axis_x = -0.1875
+offset_axis_y = 0.0
+offset_axis_x = 0.0
 offset_axis_z = 0.0
 tool_in_spindle = 3
 

nc_files/LAMP-WASHER.ngc

@@ -0,0 +1,18 @@
+#<_z_clearance> = +0.200 ; clearance height
+#<_td> = 0.25
+
+M03 ; start spindle
+G4 P2 ; wait for spin up
+
+F5
+o<drill> call [4.46/2][0] [0.05][-0.15]
+o<drill> call [-4.46/2][0] [0.05][-0.15]
+o<frame_circ> call [0][0] [2.5] [0.05][-0.15] [0] [+4]
+o<frame_circ> call [0][0] [6.0] [0.05][-0.15] [0] [+4+8]
+
+
+M05 ; stop spindle
+;G0 X-8
+M30 ; end program
+M2  ; also end program
+%