Commit graph

383 commits

Author SHA1 Message Date
Sebastian Kuzminsky
052052d971 docs: update motion manpage with new tc.h location 2014-09-02 21:44:18 -06:00
Jeff Epler
5318daa895 hostmot2: support boards on spi interface
.. for uspace systems with /dev/spidev.  This is mildly tested on odroid
u3 with a 7i43 custom firmware and with a real 7i90.

Note that on many systems out there, including odroid, /dev/spidev is lousy
for realtime performance.  Some kernel-side changes, available at
https://github.com/jepler/odroid-linux.git in branch odroid-3.8.13-rt
give good performance on my odroid u3 system.

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
2014-09-02 22:02:22 -05:00
Sebastian Kuzminsky
0b48bda9db hm2: remove pet_watchdog from the docs
This removes mention of the pet_watchdog function from all docs, and
updates some out-of-date information about the watchdog.

But we still export the pet_watchdog function to HAL, for now.  It does
nothing but complain about its own obsolescence, watchdog-petting happens
in hm2's write function now.  We should remove pet_watchdog before 2.7.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2014-08-29 11:00:05 -06:00
Jeff Epler
1730c5ace1 hm2_eth: how to set up the ethernet interface 2014-07-28 13:30:35 -05:00
Jeff Epler
57e1d5465e docs: Note GPL license on files 2014-07-28 09:29:03 -05:00
Sebastian Kuzminsky
6b2ba98fb7 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	VERSION
2014-07-26 23:48:53 -06:00
Jeff Epler
f876f77e19 hm2_eth: Use iptables to restrict traffic to just us 2014-07-26 16:40:56 -05:00
Jeff Epler
3303a37f90 hm2_eth: correct header in manpage 2014-07-26 15:46:25 -05:00
Jeff Epler
d2e4742002 hm2_eth: Fix ARP pinning
* Don't require specification of MAC address at all.  Instead,
   request the hardware address from the attached hostmot2 ethernet
   board.  (of all the ways to get the MAC address automatically,
   this seemed like the best one.  Alternate ways involved parsing
   /proc/net/arp; or using SIOCGARP which requires correctly filling
   in the interface name that the hostmot2 card is connected to, and
   also still requires sending a packet to the board)

 * When SIOCSARP (set arp entry) fails, report it; this will happen if
   you did not "sudo make setuid".

 * When an ARP entry was successfully pinned in init_net, delete it
   in close_net with SIOCDARP.
