Commit graph

12370 commits

Author SHA1 Message Date
Jeff Epler
b2f73ca96c axis: Add XY grid lines to preview 2012-05-08 14:32:14 -05:00
Jeff Epler
074467ddda foam: use appropriate file in place of splash screen
maybe we'll make an actual LinuxCNC splash screen for foam someday, but
for now we'll settle for a splash that doesn't error out!
2012-05-08 14:25:32 -05:00
Chris Radek
775ff98954 Revert "TP: let begin and end accels differ"
This reverts commit fbcbec10e6
because it adds complexity and is not needed if we can't use it.
2012-05-07 11:39:41 -05:00
Chris Radek
32ad570857 Revert "TP: double available accel in most cases"
This reverts commit 436aa886a1
which was half-baked, improperly handling aborting/pausing/FO

Conflicts:

	src/emc/kinematics/tp.c
2012-05-07 11:38:50 -05:00
Chris Radek
27c52fc416 constraint checking 2012-05-07 11:35:24 -05:00
Chris Radek
111d939eaf remove typo/unneeded line 2012-05-07 09:59:11 -05:00
Chris Morley
c7640fa60e classicladeder -add HAL pin to hide GUI window
when using classicladder with modbus the GUI must run but
it would be nice to have it be shown/hidden on demand.
If the pin is true the section window and manager window are hidden.
if false they are shown.
2012-05-06 00:48:34 -07:00
Chris Morley
e8bdc32ac3 classicladder -fix mix of space with tab errors
classicladder uses leading tabs - I mixed in spaces
This attemps to fix the error. No other changes are
intended.
2012-05-05 17:59:52 -07:00
Chris Morley
fe83fe91e3 classicladder -fix mix of whites space with tabs
classicladder uses leading tabs - a long time ago i mixed in spaces.
my bad - my fix. no other changes intended.
2012-05-05 17:59:52 -07:00
Jeff Epler
1f30f27f1b Fix crash in AXIS backplot
The operation on "add_point" has to be a short-circuiting operation or
it dereferences op and oop when they are not valid pointers.

Apparently under optimization some versions of gcc will transform
    add_point |= ...
into a short-circuiting operation, presumably after proving that the RHS
has no side effects.  This, and possibly differing memory layout between
32-bit and 64-bit systems, meant that I hadn't see this bug before Sam
ran into it.

(there's still a modest standards violation here: if npts is 0, then oop
is a pointer to two elements before the start of a block of memory; it
is only permitted to form a pointer up to one element before the start
of a block of memory.  However, in practice no real computer is going to
misbehave just due to this pointer arithmetic)
2012-05-02 13:56:44 -05:00
Chris Radek
436aa886a1 TP: double available accel in most cases
This revives some code from the distant past (b5e1ba20e3) for
sensing the acute case.  With the previous change this can now
work correctly.
2012-05-01 15:26:15 -05:00
Chris Radek
fbcbec10e6 TP: let begin and end accels differ 2012-05-01 09:34:04 -05:00
Sebastian Kuzminsky
b9660dcea1 Merge branch 'v2.5_branch' 2012-04-24 17:34:55 -06:00
Sebastian Kuzminsky
19e7f3d384 Two configure patches from John Morris
* Correct detection of dblatex versions with only two version levels,
  such as 0.3 in Fedora 16.

* Quiet some noise in the Adeos check.
2012-04-24 17:33:21 -06:00
Sebastian Kuzminsky
3e8be1d893 remove a stray .rej file
Thanks to John Morris for the bug report.
2012-04-24 17:30:05 -06:00
Michael Haberler
0c8ad2c418 interp: firm up O-word handling
The following statements now cause an error message during parsing:
1. a 'return' or 'endsub' not within a sub defintion
2. a label on 'repeat' which is defined elsewhere
3. a label on 'while' which is defińed elsewhere and not referring to a 'do'
4. a label on 'if' defined elsewhere
5. a undefined label on 'else' or 'elseif'
6. a label on 'else', 'elseif' or 'endif' not pointing to a matching 'if'
7. a label on 'break' or 'continue' which does not point to a matching 'while' or 'do'
8. a label on 'endrepeat' or 'endwhile' no referring to a corresponding 'while' or 'repeat'

These situations now abort the interpreter. To make these errors non-fatal
warnings on stderr, set bit 0x20 in the [RS274NGC]FEATURE= mask. I rather
recommend you fix your programs though.

see src/emc/rs274ngc/interp_internal.hh

This is mostly patch 7d918c.

