linuxcnc.git
8 years agoFix M19 test; M19 and M19Q1 now issue default orients cradek/m19-without-r-defaults
Chris Radek [Fri, 3 Oct 2014 14:39:43 +0000 (09:39 -0500)]
Fix M19 test; M19 and M19Q1 now issue default orients

Signed-off-by: Chris Radek <chris@timeguy.com>
8 years agoMake M19 without a specified R word (target) default to 0
Chris Radek [Fri, 3 Oct 2014 14:10:58 +0000 (09:10 -0500)]
Make M19 without a specified R word (target) default to 0

I think this was the intent.  Before this fix, specifying a bare M19 would
cause no orient to be issued at all.  Now, it's as if you specified R0.

Signed-off-by: Chris Radek <chris@timeguy.com>
8 years agodocs: describe our git workflow briefly
Sebastian Kuzminsky [Wed, 29 Oct 2014 06:06:50 +0000 (00:06 -0600)]
docs: describe our git workflow briefly

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agopopupkeyboard.py: support standalone demonstration
Dewey Garrett [Mon, 27 Oct 2014 14:36:53 +0000 (07:36 -0700)]
popupkeyboard.py: support standalone demonstration

with execute permission
and don't require linuxcnc to be running with use_coord_buttons

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
8 years agogmoccapy_1_3_1 - fixed serious bug PAUSE / RESUME / STOP
Norbert Schechner [Sun, 26 Oct 2014 11:18:13 +0000 (12:18 +0100)]
gmoccapy_1_3_1 - fixed serious bug PAUSE / RESUME / STOP

ver. 1.3.1
- fixed very serious bug PAUSE / RESUME / STOP issue
  Program jumped to strange positions if STOP has been pressed
  while PAUSE was active.
  Thanks to Mael (papaours) for finding it.

ver. 1.3.0.1
- corrected a bug, toolchange velocity hal pin have not been
  initialized with values, if the user worked with the
  default values, so a probing with vel = 0 was possible,
  resulting in an error
- corrected an error in notifications.py, as the text to be
  displayed has not been checked for correct pango format, a
  message like "vel <= 0" resulted in an error. Now the necessary
  check is done

Signed-off-by: Norbert Schechner <nieson@web.de>
8 years agoDocs: fix link I broke
John Thornton [Fri, 24 Oct 2014 11:09:58 +0000 (06:09 -0500)]
Docs: fix link I broke

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agoDocs: fix some spello's
John Thornton [Thu, 23 Oct 2014 20:51:46 +0000 (15:51 -0500)]
Docs: fix some spello's
Hope I didn't change the meaning of anything.

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agoDocs: add more info about reading hal pins
John Thornton [Thu, 23 Oct 2014 20:23:58 +0000 (15:23 -0500)]
Docs: add more info about reading hal pins

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agolatency-test: typo for $1 lt 1000 computation
Dewey Garrett [Thu, 23 Oct 2014 19:52:28 +0000 (12:52 -0700)]
latency-test: typo for $1 lt 1000 computation

According to help text:
"Times without a suffix and less than 1000 are taken to be in us"

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
8 years agoDocs: add a note about when the #<_hal[hal_name]> values are updated.
John Thornton [Thu, 23 Oct 2014 16:42:48 +0000 (11:42 -0500)]
Docs: add a note about when the #<_hal[hal_name]> values are updated.

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agoAdd a gnupg keyring for release tag signature verification
Sebastian Kuzminsky [Wed, 22 Oct 2014 03:36:07 +0000 (22:36 -0500)]
Add a gnupg keyring for release tag signature verification

Add a gnupg keyring containing just the public part of the keypair used
to sign release tags.

Also change the githelper script to use the keyring in the git repo
instead of the one in the caller's home directory.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agoFix motion-type docs in motion manpage
Chris Radek [Mon, 20 Oct 2014 17:06:08 +0000 (12:06 -0500)]
Fix motion-type docs in motion manpage