2014-07-26 12:45:18 -05:00
Jeff Epler
b4f3f51afc hm2_eth: note that only one board is supported 2014-07-26 12:44:38 -05:00
Michael Geszkiewicz
c72834b3c7 hm2_eth: New driver for Mesa 7I80 ethernet cards 2014-07-26 11:08:57 -05:00
bdebruijn
80c46b9207 docs : update manpage pid.9 for use of IN pins 2014-07-14 15:01:01 -05:00
Chris Morley
0013e46058 Merge branch 'v2.5_branch' into 2.6 2014-07-12 00:07:17 -07:00
John Thornton
80efa5fdc5 Docs: try to word synopsis to be a bit clearer in the description
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2014-07-02 08:38:52 -05:00
Kim Kirwan
c7bd914a82 add driver for the 7i90
This is almost entirely a copy of the 7i43 driver, with a few tiny tweaks.
Should be integrated with the 7i43 driver so they share more code,
but that can happen in the master branch later.
2014-06-05 18:02:56 -06:00
Chris Morley
ebaae4d51f manpages -update classicladder
add hide_gui pin description
2014-05-27 06:39:56 -07:00
Chris Morley
f9586acf63 Merge branch 'v2.5_branch' into 2.6 2014-05-26 23:38:38 -07:00
Chris Morley
305309ae2b manpages -update pages on classicladder
missing floats and pinnames were wrong for s32 pins
2014-05-26 23:35:13 -07:00
Sebastian Kuzminsky
7a1153a811 Merge remote-tracking branch 'origin/v2.5_branch' into 2.6 2014-05-19 23:19:28 -04:00
Sebastian Kuzminsky
52dc6f1810 docs: fix hm2 encoder.rawcounts pin name in manpage
The hm2 driver exports pins called "hm2_BLAH.X.encoder.YY.rawcounts",
but the manpage incorrectly called them ".rawcount".  Fix the manpage
to match the existing pin name.
2014-05-19 23:15:55 -04:00
Michael Geszkiewicz
a31beaa372 doc: add 5i24 to list of supported boards in hm2_pci manpage and to MODULE_DESCRIPTION text
Signed-off-by: Michael Geszkiewicz <micges@wp.pl>
2014-05-14 23:53:46 +02:00
Sebastian Kuzminsky
4dd14c18a9 docs: add missing motion.motion-type to motion(9) manpage 2014-05-14 17:21:12 -04:00
Sebastian Kuzminsky
d897a13703 docs: update motion(9) to match reality
We haven't had a "motion.motion-inpos" pin since af317701 (January 2009).
2014-05-14 16:45:31 -04:00
Sebastian Kuzminsky
65933c3edf docs: fix motion(9) motion.in-position pin name
Also expand the description of the pin meaning a little.
2014-05-14 16:39:17 -04:00
Sebastian Kuzminsky
49f3930e49 doc: update list of supported boards in hm2_pci manpage 2014-05-14 15:03:47 -04:00
Sebastian Kuzminsky
fe00c88ca5 docs: fix a formatting error in hostmot2 manpage 2014-05-08 10:35:48 -06:00
Chris Morley
0033f781f7 docs -add descriptions of new motion pins to man pages
feed-inhibit, spindle-inhibit, and the two absolute spindle speed
pins.
2014-04-18 15:58:53 -07:00
andy pugh
67967fbb9a Add a pin width limit to the Hostmot2 Stepgen
The recent addition of support for table mode to the Hostmot2 stepgen had an unfortunate
and unintended consequence. Some of the existing bitfiles did have wide stepgens included
but this was masked by the driver. Users that have configured these stepgen pins as GPIO
are likely to find that important parts of their machines no longer work.
This patch adds an extra parameter to the hm2 modparams so that system builders
have to actively choose to use the wide stepgens.

Signed-off-by: andy pugh <andy@bodgesoc.org>
2014-04-08 00:43:38 +01:00
Chris Radek
a2bb101076 Ignore auto-generated manpages for two new comps 2014-04-05 19:32:54 -05:00
Sebastian Kuzminsky
595ab6ccd2 remove an accidentally added file 2014-03-05 00:15:10 -07:00
Norbert Schechner
90eb342ac9 gmoccapy_1_0_2 - solved spindle bug
ver. 1.0.2
- solved a spindle button issue and included a check so it
  is no possible to exceed the limits of the spindle with
  override values. i.e. a spindle has a max of 6000 rpm and
  the user enters S 5500 M3 now he can increase the spindle
  override, but it will be limited by 109 %, because otherwise
  he would ask the spindle to run faster than allowed.
2014-03-02 15:25:17 +01:00
Chris Radek
f7eee04923 Freqgen has been replaced by stepgen's velocity mode
said the manpage: "freqgen may be eliminated at any time, and almost certainly
will be eliminated for the version 2.2 release of EMC"
2013-12-15 17:28:22 -06:00
Andy Pugh
ac5345e61e Add support for the Table-mode to the Hostmot2 stepgens
This only works for firmwares that offer that facility for more than 2 pins
(which I do not think is any of the ones in the wild)


Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-11-26 22:57:14 +00:00
Andy Pugh
ac64b2d8e2 Rename the Hostmot2 DPLL function to be consistent with other modules.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-10-31 01:39:04 +00:00
Andy Pugh
bdb16702b3 Absolute Serial Encoders: Further tidying up and introduction of the HM2DPLL module to allow pre-triggering
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-10-30 00:09:26 +00:00
Jeff Epler
3b616b6376 Merge branch 'v2.5_branch'
Conflicts:
	docs/man/.gitignore
	docs/man/man9/.gitignore