It is now ok to reintroduce it because due to commit 1c5aea the interpreter is now the only
source of linenumber information, and serial execution of the same command always
results in the same linenumber. This was not the case with the pseudoMdiLineNumber
workaround, which prevented proper matching of labels during MDI.
2012-04-22 17:42:01 +02:00
Michael Haberler
a1258b5667 task: rework mdi abort handling
This is a consequence of state tracking during MDI.
2012-04-22 16:44:33 +02:00
Michael Haberler
0cb04933ab interp: default log_file to stderr in constructor
the following sequence led to a crash:
gcodemodule instantiates an interpreter for preview
the debug mask is nonzero, setting _setup.debugmask in Interp.init()
another interpreter is instantiated through gcodemodule which does not
clear debugmask but sets log_file to zero
init_named_parameters tries to log to NULL log_file
2012-04-21 23:20:40 +02:00
Michael Haberler
81f105b477 task: track interpState during MDI execution
the halui.program.is-running pin now makes sense during MDI execution.
The current MDI command is reflected in emcstatus->task.command
during MDI execution.
2012-04-21 23:20:40 +02:00
Michael Haberler
2be62bfb1b motion: line numbers are real even in MDI mode 2012-04-21 23:20:40 +02:00
Michael Haberler
1c5aeabf45 task: remove pseudoMidLinenNumber, calls to interp_list.set_line_number()
The interpreter is now the only source of line number information.
motion.program-line makes sense during MDI execution - the MDI command
itself is started with line number 0, and subroutine line numbers
are correctly reflected during MDI.
2012-04-21 23:20:23 +02:00
Michael Haberler
d3e527eafb Merge branch 'v2.5_branch' 2012-04-21 09:32:52 +02:00
Michael Haberler
2897e57e67 docs/gladevcp: expand on Python attributes and methods of HAL widgets 2012-04-21 09:28:49 +02:00
Michael Haberler
d121938c4c tests: show correct sequence number tracking in oword subroutines 2012-04-20 01:02:36 +02:00
Michael Haberler
d5bcd75bdd interp: fix sequence number tracking in external oword subroutines 2012-04-20 01:02:32 +02:00
Michael Haberler
5d1ca14095 Merge branch 'v2.5_branch' 2012-04-19 16:50:37 +02:00
Michael Haberler
fbc69200fc Merge branch 'v2.4_branch' into v2.5_branch 2012-04-19 16:47:52 +02:00
Chris Radek
cc829033bb explicitly set default spindle mode 2012-04-19 16:42:31 +02:00
Daniel Rogge
d7e387354f 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. 2012-04-19 16:42:18 +02:00
Chris Morley
64441d00aa pncconf -add info to help pages 2012-04-18 23:06:18 -07:00
Chris Morley
1366194d7a pncconf -fix BLDC options were sensitive by default
On the motor/encoder config page the BLDC options were sensitive before
they were selected.
2012-04-18 22:16:16 -07:00
Chris Morley
3b399df5d6 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.
2012-04-18 22:07:17 -07:00
Chris Morley
6481c8a502 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
2012-04-17 22:46:10 -07:00
Chris Radek
7a33c701ac touchy: use the rebranded nc_files path 2012-04-15 14:03:23 -05:00
John Thornton
733c466e9e Docs: fixed the assumption that the reader was using a git checkout
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2012-04-13 08:06:08 -05:00
Chris Radek
f0202a28d1 Merge branch 'v2.5_branch' 2012-04-12 17:46:07 -05:00
Chris Radek
75c94d0a38 AXIS: update copyright date, branding in help/about 2012-04-12 17:45:13 -05:00
Chris Radek
277a156e28 Merge branch 'v2.4_branch' into v2.5_branch 2012-04-12 17:35:10 -05:00
Chris Radek
b83fc90b75 AXIS: Update copyright in help/about 2012-04-12 17:28:48 -05:00
John Thornton
2e1453b4e8 Docs: footnotes can not be inside a listing block
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2012-04-10 07:49:00 -05:00
Michael Haberler
f5e02f6304 interpl: remove duplicated code 2012-04-09 18:49:42 +02:00
Chris Radek
27581bdb38 Merge branch 'v2.5_branch' 2012-04-07 16:39:06 -05:00
Chris Radek
dc10e7130a Merge branch 'v2.4_branch' into v2.5_branch 2012-04-07 16:38:42 -05:00
Chris Radek
bc00422c1b fix spelling 2012-04-07 16:37:25 -05:00
Jeff Epler
291fc50aa6 module_helper: fix compile error I introduced 2012-04-06 14:03:10 -05:00
Sebastian Kuzminsky
47441dc8d1 turn on _GNU_SOURCE to expose clone() on precise 2012-04-05 14:09:01 -06:00
Jeff Epler
663de9902d upci: check return value of first iopl
if this fails then there's probably no use re-checking iopl
2012-04-05 11:50:31 -05:00
Jeff Epler
7d701a9139 scope: remove a dead store identified by clang
It can be seen that before each use of 'row' it is initialized
2012-04-05 11:48:31 -05:00
Jeff Epler
d247f8f837 check return value of setuid/seteuid
... and exit when they fail.  Otherwise "following code may execute
with unexpected privileges"
2012-04-05 11:44:25 -05:00
Jeff Epler
30dd95094f usrmot: it was broken; remove it
The usrmot "user interface", which in principle sends messages directly
to the realtime motion controller (bypassing task), has been broken for
some time (crashing the motion controller whenever it attempts to issue
a motion) and nobody has reported it.  I suspect strongly that no one
is using this code.
2012-04-05 11:27:44 -05:00