Signed-off-by: Chris Radek <chris@timeguy.com>
Conflicts:
docs/man/man9/motion.9

8 years agodocs: fix a markup bug in the Developer Manual
Sebastian Kuzminsky [Fri, 17 Oct 2014 19:37:37 +0000 (13:37 -0600)]
docs: fix a markup bug in the Developer Manual

Remove a blank line that messes things up.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agodocs: in comp, variables should be of type float, not double
Jeff Epler [Fri, 17 Oct 2014 19:31:23 +0000 (14:31 -0500)]
docs: in comp, variables should be of type float, not double

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agosample configs: fix a typo in a comment
Sebastian Kuzminsky [Tue, 14 Oct 2014 14:31:13 +0000 (08:31 -0600)]
sample configs: fix a typo in a comment

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agotests: time out if joint doesn't stop jogging
Sebastian Kuzminsky [Fri, 10 Oct 2014 17:14:33 +0000 (11:14 -0600)]
tests: time out if joint doesn't stop jogging

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agotests: fix a transient failure in the halui-jogging test
Sebastian Kuzminsky [Fri, 10 Oct 2014 16:54:45 +0000 (10:54 -0600)]
tests: fix a transient failure in the halui-jogging test

This test verifies that only the selected joint jogs.  But it doesn't
wait for the joint to stop jogging at the end of the test, so when it
goes on to the next joint it might see the tail end of the previous
joint's jog and fail.

This commit makes it wait for the joint to stop moving before going on
to test the next joint.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agodocs: fix a typo in the System Requirements document
Sebastian Kuzminsky [Wed, 8 Oct 2014 05:39:24 +0000 (23:39 -0600)]
docs: fix a typo in the System Requirements document

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agoemccalib.tcl: enable search in POSTGUI_HALFILEs
Dewey Garrett [Mon, 29 Sep 2014 17:33:05 +0000 (10:33 -0700)]
emccalib.tcl: enable search in POSTGUI_HALFILEs

ini hal pins don't exist when [HAL]HALFILEs are executed
but do exist when [HAL]POSTGUI_HALFILES are executed

also: modify example configs/sim/axis/ini_hal_demo.ini
      to demonstrate ability to use calibration for
      ini hal pins

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agodocs: document milltask's "ini.*" hal pins
Jeff Epler [Tue, 30 Sep 2014 13:57:39 +0000 (08:57 -0500)]
docs: document milltask's "ini.*" hal pins

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agodocs: fix some pyvcp examples
Sebastian Kuzminsky [Tue, 30 Sep 2014 07:20:02 +0000 (01:20 -0600)]
docs: fix some pyvcp examples

initval for checkbutton and radiobutton take a number, not a string.

8 years agosim_pin: remove special case (-0) in isnegative
Dewey Garrett [Mon, 29 Sep 2014 20:26:07 +0000 (13:26 -0700)]
sim_pin: remove special case (-0) in isnegative

just treat -0 as 0

Note: halcmd rejects nEmm format for u32,s32 -- not addressed here

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
8 years agodocs - added gmoccapy documentation and update info to 2.6
Norbert Schechner [Sun, 28 Sep 2014 18:40:13 +0000 (20:40 +0200)]
docs - added gmoccapy documentation and update info to 2.6

8 years agoMerge branch 'v2.5_branch' into 2.6
Jeff Epler [Sun, 28 Sep 2014 01:03:32 +0000 (20:03 -0500)]
Merge branch 'v2.5_branch' into 2.6

8 years agoMerge remote-tracking branch 'jepler/signed-off-by' into v2.5_branch
Jeff Epler [Sun, 28 Sep 2014 01:02:30 +0000 (20:02 -0500)]
Merge remote-tracking branch 'jepler/signed-off-by' into v2.5_branch

8 years agomention to run autogen
Jeff Epler [Sat, 27 Sep 2014 13:42:58 +0000 (08:42 -0500)]
mention to run autogen