2013-10-28 07:01:18 -05:00
Jeff Epler
ddcfd17bac docs: improve ignore patterns 2013-10-28 06:51:25 -05:00
Andy Pugh
24dc2a2306 Fix a bug caused by misunderstanding do_div in the lcd.comp
If no format length was specified then the formatting would break for any value with a zero in its representation.

Signed-off-by: Andy Pugh <andy@bodgesoc.org>

Fix some bugs in the lcd component

Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-10-24 23:11:36 +01:00
Andy Pugh
3b736bb6ae Add (or make less ambiguous) the licensing of a number of files.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-09-25 20:35:45 +01:00
Andy Pugh
cc548fa4ed Add support for Fanuc absolute Serial Encoders to Hostmot2
(pushed for testing, I have no hardware)


Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-09-24 01:49:57 +01:00
Andy Pugh
83f209cb6d Add a driver for the Mesa SSI encoder interface
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-09-17 02:17:09 +01:00
John Thornton
2bb2ce6a21 Docs: fix typos
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2013-08-21 08:14:41 -05:00
Sebastian Kuzminsky
dbf362f8eb Merge remote branch 'origin/v2.5_branch' 2013-08-03 11:09:35 -06:00
Sebastian Kuzminsky
de9e642842 docs: describe args for multiple hm2_7i43 cards
Update the manpage to show that the ioaddr and ioaddr_hi arguments
(and the others) all take arrays, not single scalars.

Thanks to Peter Wallace for the bug report.
2013-08-02 08:56:34 -06:00
Sebastian Kuzminsky
46d8ef501d Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
	VERSION
2013-07-31 09:57:02 -06:00
Sebastian Kuzminsky
9c8f24c09e docs: fix a typo in the motion manpage 2013-07-31 01:26:19 -06:00
Chris Radek
052de4f974 these are two different things - make sure it's clear 2013-07-21 14:40:32 -05:00
John Thornton
d5138ff566 Docs: update man page to 16
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2013-07-10 12:41:18 -05:00
Jeff Epler
eaeed6404f Merge remote branch 'origin/v2.5_branch' 2013-07-01 15:05:19 -05:00
John Kasunich
02d22d652e allow for floating point in the base thread
when motion creates the base and servo thread,
the base thread doesn't support floating point.
When using brushless DC motors, it is desireable
to run the bldc component faster than the servo
thread, but it needs FP.  Added an module parameter
to motion that tells it to create a floating point
capable base thread.  Default behavior is the same
as before, so change is transparent.
2013-06-23 10:15:18 -05:00
John Kasunich
2b0624c33e remove outdated man page info
the man page requests a new feature. I added the
feature in 2007 and didn't update the man page.
2013-06-23 10:14:17 -05:00
Sebastian Kuzminsky
16f45747fa Merge branch 'v2.5_branch' 2013-06-04 21:04:07 -06:00
John Thornton
3dc1577599 Docs: add info about thread requirements
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2013-06-04 06:54:34 -05:00
Sebastian Kuzminsky
3e81d301b3 docs: fix manpage markup for mux_generic 2013-05-31 00:18:32 -06:00
Andy Pugh
faa43c2ff9 Add a new generic multiplexer (mux) component
Any number of pins, any data type.


Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-05-30 22:29:42 +01:00
Sebastian Kuzminsky
e97ddba4ab docs: reorg gitignore to placate mandb
We run mandb to index all our manpages.  mandb complains about every
non-manpage file it finds in the man directory tree.  This includes our
.gitignore files.

This commit collects all the .gitignore info into the .gitignore file
in docs/man, just outside of where mandb starts paying attention and
complaining.
2013-05-16 11:31:16 -04:00
Andy Pugh
70522abe55 Make matrix_kb handle the new 7i73 key-rollover firmware.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-04-06 02:26:11 +01:00
Andy Pugh
b494da9b7f There is no guarantee that input_report_key is realtime-safe. Remove the option.
The kernel API call used by matrix_kb may not be realtime-safe. It is not easy to tell
but at least one call that jepler found looks suspicious. This commit removes any attempt
to create keystroke events from the component.
There may be a userspace component to do the job in time.
2013-03-31 02:13:46 +01:00
Andy Pugh
6de09bbb53 Add a matrix keyboard driver
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-03-25 01:19:16 +00:00
Sebastian Kuzminsky
97a7c51655 Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
	debian/control.in
	docs/src/Submakefile
	docs/src/gcode/m-code.txt
	docs/src/gcode/o-code.txt
	docs/src/gcode/overview.txt
	src/po/fr.po
