Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jepler/linuxcnc-mirror
base: f0202a28d1
...
head fork: jepler/linuxcnc-mirror
compare: 5d1ca14095
  • 10 commits
  • 8 files changed
  • 0 commit comments
  • 5 contributors
Commits on Apr 13, 2012
@jethornton jethornton Docs: fixed the assumption that the reader was using a git checkout
Signed-off-by: John Thornton <jthornton@gnipsel.com>
733c466
Commits on Apr 15, 2012
@cradek cradek touchy: use the rebranded nc_files path 7a33c70
Commits on Apr 18, 2012
@c-morley c-morley pncconf -fix some 5i25 sserial errors
7i77 misspelled analog enable pin
7i76 many sserial commands had extra periods in the name
7i76 error when using digital potentiometer for spindle control when making the INI FILE
6481c8a
Commits on Apr 19, 2012
@c-morley c-morley pncconf -fix layout of basic machine info page
The frames did not line up.
The config directory line was not big enough for some config names
so was enlarged.
3b399df
@c-morley c-morley pncconf -fix BLDC options were sensitive by default
On the motor/encoder config page the BLDC options were sensitive before
they were selected.
1366194
@c-morley c-morley pncconf -add info to help pages 64441d0
@roggedaniel roggedaniel Correctly set settings->spindle_mode on G96/G97 in interp_convert.cc.…
… Fixes bug where Active GCodes string in Axis incorrectly displays current G96/G97 mode.
d7e3873
@cradek cradek explicitly set default spindle mode cc82903
Michael Haberler Merge branch 'v2.4_branch' into v2.5_branch fbc6920
Michael Haberler Merge branch 'v2.5_branch' 5d1ca14
View
46 docs/src/gui/gladevcp.txt
@@ -67,33 +67,61 @@ GladeVCP panel windows may be run in three different setups:
- as a tab in Axis and Touchy; in Axis this would create a third tab besides the Preview and DRO tabs which must be raised explicitly
- as a standalone toplevel window, which can be iconifyed/deiconified independent of the main window.
+.Installed LinuxCNC
+If your using an installed version of LinuxCNC the examples shown below are in
+the <<cha:starting-linuxcnc,configuration picker>> in the 'Sample
+Configurations > sim > gladevcp' branch.
+
+.Git Checkout
+The following instructions only apply if your using a git checkout. Open a
+terminal and change to the directory created by git then issue the commmands
+as shown.
+
+[NOTE]
+For the following commands to work on your git checkout you must first run
+'make' then run 'sudo make setuid' then run '. ./scripts/rip-environment'.
+More information about a git checkout is on the linuxcnc wiki page.
+
Run the sample GladeVCP panel integrated into Axis like PyVCP as follows:
- $ cd configs/sim
- $ emc gladevcp_panel.ini
+----
+$ cd configs/sim/gladevcp
+$ linuxcnc gladevcp_panel.ini
+----
image::images/example-panel-small.png[]
Run the same panel, but as a tab inside Axis:
- $ cd configs/sim
- $ emc gladevcp_tab.ini
+----
+$ cd configs/sim/gladevcp
+$ linuxcnc gladevcp_tab.ini
+----
image::images/example-tabbed-small.png[]
To run this panel as a standalone toplevel window besides Axis, just
start Axis in the background and start gladevcp as follows:
- $ cd configs/sim
- $ emc axis.ini &
- $ gladevcp -c gladevcp -u ../gladevcp/hitcounter.py -H ../gladevcp/manual-example.hal ../gladevcp/manual-example.ui
+////
+FIXME: I'm not sure how this is supposed to work with axis in one
+directory and gladevcp in a different directory.
+////
+
+----
+$ cd configs/sim/axis
+$ linuxcnc axis.ini &
+$ gladevcp -c gladevcp -u ../gladevcp/hitcounter.py -H ../gladevcp/manual-example.hal ../gladevcp/manual-example.ui
+----
image::images/example-float-small.png[]
To run this panel inside 'Touchy':
- $ cd configs/sim
- $ emc gladevcp_touchy.ini
+----
+$ cd configs/sim/gladevcp
+$ linuxcnc gladevcp_touchy.ini
+----
image::images/touchy-tab-33.png[]
View
2  src/emc/rs274ngc/interp_convert.cc
@@ -3979,8 +3979,10 @@ int Interp::convert_speed(block_pointer block, //!< pointer to a block of RS27
int Interp::convert_spindle_mode(block_pointer block, setup_pointer settings)
{
if(block->g_modes[14] == G_97) {
+ settings->spindle_mode = CONSTANT_RPM;
enqueue_SET_SPINDLE_MODE(0);
} else { /* G_96 */
+ settings->spindle_mode = CONSTANT_SURFACE;
if(block->d_flag)
enqueue_SET_SPINDLE_MODE(block->d_number_float);
else
View
1  src/emc/rs274ngc/rs274ngc_pre.cc
@@ -1048,6 +1048,7 @@ int Interp::init()
_setup.sequence_number = 0; /*DOES THIS NEED TO BE AT TOP? */
//_setup.speed set in Interp::synch
_setup.speed_feed_mode = CANON_INDEPENDENT;
+ _setup.spindle_mode = CONSTANT_RPM;
//_setup.speed_override set in Interp::synch
//_setup.spindle_turning set in Interp::synch
//_setup.stack does not need initialization
View
9 src/emc/usr_intf/pncconf/pncconf-help/help-axismotor.txt
@@ -12,7 +12,6 @@ Servo Info:
FF0 - zero order feed forward
FF1 - first order feed forward
FF2 - second order feed forward
- Bias - used to add / subtract a constant value to dac.
Deadband - if the actual position is in this band
of the commanded proportional control will not be added.
Dac scale - scales the output nominal is +-1 volt
@@ -64,7 +63,7 @@ Brushless Control:
Please send suggestions to EMC mail list or forum.
Open loop servo test Button:
- Use this test to confirm proper Dac output.
+ Use this test to confirm proper Dac output and encoder input.
This is unavailable if using simulated realtime.
It is important to confirm the motor turns in the positive
direction when the positive jog button is pressed.
@@ -77,6 +76,12 @@ Open loop servo test Button:
the axis a known distance and noting the encoder count. The encoder
should function with out the amp enabled depending how it is powered.
The limit switches are not functional during this test.
+ The fast-dac / slow-dac options are preselect options so it is convienant
+ to switch between slow speed and fast speed. Set them to what you like -
+ remember there is no ramping.
+ Bias - used to add / subtract a constant value to the dac. It can only be
+ used for this test to tempararily stabilize a drifting motor - it will not
+ be used in the regular PID control.
Spindle-at-speed settings:
Set the scaling so EMC knows when the spindle is close enough
View
8 src/emc/usr_intf/pncconf/pncconf-help/help-mesa.txt
@@ -119,9 +119,10 @@ Connector Tabs:
7i70 I/O board
7i71 I/O board
7i76 I/O board works only with the 5i25 main board
+ 7i77 I/O board works only with the 5i25 main board
8i20 amplifier ( untested )
EMC supports 4 ports of 8 channels each of sserial
- PNCconf only configures 4 channels of port 0 (so max 4 sserial boards)
+ PNCconf only configures 6 channels of port 0 (so max 6 sserial boards)
You could change these options in a custom HAL file
If you wish to connect a component to something in a
@@ -164,7 +165,10 @@ Signal selection:
PNCconf will not catch the error of setting two components
the same (If fact for GPIOO outputs this is fine anyways)
-
+ For testing purposes if you require an output true, for instance to force
+ a relay to close to allow the amplifier to be powered, select the
+ 'force-pin-true' output signal. The openloop and tuning tests will then
+ set the output true for the length of the test.
View
49 src/emc/usr_intf/pncconf/pncconf.glade
@@ -188,7 +188,7 @@
<widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xscale">0.67000001668930054</property>
+ <property name="xscale">0.76999998092651367</property>
<child>
<widget class="GtkFrame" id="frame6">
<property name="visible">True</property>
@@ -238,7 +238,6 @@
<child>
<widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -247,6 +246,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
@@ -254,12 +254,11 @@
<property name="width_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label">confdir</property>
<property name="selectable">True</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -286,15 +285,21 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="axes">
+ <widget class="GtkAlignment" id="alignment48">
<property name="visible">True</property>
- <property name="items" translatable="yes">XYZ
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkComboBox" id="axes">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">XYZ
XYZA
XZ (Lathe)</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -308,6 +313,7 @@ XZ (Lathe)</property>
<child>
<widget class="GtkHBox" id="hbox24">
<property name="visible">True</property>
+ <property name="spacing">2</property>
<property name="homogeneous">True</property>
<child>
<widget class="GtkLabel" id="label4">
@@ -321,14 +327,20 @@ XZ (Lathe)</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="units">
+ <widget class="GtkAlignment" id="alignment47">
<property name="visible">True</property>
- <property name="items" translatable="yes">Inch
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkComboBox" id="units">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Inch
Millimeter</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -340,10 +352,6 @@ Millimeter</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
</child>
@@ -62969,6 +62977,12 @@ Charge Pump</property>
<property name="n_rows">10</property>
<property name="n_columns">2</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkSpinButton" id="xmaxoutput">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -62998,12 +63012,6 @@ Charge Pump</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkSpinButton" id="xFF2">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -63773,6 +63781,7 @@ Charge Pump</property>
<child>
<widget class="GtkHBox" id="xbldcoptionbox">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<child>
<widget class="GtkFrame" id="xbldcinputframe">
<property name="visible">True</property>
View
24 src/emc/usr_intf/pncconf/pncconf.py
@@ -1615,7 +1615,7 @@ def get(s): return self[letter + s]
else: temp = 1
print >>file, "OUTPUT_SCALE = %s" % (get("outputscale") * temp)
pwmpinname = self.make_pinname(pwmgen)
- if "analog" in pwmpinname or potoutput:
+ if (pwmgen and "analog" in pwmpinname) or potoutput:
print >>file, "OUTPUT_MIN_LIMIT = %s"% (get("outputminlimit"))
print >>file, "OUTPUT_MAX_LIMIT = %s"% (get("outputmaxlimit"))
@@ -1922,21 +1922,21 @@ def connect_axis(self, file, num, let):
# sserial digital potentiometer outputs for spindle eg 7i76 board
print >>file, "# ---digital potentionmeter output signals/setup---"
print >>file
- print >>file, "setp "+potpinname+".spinout-minlim [%s_%d]OUTPUT_MIN_LIMIT"% (title, axnum)
- print >>file, "setp "+potpinname+".spinout-maxlim [%s_%d]OUTPUT_MAX_LIMIT"% (title, axnum)
- print >>file, "setp "+potpinname+".spinout-scalemax [%s_%d]OUTPUT_SCALE"% (title, axnum)
+ print >>file, "setp "+potpinname+"spinout-minlim [%s_%d]OUTPUT_MIN_LIMIT"% (title, axnum)
+ print >>file, "setp "+potpinname+"spinout-maxlim [%s_%d]OUTPUT_MAX_LIMIT"% (title, axnum)
+ print >>file, "setp "+potpinname+"spinout-scalemax [%s_%d]OUTPUT_SCALE"% (title, axnum)
for i in potinvertlist:
if i == POTO:
- print >>file, "setp "+potpinname+".spindir-invert true"
+ print >>file, "setp "+potpinname+"spindir-invert true"
if i == POTE:
- print >>file, "setp "+potpinname+".spinena-invert true"
+ print >>file, "setp "+potpinname+"spinena-invert true"
print >>file
if closedloop:
- print >>file, "net spindle-output => " + potpinname + ".spinout"
+ print >>file, "net spindle-output => " + potpinname + "spinout"
else:
- print >>file, "net spindle-vel-cmd => " + potpinname + ".spinout"
- print >>file, "net spindle-enable => " + potpinname +".spinena"
- print >>file, "net spindle-ccw => " + potpinname +".spindir"
+ print >>file, "net spindle-vel-cmd => " + potpinname + "spinout"
+ print >>file, "net spindle-enable => " + potpinname +"spinena"
+ print >>file, "net spindle-ccw => " + potpinname +"spindir"
print >>file
if pwmpinname:
@@ -1944,12 +1944,12 @@ def connect_axis(self, file, num, let):
print >>file
# sserial daughter board PWMGENS eg 7i77
if "analogout" in pwmpinname:
+ rawpinname = self.make_pinname(pwmpin,False,True) # dont want the component name
print >>file, "setp "+pwmpinname+"-scalemax [%s_%d]OUTPUT_SCALE"% (title, axnum)
print >>file, "setp "+pwmpinname+"-minlim [%s_%d]OUTPUT_MIN_LIMIT"% (title, axnum)
print >>file, "setp "+pwmpinname+"-maxlim [%s_%d]OUTPUT_MAX_LIMIT"% (title, axnum)
print >>file
if let == 's':
- rawpinname = self.make_pinname(pwmpin,False,True) # dont want the component name
print >>file
if closedloop:
print >>file, "net spindle-output => " + pwmpinname
@@ -1963,7 +1963,7 @@ def connect_axis(self, file, num, let):
print >>file, "net %s-enable axis.%d.amp-enable-out"% (let,axnum)
if let == "x":
print >>file, "# enable _all_ sserial pwmgens"
- print >>file, "net %s-enable %s"% (let,pwmpinname)
+ print >>file, "net %s-enable %sanalogena"% (let,rawpinname)
print >>file
else:
View
2  src/emc/usr_intf/touchy/filechooser.py
@@ -22,7 +22,7 @@ def __init__(self, gtk, emc, labels, eventboxes, listing):
self.emc = emc
self.emccommand = emc.command()
self.fileoffset = 0
- self.dir = os.path.join(os.getenv('HOME'), 'emc2', 'nc_files')
+ self.dir = os.path.join(os.getenv('HOME'), 'linuxcnc', 'nc_files')
self.reload(0)
def populate(self):

No commit comments for this range

Something went wrong with that request. Please try again.