8 years agogladevcp -fix blinking in GLADE editor problem with led widget
Chris Morley [Sat, 27 Sep 2014 04:27:11 +0000 (21:27 -0700)]
gladevcp -fix blinking in GLADE editor problem with led widget

The first time you added an LED the introspection would fail
becaue blink_rate was set to None - a value outside GObjects int variable.
Now the rate is set to 0. If a user selects a rate between 1 and 99 it is set
to 100 ms. setting it to 0 turns off blinking.
The nice checkbutton in the editor for selecting blinking unfortunately
does not send a signal to LED.py to deselect blinking, only to select it.
so now one must set the rate to zero to stop blinking.
Another oddity of GLADE ....

8 years agodocs: document some missing declarations in the comp tool
Sebastian Kuzminsky [Fri, 26 Sep 2014 02:47:25 +0000 (19:47 -0700)]
docs: document some missing declarations in the comp tool

8 years agoDocs: change suggested values so they cover most of the drives listed on the wiki
John Thornton [Tue, 23 Sep 2014 12:30:29 +0000 (07:30 -0500)]
Docs: change suggested values so they cover most of the drives listed on the wiki
They don't need to match the image.

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agoDocs: remove blocks description
John Thornton [Mon, 22 Sep 2014 15:17:56 +0000 (10:17 -0500)]
Docs: remove blocks description

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agodeb: fixup changelog fat-fingering
Sebastian Kuzminsky [Mon, 22 Sep 2014 14:11:51 +0000 (07:11 -0700)]
deb: fixup changelog fat-fingering

My fingers are faster than my brain.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agoDocs: update halshow description to remove outdated blocks component
John Thornton [Mon, 22 Sep 2014 12:40:07 +0000 (07:40 -0500)]
Docs: update halshow description to remove outdated blocks component

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agodocs: update stepper quickstart equation
Sebastian Kuzminsky [Fri, 19 Sep 2014 23:29:19 +0000 (17:29 -0600)]
docs: update stepper quickstart equation

The "source" for the equation was correct in the asciidoc .txt file, but
the image containing the rendered equation was out of date.  The latex
equation images are not automatically generated/updated, so i did it
by hand.

Thanks to Joe Hildreth for the bug report.

For next time, these are the steps i did:

* I uncommented the relevant latex part of the asciidoc .txt file.

* I ran 'make doc' to generate the html file with the latex source in
  a pass-through block.

* I ran html-latex-images on the html file to generate the updated
  .png files.

* I overwrote the .png in git with the regenerated one from the script
  and this is the commit.

8 years agoDocs: update install instructions
John Thornton [Tue, 16 Sep 2014 19:25:22 +0000 (14:25 -0500)]
Docs: update install instructions

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agoDocs: update download information
John Thornton [Tue, 16 Sep 2014 19:03:24 +0000 (14:03 -0500)]
Docs: update download information

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agotests: save.0: use expected result as hal script too
Jeff Epler [Mon, 15 Sep 2014 14:43:24 +0000 (09:43 -0500)]
tests: save.0: use expected result as hal script too

.. this makes is all the more certain that halcmd save is doing
the right thing, since it doesn't allow it to introduce any differences.

8 years agohal: make 'save comp' order match original 'loadrt' order
Jeff Epler [Tue, 16 Sep 2014 01:27:49 +0000 (20:27 -0500)]
hal: make 'save comp' order match original 'loadrt' order

Originally I chose to reverse the order in the linked list, but this
caused problems on unload due to the need to remove modules in the reverse
order (a problem which is seen in kernel-based builds only).

This time, reverse the list in save_comps in a way that uses O(n) extra
space and traverses the list twice.

8 years agogladevcp -tooledit, flush tool file to disk
Chris Morley [Mon, 15 Sep 2014 04:25:29 +0000 (21:25 -0700)]
gladevcp -tooledit, flush tool file to disk