2013-02-12 23:38:34 -07:00
Chris Radek
879303e8c2 use-case for the new pid mode will help explain better. 2013-01-26 11:37:44 -06:00
Chris Radek
0e448bcff0 Merge branch 'pid-ferror-fix-try2' into v2.5_branch 2013-01-26 11:32:43 -06:00
Andy Pugh
5f6cd02aeb Adding the "flash" command to setsserial to allow updating of sserial remote firmware
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2013-01-26 16:02:46 +00:00
Chris Radek
a54ea0379f It's not clear how negative gains should work. Warn about them. 2013-01-25 12:56:50 -06:00
Chris Radek
65a3664b55 ignore new generated file 2013-01-21 21:30:24 -06:00
Chris Radek
52057aac1e Document new pid pin 2013-01-12 12:39:01 -06:00
Chris Radek
4e2e667932 Revert "motion: introduce motion.ferror-mode"
This reverts commit 203e2c4bfd.
2013-01-12 11:54:15 -06:00
Michael Haberler
45eee73c76 Merge remote branch 'origin/v2.5_branch'
Conflicts:
	src/emc/usr_intf/gremlin/gremlin.py
2013-01-12 09:57:43 +01:00
Michael Haberler
203e2c4bfd motion: introduce motion.ferror-mode
by default (motion.ferror-mode == 0), ferror is computed based on the
last commanded position, which is problematic with velocity-mode drives

if motion.ferror-mode == 1, ferror is calculated based on the new commanded
position, and following error checks are postponed until after the new
commanded position is calculated.

see also: http://www.linuxcnc.org/index.php/english/forum/search?q=servo+tuning+advice&childforums=1
2013-01-10 12:28:14 +01:00
Sebastian Kuzminsky
534777ba7e Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
	src/emc/usr_intf/gremlin/gremlin.py
2012-12-27 18:54:55 -07:00
Sebastian Kuzminsky
a307a69fc1 add a component to detect clicks, double-clicks, etc
This one goes up to quadruple clicks.  I find it useful for overloading
the functionality of the hard buttons on the control panel of my mill.

For example, in my config, multi-clicks on the Z+ jog button are detected
and routed to halui, where they trigger MDI commands:

    Double-clicking runs "quill up".

    Triple-clicking runs my "present work" subroutine: quill up and
        bring the table to the front and center for operator access.

    Quadruple-clicking runs my "stow" subroutine: quill up and bring
        the table to the back and center for out-of-the way storage at
        the end of the night.

A debounce component may be advisable between the input signal and the
multiclick component.
2012-12-22 22:26:45 -07:00
Sebastian Kuzminsky
93f5cbc7da Merge branch 'v2.5_branch'
Conflicts:
	docs/man/man9/motion.9
	docs/src/index.tmpl
	src/po/fr.po
2012-12-14 14:35:01 -07:00
Sebastian Kuzminsky
aa8618dbf8 docs: list motion's tooloffset HAL pins in manpage
Only a few axes were listed, this adds the tool offset pins for the
missing axes.
2012-11-26 21:54:42 -07:00
Andy Pugh
c321b42358 Bugfixes and manpage for setsserial
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-11-18 20:13:34 +00:00
Andy Pugh
678025aa6a Add a simple component for writing new values to the nvram of Mesa Smart Serial Cards
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-11-17 23:28:52 +00:00
Chris Radek
1dd56d59b3 Merge branch 'v2.5_branch'
Conflicts:
	docs/src/Master_HAL.txt
	src/emc/rs274ngc/interp_o_word.cc
	src/po/fr.po
