Jim Morris [Sun, 21 Feb 2016 08:44:15 +0000 (00:44 -0800)]
move some high memory use modules to AHB0 as we started to run out of memory during config
Jim Morris [Sun, 21 Feb 2016 08:10:53 +0000 (00:10 -0800)]
cleanup some ctors
Jim Morris [Sun, 21 Feb 2016 07:09:14 +0000 (23:09 -0800)]
update soem comments
Jim Morris [Sat, 20 Feb 2016 08:52:06 +0000 (00:52 -0800)]
refactor endstops to get the homing logic ot of the handle gcode method
make G38 probe in Z use same new method of probing as XY so it works with all kinematics
Jim Morris [Sat, 20 Feb 2016 05:22:17 +0000 (21:22 -0800)]
disable compensation transform for the G38 probes
fix what homing saves in the last probe position
Jim Morris [Sat, 20 Feb 2016 01:35:13 +0000 (17:35 -0800)]
remember the last probe position after a probe retrieved with $#
set the actuator units moved after a home in the last probed position
Jim Morris [Fri, 19 Feb 2016 22:16:55 +0000 (14:16 -0800)]
make ok per line the default. can be disbaled (returning to legacy behavior by setting to false in config)
Jim Morris [Fri, 19 Feb 2016 10:42:39 +0000 (02:42 -0800)]
fix M306 for rotary delta
allow M1910.2 to be fractional units
Jim Morris [Fri, 19 Feb 2016 08:18:54 +0000 (00:18 -0800)]
M306 for a rotary delta calculates the theta offset by comparing the current angle with the actual angle specified in the parameter A B or C
Jim Morris [Fri, 19 Feb 2016 01:23:42 +0000 (17:23 -0800)]
Fix command line error if command not handled in SimpleShell but elsewhere
Jim Morris [Fri, 19 Feb 2016 00:57:52 +0000 (16:57 -0800)]
Changes for rotary delta homing...
The alpha_max, beta_max, gamma_max are the angle that the actuators are at when homed.
home_offsets (set with M206) are the theta offsets for the homing angle.
When a rotary delta homes it uses the angle given in the alpha_max+home_offset[0] and uses the FK
(actuator_to_cartesian) to input the angles and get the cartesian XYZ for those angles, (added a
new call Robot::reset_actuator_position(a, b, c) where a b c are the theta angles for each actuator).
M306 and trim (M666) is disabled for rotary delta. (unless someone can explain to me how trim would
actually work in this case).
Jim Morris [Thu, 18 Feb 2016 06:37:16 +0000 (22:37 -0800)]
fixup G38 probing in X or Y. Need to reset last milestone after pribe is hit.
Jim Morris [Wed, 17 Feb 2016 08:57:14 +0000 (00:57 -0800)]
Merge pull request #849 from wolfmanjm/upstreamedge
add utility functions for manually controlling and setting odd arm solutions
Jim Morris [Wed, 17 Feb 2016 06:07:14 +0000 (22:07 -0800)]
add M1910.2 to move by the specified number of actuator units
add reset_actuator_position() to to allow manula homing and setting actuator specific positions
add G28.4 to allow manual setting of homing to actuator units
(optimize set lround to lroundf wherever it was used)
Jim Morris [Tue, 16 Feb 2016 02:26:04 +0000 (18:26 -0800)]
don't use safe_delay when initing lcds, as on_idle can't be called yet
Jim Morris [Tue, 16 Feb 2016 02:19:57 +0000 (18:19 -0800)]
use safe_delay instead of the blocking wait_ms()
Jim Morris [Tue, 16 Feb 2016 02:05:06 +0000 (18:05 -0800)]
Merge pull request #847 from wolfmanjm/feature/make-probe-use-planner-moves
Introduce the ability to stop a planner move based on a defined function
Jim Morris [Tue, 16 Feb 2016 02:02:44 +0000 (18:02 -0800)]
Introduce the ability to stop a planner move based on a defined function
implement G38.2 for X or Y moves, so probing sideways to get center or size
Jim Morris [Mon, 15 Feb 2016 22:08:02 +0000 (14:08 -0800)]
Merge pull request #846 from wolfmanjm/upstreamedge
add command:- get [ik|fk] [-m] x,y,z
Jim Morris [Mon, 15 Feb 2016 22:05:09 +0000 (14:05 -0800)]
add warnign to delta calibration if delta radius does not resolve
Jim Morris [Sat, 13 Feb 2016 22:57:18 +0000 (14:57 -0800)]
fix the -m parameter
Jim Morris [Sat, 13 Feb 2016 22:52:20 +0000 (14:52 -0800)]
add get ik [-m] x,y,z
optional -m will move to the given x,y,z in machine coordinates (G53 G0...)
get fk [-m] a,b,c will calculate the XYZ from teh given actuator positions, and optionally move to the calculated position.
These are for debugging arm solutions.
Jim Morris [Sat, 13 Feb 2016 10:33:36 +0000 (02:33 -0800)]
add `get fk 0 0 0` command to do forward kinematics on actuator values, useful for debugging arm solutions.
Jim Morris [Fri, 12 Feb 2016 09:20:02 +0000 (01:20 -0800)]
Merge pull request #844 from wolfmanjm/upstreamedge
find bed for G29 delta strategy
Jim Morris [Fri, 12 Feb 2016 09:18:55 +0000 (01:18 -0800)]
find bed for G29 delta strategy
Jim Morris [Tue, 9 Feb 2016 07:51:20 +0000 (23:51 -0800)]
Merge pull request #830 from wolfmanjm/feature/add-grbl-queries
Feature/add grbl queries
Jim Morris [Tue, 9 Feb 2016 07:42:51 +0000 (23:42 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/add-grbl-queries
Jim Morris [Tue, 9 Feb 2016 01:42:09 +0000 (17:42 -0800)]
Merge pull request #842 from wolfmanjm/upstreamedge
fix md5sum shell command to not trigger watchdog
Jim Morris [Mon, 8 Feb 2016 04:05:06 +0000 (20:05 -0800)]
fix md5sum shell command to not trigger watchdog
Jim Morris [Fri, 5 Feb 2016 09:53:09 +0000 (01:53 -0800)]
Merge pull request #840 from PeeJay/edge
Initalise ethernet pin connections correctly
Paul Jones [Fri, 5 Feb 2016 02:39:00 +0000 (13:39 +1100)]
Initalise ethernet pin connections correctly
Previously the ethernet initialisation would clobber PINSEL2 + 3
registers, thereby removing functionality from any previously
configured pins. Eg. ADC4, ADC5 which use PINSEL3.
Signed-off-by: Paul Jones <paul@pauljones.id.au>
Jim Morris [Wed, 3 Feb 2016 08:39:42 +0000 (00:39 -0800)]
Merge pull request #839 from wolfmanjm/upstreamedge
update rotary delta sample config
Jim Morris [Wed, 3 Feb 2016 08:38:07 +0000 (00:38 -0800)]
made the rotary delta config sample work for smoothieboards
Jim Morris [Wed, 3 Feb 2016 08:33:49 +0000 (00:33 -0800)]
update config readme
Jim Morris [Wed, 3 Feb 2016 08:31:18 +0000 (00:31 -0800)]
renamed the firepick example cofig to rotary delta to refelct it is generic
Jim Morris [Tue, 2 Feb 2016 06:42:29 +0000 (22:42 -0800)]
Merge pull request #838 from wolfmanjm/upstreamedge
fix signs in rotary delta solution
Jim Morris [Tue, 2 Feb 2016 06:41:26 +0000 (22:41 -0800)]
fix signs in rotary delta solution
Jim Morris [Tue, 2 Feb 2016 06:14:24 +0000 (22:14 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/add-grbl-queries
Conflicts:
src/modules/tools/endstops/Endstops.cpp
Jim Morris [Tue, 2 Feb 2016 06:07:49 +0000 (22:07 -0800)]
Merge pull request #837 from wolfmanjm/fix/r-delta
Fix/r delta
Jim Morris [Tue, 2 Feb 2016 00:21:01 +0000 (16:21 -0800)]
rename rotatabledelta to rotarydelta
Jim Morris [Mon, 1 Feb 2016 23:43:26 +0000 (15:43 -0800)]
Merge remote-tracking branch 'upstream/edge' into fix/r-delta
Jim Morris [Mon, 1 Feb 2016 21:37:25 +0000 (13:37 -0800)]
allow debug on/off for rotatable delta via M665 W1 or W0
change the F parameter in M665 to I as F is not allowed
Jim Morris [Mon, 1 Feb 2016 21:10:50 +0000 (13:10 -0800)]
Merge pull request #836 from wolfmanjm/upstreamedge
fix config options for rotatable delta arm solution
Jim Morris [Mon, 1 Feb 2016 21:09:11 +0000 (13:09 -0800)]
fix config options for rotatable delta arm solution
Jim Morris [Mon, 1 Feb 2016 21:09:11 +0000 (13:09 -0800)]
fix config options for rotatable delta arm solution
Jim Morris [Sat, 30 Jan 2016 10:01:36 +0000 (02:01 -0800)]
Only send one ok per line rather than per g code when in grbl mode
Jim Morris [Thu, 28 Jan 2016 23:06:48 +0000 (15:06 -0800)]
only enable ! and ~ if in grbl mode
Jim Morris [Thu, 28 Jan 2016 22:46:04 +0000 (14:46 -0800)]
add feed hold and release (! and ~) to usb serial as per grbl
Jim Morris [Thu, 28 Jan 2016 06:49:09 +0000 (22:49 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/add-grbl-queries
Jim Morris [Thu, 28 Jan 2016 06:18:43 +0000 (22:18 -0800)]
Merge pull request #833 from RepRapMorgan/endstops_fix_scara
Scara endstops
Quentin Harley [Thu, 28 Jan 2016 05:44:51 +0000 (07:44 +0200)]
Scara endstops
Repaired the way scara systems home:
Z is not affected by inverse kinematics, thus can handle limits like non-delta systems if configured
Jim Morris [Wed, 27 Jan 2016 19:28:13 +0000 (11:28 -0800)]
Merge pull request #831 from RepRapMorgan/zgrid_homing
Zgrid homing
Quentin Harley [Wed, 27 Jan 2016 19:18:45 +0000 (21:18 +0200)]
fix typo
Quentin Harley [Wed, 27 Jan 2016 10:15:36 +0000 (12:15 +0200)]
ZGrid
Remove/comment debug code
Quentin Harley [Wed, 27 Jan 2016 09:58:41 +0000 (11:58 +0200)]
ZGrid fixes
- Repairs the Z offset after calibration when probe height is properly defined
- Adds manual probe attachment position with default to prior calculated position (backwards compatible)
- Changes grid normalisation to be zero at home position: no more aprupt movement in first movement after home
Jim Morris [Tue, 26 Jan 2016 06:08:08 +0000 (22:08 -0800)]
Fix format of grbl error: messages
add HOME status for grbl ? if homing
Jim Morris [Tue, 26 Jan 2016 05:27:23 +0000 (21:27 -0800)]
get the current G28 saved position
Jim Morris [Tue, 26 Jan 2016 04:26:30 +0000 (20:26 -0800)]
implement G28 as per grbl whenin grbl mode or G28.2 when in smoothie mode - moves to predefined position
implement G28.1 to save predefined position (saved with M500)
G28.3 does a manual set home
Jim Morris [Tue, 26 Jan 2016 03:23:03 +0000 (19:23 -0800)]
add M2 and M30 end of program handling
Jim Morris [Tue, 26 Jan 2016 00:06:33 +0000 (16:06 -0800)]
fix $H
Jim Morris [Mon, 25 Jan 2016 23:55:20 +0000 (15:55 -0800)]
added grbl commands when in grbl_mode (set in config with grbl_mode true)
$H does homing cycle
$G returns gcod state
$X resets Alarm state
$# outputs WCS state
error messages are more grbl like "error:message"
G28 in grbl mode is goto predefined position (not quite implemented yet)
Probing with G38.2/3 now returns grbl messages when in grbl mode, and enters Alarm if requested
Jim Morris [Sun, 24 Jan 2016 02:12:45 +0000 (18:12 -0800)]
Merge pull request #828 from wolfmanjm/upstreamedge
also extruder enable pin needs to be inverted for azteeg v2
Jim Morris [Sun, 24 Jan 2016 02:12:05 +0000 (18:12 -0800)]
Update config
Jim Morris [Sun, 24 Jan 2016 02:11:33 +0000 (18:11 -0800)]
Update config
Jim Morris [Sun, 24 Jan 2016 02:08:45 +0000 (18:08 -0800)]
Merge pull request #827 from wolfmanjm/upstreamedge
add version2 config for azteeg x5 mini
Jim Morris [Sun, 24 Jan 2016 02:07:02 +0000 (18:07 -0800)]
add version 2 specific config for the new azteeg X5 mini
Jim Morris [Sat, 23 Jan 2016 03:12:08 +0000 (19:12 -0800)]
refactor simpleshell cat
Jim Morris [Sat, 23 Jan 2016 03:09:36 +0000 (19:09 -0800)]
fix line count for cat command
send ^Z at end of cat if -d xxx is used to terminate the upload
Jim Morris [Fri, 22 Jan 2016 08:01:13 +0000 (00:01 -0800)]
add to the cat command -d nnn where nnn is the seconds to wait before printing out the results, used for upload commands
Jim Morris [Fri, 15 Jan 2016 08:50:18 +0000 (00:50 -0800)]
Merge pull request #825 from wolfmanjm/feature/add-grbl-abort-alarm-query
add ^X to the USB serial which will enter ON_HALT in the next ON_IDLE…
Jim Morris [Fri, 15 Jan 2016 08:47:14 +0000 (00:47 -0800)]
add ^X to the USB serial which will enter ON_HALT in the next ON_IDLE, allows abort of M109 and other things from command line
NOTE this may not work if there is a USB buffer full of GCodes
add ? to USB Serial which returns an immediate GRBL-like status response with real time machine and workspace position
Jim Morris [Tue, 12 Jan 2016 23:04:13 +0000 (15:04 -0800)]
Merge pull request #824 from wolfmanjm/upstreamedge
remove unsupported touchprobe module, has been archived in branch arc…
Jim Morris [Tue, 12 Jan 2016 23:02:42 +0000 (15:02 -0800)]
remove unsupported touchprobe module, has been archived in branch archive/touchprobe
this has not been compiled in a year or more and it out of date.
Jim Morris [Tue, 12 Jan 2016 22:59:13 +0000 (14:59 -0800)]
Merge pull request #811 from quillford/patch-1
small config sample typo fix
Jim Morris [Tue, 12 Jan 2016 22:51:54 +0000 (14:51 -0800)]
Merge pull request #823 from wolfmanjm/upstreamedge
Minor syntax tweaks
Jim Morris [Tue, 12 Jan 2016 22:50:33 +0000 (14:50 -0800)]
replace k_max_wcs with MAX_WCS define
Jim Morris [Sun, 10 Jan 2016 02:57:57 +0000 (18:57 -0800)]
optimize S parameter of Switch
Remove obsolete F parameter from M92
Jim Morris [Thu, 7 Jan 2016 21:33:05 +0000 (13:33 -0800)]
append NOMSD to version if a nomsd build
when using M28 save to sdcard, allow commands from other streams to be exectued while it is saving from the submitting stream
Jim Morris [Tue, 5 Jan 2016 21:48:17 +0000 (13:48 -0800)]
update comments to explain in more detail what is going on with reset position after an abort
Jim Morris [Tue, 5 Jan 2016 21:27:06 +0000 (13:27 -0800)]
Merge pull request #819 from wolfmanjm/upstreamedge
fix issue #818
Jim Morris [Tue, 5 Jan 2016 21:24:49 +0000 (13:24 -0800)]
Fix position after abort, fixes issue #818
Cancel suspend if home is issued while suspended
Jim Morris [Tue, 5 Jan 2016 18:57:35 +0000 (10:57 -0800)]
G28 cancels suspend
Jim Morris [Sat, 2 Jan 2016 03:44:22 +0000 (19:44 -0800)]
Merge pull request #816 from wolfmanjm/upstreamedge
allow subcodes in switch command definitions
Jim Morris [Sat, 2 Jan 2016 03:43:25 +0000 (19:43 -0800)]
allow subcodes in switch command definitions
Jim Morris [Sat, 2 Jan 2016 02:55:44 +0000 (18:55 -0800)]
Merge pull request #815 from wolfmanjm/upstreamedge
change selection of zprobe strategies from subcodes to Pn parameter
Jim Morris [Sat, 2 Jan 2016 02:44:37 +0000 (18:44 -0800)]
change selection of zprobe strategies from subcodes to Pn parameter
add G29.1 to output probe results in a format better suited for pasting in external programs
Jim Morris [Mon, 28 Dec 2015 23:23:29 +0000 (15:23 -0800)]
update firmware.bin
quillford [Mon, 28 Dec 2015 06:17:42 +0000 (22:17 -0800)]
small config sample typo fix
Jim Morris [Tue, 22 Dec 2015 08:34:26 +0000 (00:34 -0800)]
Update README.creole
Jim Morris [Tue, 22 Dec 2015 08:27:02 +0000 (00:27 -0800)]
Update README.creole
Jim Morris [Tue, 22 Dec 2015 05:20:54 +0000 (21:20 -0800)]
Merge pull request #810 from wolfmanjm/feature/add-G38.2-probe
Feature/add g38.2 probe
Jim Morris [Mon, 21 Dec 2015 22:09:49 +0000 (14:09 -0800)]
subtract z delta for current position as the probe went down (todo allow for up)
Jim Morris [Sun, 20 Dec 2015 10:02:27 +0000 (02:02 -0800)]
return seek rate of feed rate depending on grou
p 1 state
for get state return correct feed rate depeonding on grouo 1 state
Jim Morris [Sun, 20 Dec 2015 07:47:54 +0000 (23:47 -0800)]
refactor
Jim Morris [Sun, 20 Dec 2015 00:53:36 +0000 (16:53 -0800)]
initial implementation of G38.2 in Z axis only
Jim Morris [Sun, 20 Dec 2015 00:15:05 +0000 (16:15 -0800)]
Merge pull request #808 from wolfmanjm/upstreamedge
fix modal group 1 commands (G1-G3)
Jim Morris [Sat, 19 Dec 2015 23:12:10 +0000 (15:12 -0800)]
fix modal group 1 commands (G1-G3)
Jim Morris [Fri, 18 Dec 2015 05:03:56 +0000 (21:03 -0800)]
Merge pull request #807 from rparrett/feature/newglyphs
New/original glyphs for WatchScreen
Rob Parrett [Fri, 18 Dec 2015 04:40:58 +0000 (04:40 +0000)]
New/original glyphs for WatchScreen
Jim Morris [Wed, 16 Dec 2015 23:10:54 +0000 (15:10 -0800)]
Merge pull request #806 from wolfmanjm/upstreamedge
fix current tool returned in get state