hopefully fix an occational bug that would make linuxcnc
tell you that the tool was missing from file when it was obviously there.
It seems maybe the file was not written to disk before linuxcnc was
told to read it. why it would be _blank_ I don't know.
I could cause this reliable when testing wihout linuxcnc, probably
because of the big pause as it tried to talk to non-existant linuxcnc..

Signed-off-by: Chris Morley <chrisinnanaimo@hotmail.com>
8 years agogladevcp -tooledit, fix comment bugs
Chris Morley [Mon, 15 Sep 2014 04:22:11 +0000 (21:22 -0700)]
gladevcp -tooledit, fix comment bugs

comments would grow by one space each time the tool file was saved.
if the comment delimter was missing weird things would happen-
double entries or entries as comments

Signed-off-by: Chris Morley <chrisinnanaimo@hotmail.com>
8 years agoxhc-hb04/README update for udev rule file
Dewey Garrett [Sun, 14 Sep 2014 02:12:26 +0000 (19:12 -0700)]
xhc-hb04/README update for udev rule file

8 years agogmoccapy_1_2_2 - support now also matchbox-keyboard
Norbert Schechner [Fri, 12 Sep 2014 18:59:59 +0000 (20:59 +0200)]
gmoccapy_1_2_2 - support now also matchbox-keyboard

tooledit-widget.py commented out one print statement

ver. 1.2.2
- changed the way the window size and position is
  handled, as before the default values did appear
  several times in the code
- If no virtual keyboard could be initialized, we
  disable now the corresponding part on the settings
  page and the related button. Check will be done
  for <onboard> and <matchbox-keyboard>
- starting gmoccapy did throw an error to the terminal
  that a widget could not get default. Finally I found
  the reason, the glade file did contain a property
  "has_default" and that is not allowed by builder.

8 years agohm2: fix long standing encoder velocity estimation error (thanks pcw and jepler)
Michael Geszkiewicz [Thu, 11 Sep 2014 19:42:23 +0000 (21:42 +0200)]
hm2: fix long standing encoder velocity estimation error (thanks pcw and jepler)

We located source of calculating Nan velocity in some configurations.
It was when driver got some encoder pulses without changing timestamp, which is possible but mostly from electrical noise.
Driver just skips calculating velocity in current cycle and uses last one.

Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
8 years agofix halfile parsing for calibration dialog
Sebastian Kuzminsky [Wed, 10 Sep 2014 23:29:11 +0000 (17:29 -0600)]
fix halfile parsing for calibration dialog

Accept both spaces and tab characters as word separators.  It used to
only accept spaces.

Thanks to Roguish for the bug report and Jeff Epler for the fix.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agohm2_pci: fix few FPGA names
Michael Geszkiewicz [Wed, 10 Sep 2014 19:54:21 +0000 (21:54 +0200)]
hm2_pci: fix few FPGA names

Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
8 years agoMerge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6
Norbert Schechner [Wed, 10 Sep 2014 17:49:30 +0000 (19:49 +0200)]
Merge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6

8 years agoMerge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6
Norbert Schechner [Wed, 10 Sep 2014 17:27:29 +0000 (19:27 +0200)]
Merge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6

8 years agoMerge branch '2.6' of git://git.linuxcnc.org/git/linuxcnc.git into 2.6
Norbert Schechner [Mon, 8 Sep 2014 07:11:34 +0000 (09:11 +0200)]
Merge branch '2.6' of git://git.linuxcnc.org/git/linuxcnc.git into 2.6

8 years agogmoccapy_1_2_1 - added missing bracket in signals.py
Norbert Schechner [Mon, 8 Sep 2014 07:10:50 +0000 (09:10 +0200)]
gmoccapy_1_2_1 - added missing bracket in signals.py

8 years agogmoccapy - missed a bracket, resulting in an exception
Norbert Schechner [Mon, 8 Sep 2014 06:33:08 +0000 (08:33 +0200)]
gmoccapy - missed a bracket, resulting in an exception