2012-11-02 20:33:30 -05:00
Andy Pugh
e6461e123b Fix multiple formatting errors in the LCD component.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-11-02 22:34:19 +00:00
John Thornton
9357555805 Docs: add 7i77 pins
Signed-off-by: John Thornton <jthornton@gnipsel.com>
2012-10-27 08:20:58 -05:00
Andy Pugh
f5d8722165 Add a new manpage omitted yesterday
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-10-24 00:01:44 +01:00
Andy Pugh
48b0b112c0 Move Hostmot2 Smart Serial docmentation to a separate manpage.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-10-23 00:21:23 +01:00
Andy Pugh
cb2118375b Add an index counter for multi-cycle resolvers.
Only act on index-enable every Nth cycle.

Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-10-11 00:00:34 +01:00
Andy Pugh
25c6948852 Add a component to drive LCD screens.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-10-08 22:10:33 +01:00
Matt Shaver
01db1ab09f Change motion.motion-enabled HAL pin to an output as was originally intended 2012-08-10 23:51:47 -04:00
Andy Pugh
db994e5883 Mesa UART changes. The bitfile instance stride was wrong, amongst other things.
Signed-off-by: Andy Pugh <andy@bodgesoc.org>
2012-06-05 02:52:45 +01:00
Chris Radek
ce1994e263 Merge branch 'v2.5_branch'
Conflicts:
	VERSION
	docs/src/Submakefile
	src/po/pl.po
2012-04-02 11:14:19 -05:00
Sebastian Kuzminsky
6840f7b326 docs: use prettier utf arrows where appropriate 2012-03-30 15:43:36 -05:00
Chris Radek
7a84454ed4 Merge branch 'v2.5_branch'
Conflicts:
	docs/src/config/ini_config.txt
2012-03-21 15:58:11 -05:00
Sebastian Kuzminsky
b0e79b9390 docs: fix branding in streamer(9) manpage 2012-03-16 23:34:03 -06:00
Sebastian Kuzminsky
f7e4d5f1ba docs: fix branding in sampler(9) manpage 2012-03-16 23:34:03 -06:00
Sebastian Kuzminsky
a2c964c7a5 docs: fix a changed url in opto_ac5(9) manpage 2012-03-16 23:34:03 -06:00
Sebastian Kuzminsky
1e327fa242 docs: remove an obsolete comment in motion(9) manpage 2012-03-16 23:33:56 -06:00
Sebastian Kuzminsky
47686d8e6e docs: fix branding in kins(9) manpage 2012-03-16 23:32:07 -06:00
Sebastian Kuzminsky
afcd651ded docs: fix branding in at_pid(9) manpage 2012-03-16 23:32:04 -06:00
Sebastian Kuzminsky
f8f188341e docs: fix some branding bugs in the classicladder(9) manpage 2012-03-16 23:31:31 -06:00
Sebastian Kuzminsky
dd04728729 docs: fix branding & a typo in gantrykins manpage 2012-03-16 22:21:24 -06:00
Jeff Epler
10d8caf753 Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
	lib/python/rs274/glcanon.py
	src/po/fr.po
2012-03-16 19:55:22 -05:00
Chris Radek
9c19e27ba2 seems debounce requires at least one cfg= 2012-03-13 13:37:38 -05:00
Michael Haberler
fc3107c464 Merge branch 'v2.5_branch'
Conflicts:
	docs/man/man1/gladevcp.1
	docs/man/man9/hostmot2.9
	docs/src/gcode/m-code.txt
	docs/src/gcode/m-code_de.txt
	docs/src/gcode/m-code_es.txt
	docs/src/gcode/m-code_pl.txt
	docs/src/gcode/o-code.txt
	docs/src/gcode/overview.txt
	docs/src/gui/gladevcp.txt
	src/hal/user_comps/gladevcp.py
2012-02-13 16:33:09 +01:00
Jeff Epler
8593d363e2 docs: hostmot2 manpage markup improvements
.. also corrected some incorrect capitalization of hal pin names
2012-02-07 08:09:44 -06:00
Sebastian Kuzminsky
dd01abbd08 Merge remote branch 'origin/v2.5_branch' 2012-01-29 21:01:49 -07:00