rendered paste body? diff-lg.txt
? configs/5axis/emc.nml
? src/emc/usr_intf/stepconf/AUTHORS
? src/emc/usr_intf/stepconf/ChangeLog
? src/emc/usr_intf/stepconf/Makefile.am
? src/emc/usr_intf/stepconf/NEWS
? src/emc/usr_intf/stepconf/README
? src/emc/usr_intf/stepconf/autogen.sh
? src/emc/usr_intf/stepconf/configure.in
? src/emc/usr_intf/stepconf/po
? src/emc/usr_intf/stepconf/src
? src/emc/usr_intf/stepconf/stamp-h.in
Index: nc_files/tort.ngc
===================================================================
RCS file: /cvs/emc2/nc_files/tort.ngc,v
retrieving revision 1.1
diff -c -r1.1 tort.ngc
*** nc_files/tort.ngc 9 Mar 2006 13:00:12 -0000 1.1
--- nc_files/tort.ngc 1 Dec 2007 07:00:06 -0000
***************
*** 1,5 ****
--- 1,7 ----
g21
G0 X0 Y0 Z20
+ (msg,note axis positions... will return here at end of pgm. press 's')
+ m0
F100
G1 X2.000000 Y-4.000000 Z16.000000
G0 X2.000000 Y-1.000000 Z16.000000
***************
*** 276,279 ****
--- 278,282 ----
G1 F230 X-22.640586 Y15.324350 Z-7.476374
G17 G2 (255 59) I2.329371 J8.693332 X-15.811214 Y31.811911 Z-8.976374
G17 G2 F900 (45 135) I-1.414214 J-1.414214 X-18.639641 Y31.811911 Z-11.476374
+ G0 X0 Y0 Z20
m2
Index: src/emc/usr_intf/stepconf/stepconf.glade
===================================================================
RCS file: /cvs/emc2/src/emc/usr_intf/stepconf/stepconf.glade,v
retrieving revision 1.7
diff -c -r1.7 stepconf.glade
*** src/emc/usr_intf/stepconf/stepconf.glade 28 Nov 2007 23:49:21 -0000 1.7
--- src/emc/usr_intf/stepconf/stepconf.glade 1 Dec 2007 07:00:10 -0000
***************
*** 700,705 ****
--- 700,706 ----
PMDX-150
Sherline
Xylotex
+ Parker-oem750
Other</property>
<property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
***************
*** 926,953 ****
</child>
<child>
- <widget class="GtkSpinButton" id="dirsetup">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">100</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1000 0 50000 100 1000 1000</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkSpinButton" id="latency">
<property name="visible">True</property>
<property name="can_focus">True</property>
--- 927,932 ----
***************
*** 1170,1175 ****
--- 1149,1176 ----
<property name="y_options">fill</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkSpinButton" id="dirsetup">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">100</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">200000 0 250000 100 1000 1000</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
Index: src/emc/usr_intf/stepconf/stepconf.py
===================================================================
RCS file: /cvs/emc2/src/emc/usr_intf/stepconf/stepconf.py,v
retrieving revision 1.21
diff -c -r1.21 stepconf.py
*** src/emc/usr_intf/stepconf/stepconf.py 26 Nov 2007 13:52:36 -0000 1.21
--- src/emc/usr_intf/stepconf/stepconf.py 1 Dec 2007 07:00:11 -0000
***************
*** 642,652 ****
if pump:
print >>file, "loadrt charge_pump"
! if ESTOP_IN in inputs:
! print >>file, "net estop-ext => charge-pump.enable"
! else:
! print >>file, "net estop-out => charge-pump.enable"
! print >>file, "net charge-pump <= charge-pump.out"
if pwm:
print >>file, "loadrt pwmgen output_type=0"
--- 642,649 ----
if pump:
print >>file, "loadrt charge_pump"
! print >>file, "net estop-out charge-pump.enable iocontrol.0.user-enable-out"
! print >>file, "net charge-pump <= charge-pump.out"
if pwm:
print >>file, "loadrt pwmgen output_type=0"
***************
*** 690,695 ****
--- 687,698 ----
if CCW in outputs:
print >>file, "net spindle-brake <= motion.spindle-brake"
+ if MIST in outputs:
+ print >>file, "net coolant-mist <= iocontrol.0.coolant-mist"
+
+ if FLOOD in outputs:
+ print >>file, "net coolant-flood <= iocontrol.0.coolant-flood"
+
if encoder:
print >>file
if PHB not in inputs:
***************
*** 973,978 ****
--- 976,982 ----
[1000, 2000, 1000, 1000], # PMDX-150
[1000, 6000, 24000, 20000], # Sherline XXX find proper values
[1000, 2000, 200, 200], # Xylotex
+ [1000, 1000, 1000, 200000], # Parker-Compumotor oem750
]
v = self.widgets.drivertype.get_active()
if v < len(drive_characteristics):