8 years agodocs: give units of ini vars in homing docs
Sebastian Kuzminsky [Mon, 8 Sep 2014 04:01:41 +0000 (22:01 -0600)]
docs: give units of ini vars in homing docs

The units are specified in ini_config.txt, but it can't hurt to also
have them in ini_homing.txt.

8 years agogmoccapy_1_2_1 - minor layout changes due to change to XFCE
Norbert Schechner [Sun, 7 Sep 2014 19:11:02 +0000 (21:11 +0200)]
gmoccapy_1_2_1 - minor layout changes due to change to XFCE

ver. 1.2.1
- due to the behavior of XFCE of the new hybrid.iso I
  had to change the width settings of several button
  to stretch them to fit some text and images
- The same reason forced to set new default startposition
  of the main window and the notification messages.

8 years agodocs: fix a copy/paste error in the hostmot2.9 manpage
Sebastian Kuzminsky [Sat, 6 Sep 2014 23:34:57 +0000 (17:34 -0600)]
docs: fix a copy/paste error in the hostmot2.9 manpage

8 years agov2.6.3
Sebastian Kuzminsky [Fri, 5 Sep 2014 22:05:17 +0000 (16:05 -0600)]
v2.6.3

8 years agohm2-stepper: estop when hm2 watchdog bites
Jeff Epler [Fri, 5 Sep 2014 22:07:40 +0000 (17:07 -0500)]
hm2-stepper: estop when hm2 watchdog bites

Any machine with a proper physical estop chain will need to revise
this setup, but for a basic setup it is better than the previous status
quo.  (Closes: #391)

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agoestop-latch: improve documentation; set default pin values
Jeff Epler [Fri, 5 Sep 2014 22:10:03 +0000 (17:10 -0500)]
estop-latch: improve documentation; set default pin values

8 years agohm2_7i90: remove some dead code
Sebastian Kuzminsky [Thu, 4 Sep 2014 18:16:26 +0000 (12:16 -0600)]
hm2_7i90: remove some dead code

This was left in accidentally when the 7i43 driver was converted for
the 7i90.  It's just misleading.

8 years agogmoccapy_1_2_0 - hal user message system introduced
Norbert Schechner [Thu, 4 Sep 2014 17:48:36 +0000 (19:48 +0200)]
gmoccapy_1_2_0 - hal user message system introduced

ver. 1.2.0
- changed GetIniInfo to return also user message setups
- notification now supports pango markup in the messages
- added hal user messages similar to gsreeen to gmoccapy
  see gmoccapy_messages.ini for usage information
- updated the translation files for German and Spanish

8 years agogmoccapy_1_1_5_9 - corrected message system
Norbert Schechner [Thu, 4 Sep 2014 15:18:42 +0000 (17:18 +0200)]
gmoccapy_1_1_5_9 - corrected message system

ver. 1.1.5.9
- prepared yesno_dialog for user message,
  it does accept now pango markup
- wrong values in axis offset didn't show a message
  to the user, I fixed that

8 years agoMerge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6
Norbert Schechner [Thu, 4 Sep 2014 14:42:41 +0000 (16:42 +0200)]
Merge branch '2.6' of ssh://norbert@git.linuxcnc.org/git/linuxcnc.git into 2.6

8 years agogmoccapy_1_1_5_8 - iteration over None object message
Norbert Schechner [Thu, 4 Sep 2014 14:41:50 +0000 (16:41 +0200)]
gmoccapy_1_1_5_8 - iteration over None object message

ver. 1.1.5.8
- message at start because of
  return(PlasmaClass(halcomp, builder, useropts))
  instedt off
  return[PlasmaClass(halcomp, builder, useropts)]
  resulting in iteration over none object

8 years agoremap docs: The inifile var is PYTHON_APPEND
Jeff Epler [Wed, 3 Sep 2014 15:50:31 +0000 (10:50 -0500)]
remap docs: The inifile var is PYTHON_APPEND

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agobuild system: remove useless assert
Sebastian Kuzminsky [Wed, 3 Sep 2014 04:45:20 +0000 (22:45 -0600)]
build system: remove useless assert

The RTSRCS variable is never set and never read, so this assert makes no sense.

8 years agoDocs: a more precise description of 5420-5428
John Thornton [Tue, 2 Sep 2014 11:54:59 +0000 (06:54 -0500)]
Docs: a more precise description of 5420-5428

Signed-off-by: John Thornton <jthornton@gnipsel.com>
8 years agohm2 sample config: set HOME_SEQUENCE
Sebastian Kuzminsky [Wed, 27 Aug 2014 09:17:59 +0000 (03:17 -0600)]
hm2 sample config: set HOME_SEQUENCE

This is just for the convenience of getting a "Home All" button in Axis.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agoMerge remote-tracking branch 'seb-gh/seb/2.6/fix-recommends-hm2' into 2.6
Jeff Epler [Mon, 25 Aug 2014 18:50:33 +0000 (13:50 -0500)]
Merge remote-tracking branch 'seb-gh/seb/2.6/fix-recommends-hm2' into 2.6

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agodeb: recommend the correct hostmot2 package
Sebastian Kuzminsky [Mon, 25 Aug 2014 18:31:00 +0000 (12:31 -0600)]
deb: recommend the correct hostmot2 package

The correct name for the hostmot2 firmware package to Recommend is
"hostmot2-firmware-all".

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
8 years agoMerge remote-tracking branch 'origin/v2.5_branch' into jepler/signed-off-by
Jeff Epler [Sat, 23 Aug 2014 18:14:38 +0000 (13:14 -0500)]
Merge remote-tracking branch 'origin/v2.5_branch' into jepler/signed-off-by

8 years agoMerge remote-tracking branch 'origin/v2.5_branch' into 2.6
Sebastian Kuzminsky [Thu, 21 Aug 2014 04:23:11 +0000 (22:23 -0600)]
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6

Conflicts:
debian/configure (keep the 2.6 version)
debian/control.in (keep the 2.6 version)

8 years agoExplicitly give the right build dependency for insmod/rmmod/etc
Chris Radek [Wed, 26 Mar 2014 16:35:47 +0000 (11:35 -0500)]
Explicitly give the right build dependency for insmod/rmmod/etc

(cherry picked from commit 39e36ebd8fa5530ba87e162c17bac2c5ce57621f)

Conflicts:

debian/configure
debian/control.in

8 years agoFail on missing programs, instead of generating bogus scripts
Chris Radek [Tue, 25 Mar 2014 16:44:01 +0000 (11:44 -0500)]
Fail on missing programs, instead of generating bogus scripts

(cherry picked from commit 0b5fba46aba7b35c8c3bcb80de43dec0ba8e97da)

8 years agoThese are needed for building and running on all platforms
Chris Radek [Tue, 25 Mar 2014 23:59:02 +0000 (18:59 -0500)]
These are needed for building and running on all platforms

(cherry picked from commit 3b03cefb49d964adaa9a83dc0f1775c4fdb97770)

Conflicts:
debian/control.in

8 years agodeb: provide build-arch and build-indep targets
Sebastian Kuzminsky [Wed, 20 Aug 2014 15:09:15 +0000 (09:09 -0600)]
deb: provide build-arch and build-indep targets

This is required by Debian Policy Manual section 4.9:

    https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules

8 years agoFrench doc update: default spindle speed
Francis Tisserant [Wed, 20 Aug 2014 09:35:28 +0000 (11:35 +0200)]
French doc update: default spindle speed

Signed-off-by: Francis Tisserant <tissf@free.fr>
8 years agoFrench doc update: clarify comp's usage of count and names
Francis Tisserant [Wed, 20 Aug 2014 08:49:28 +0000 (10:49 +0200)]
French doc update: clarify comp's usage of count and names
:

Signed-off-by: Francis Tisserant <tissf@free.fr>
8 years agodeb: move xhc udev rule to the right place
Sebastian Kuzminsky [Wed, 20 Aug 2014 04:34:58 +0000 (22:34 -0600)]
deb: move xhc udev rule to the right place

Lintian reminds us that udev rules belong in /lib/udev/rules.d.

8 years agoplatform-is-supported: "arch" has components "os" and "cpu", consider both
Sebastian Kuzminsky [Tue, 19 Aug 2014 22:27:41 +0000 (16:27 -0600)]
platform-is-supported: "arch" has components "os" and "cpu", consider both

On Debian distributions running the Linux kernel, "DEB_HOST_ARCH"
is the same as "DEB_HOST_ARCH_CPU" (the Linux kernel is implied).
But on Debian kFreeBSD, DEB_HOST_ARCH includes both DEB_HOST_ARCH_OS
and DEB_HOST_ARCH_CPU.  This commit lets platform-is-supported consider
both components of the arch.

2.6 (this version) requires DEB_HOST_ARCH_OS to be "linux".

8 years agodocs: all html links work now
Sebastian Kuzminsky [Tue, 19 Aug 2014 04:31:33 +0000 (22:31 -0600)]
docs: all html links work now

... So make it a build failure if they stop working in the future.
(cherry picked from commit bb6cef65dc51386dc0a6b923be0ebb5abea6a873)

8 years agodocs: section ids are externally accessible hyperlinks
Sebastian Kuzminsky [Tue, 19 Aug 2014 04:29:53 +0000 (22:29 -0600)]
docs: section ids are externally accessible hyperlinks

(cherry picked from commit 09f7fba10952857ccacd9aea1dc87c186db7f5aa)

8 years agoMerge remote-tracking branch 'origin/v2.5_branch' into 2.6
Sebastian Kuzminsky [Tue, 19 Aug 2014 02:23:42 +0000 (20:23 -0600)]
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6

Conflicts:
docs/src/config/ini_config_fr.txt

8 years agoaxis -add ability to set default spindle speed
Chris Morley [Mon, 18 Aug 2014 21:44:42 +0000 (14:44 -0700)]
axis -add ability to set default spindle speed

most spindle drives will not start the spindle at the default 1 rpm.
now one can specify the starting rpmin the ini file.
Note this is not the minimum rpm.

Signed-off-by: Chris Morley <chrisinnanaimo@hotmail.com>
8 years agotests: no need to track this var file
Jeff Epler [Sun, 17 Aug 2014 17:33:59 +0000 (12:33 -0500)]
tests: no need to track this var file

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agopython: fix exception in set_translation_domain
Jeff Epler [Wed, 13 Aug 2014 12:12:49 +0000 (07:12 -0500)]
python: fix exception in set_translation_domain

The value from the earlier MultiFileBuilder.set_translation_domain call
was not being passed down to the actual builder object.  Instead, an
exception occurred.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agopackaging: Debian testing requires use of tcl/tk 8.6
Jeff Epler [Wed, 13 Aug 2014 11:52:12 +0000 (06:52 -0500)]
packaging: Debian testing requires use of tcl/tk 8.6

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agoFrench doc update: fix startup code example
Francis Tisserant [Tue, 12 Aug 2014 09:36:36 +0000 (11:36 +0200)]
French doc update: fix startup code example

Signed-off-by: Francis Tisserant <tissf@free.fr>
8 years agoemccalib: fix for bug 389 (not writing file)
Dewey Garrett [Mon, 11 Aug 2014 19:41:08 +0000 (12:41 -0700)]
emccalib: fix for bug 389 (not writing file)

thanks to jepler

8 years agoupdate changelog & VERSION for 2.6.2
Sebastian Kuzminsky [Sat, 9 Aug 2014 15:24:11 +0000 (09:24 -0600)]
update changelog & VERSION for 2.6.2

8 years agotests: give subroutine-return more time to do its thing
Sebastian Kuzminsky [Fri, 8 Aug 2014 22:21:24 +0000 (16:21 -0600)]
tests: give subroutine-return more time to do its thing

We get intermittent test failures in the buildbot due to the 2 seconds
not being enough time for the interpreter to finish.  Try 5?

8 years agodocs: clarify comp's usage of count and names
Sebastian Kuzminsky [Fri, 8 Aug 2014 17:17:05 +0000 (11:17 -0600)]
docs: clarify comp's usage of count and names

8 years agodocs: fix a typo in comp(1) docs
Sebastian Kuzminsky [Fri, 8 Aug 2014 17:15:46 +0000 (11:15 -0600)]
docs: fix a typo in comp(1) docs

The load-time parameter is named "names", not "name".

8 years agoMerge remote-tracking branch 'origin/v2.5_branch' into 2.6
Sebastian Kuzminsky [Thu, 7 Aug 2014 23:17:43 +0000 (17:17 -0600)]
Merge remote-tracking branch 'origin/v2.5_branch' into 2.6

For the fr.po conflict i simply discarded the Weblate fr.po from 2.6 and
used Francis Tisserant's version from 2.5.

Conflicts:
docs/src/config/ini_config.txt src/po/fr.po

8 years agoxhc-hb04: update linuxcnc.files too
Dewey Garrett [Wed, 6 Aug 2014 20:23:38 +0000 (13:23 -0700)]
xhc-hb04: update linuxcnc.files too

8 years agoxhc-hb04: reorder rules name, use plugdev group
Dewey Garrett [Wed, 6 Aug 2014 17:12:05 +0000 (10:12 -0700)]
xhc-hb04: reorder rules name, use plugdev group

attempt for compatibility with debian wheezy and ubuntu

8 years agoThis made the backplot scale wonkily
Chris Radek [Wed, 6 Aug 2014 02:19:50 +0000 (21:19 -0500)]
This made the backplot scale wonkily

8 years agolatency-histogram-1: single thread app
Dewey Garrett [Tue, 5 Aug 2014 14:11:02 +0000 (07:11 -0700)]
latency-histogram-1: single thread app

8 years agoupdate changelog and VERSION for 2.6.1
Sebastian Kuzminsky [Tue, 5 Aug 2014 03:45:18 +0000 (21:45 -0600)]
update changelog and VERSION for 2.6.1

8 years agocomment the funny Z max in sim/axis/axis.ini
Sebastian Kuzminsky [Tue, 5 Aug 2014 03:30:49 +0000 (21:30 -0600)]
comment the funny Z max in sim/axis/axis.ini

8 years agoLet the splash screen run with default varfile
Chris Radek [Fri, 25 Jul 2014 14:58:57 +0000 (09:58 -0500)]
Let the splash screen run with default varfile

On a first startup, there are no G54 offsets, so the splash screen
will not run without touch-off.  This is confusing for new folks.

Having +Z allowed is the least bad solution for this I think,
because people do actually mill the splash screen into things,
so it should continue to have top of workpiece as zero.

Shipping and installing a nondefault varfile is the only other
solution I can think of, and that's nasty.

8 years agoRemove mistaken file
Chris Radek [Tue, 5 Aug 2014 02:52:52 +0000 (21:52 -0500)]
Remove mistaken file

8 years agostepconf: Try to work better with duplicate IDs
Jeff Epler [Mon, 4 Aug 2014 13:28:57 +0000 (08:28 -0500)]
stepconf: Try to work better with duplicate IDs

This makes it safe to build one screen from multiple
unfortunately, we still can't detect until runtime that a duplicated
name is referred to from the Python code.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
8 years agoTouchy: Disable macro button if there aren't any macros defined
Chris Radek [Tue, 5 Aug 2014 02:19:50 +0000 (21:19 -0500)]
Touchy: Disable macro button if there aren't any macros defined

Previously, poking the macro button would generate a traceback if there are no
macros.