clinton/Smoothieware.git
8 years agoFix jog screen to use WCS as well
Jim Morris [Thu, 31 Mar 2016 22:24:43 +0000 (15:24 -0700)]
Fix jog screen to use WCS as well

8 years agomake Panel display workspace coordiantes not machine coordinates
Jim Morris [Thu, 31 Mar 2016 21:33:29 +0000 (14:33 -0700)]
make Panel display workspace coordiantes not machine coordinates

8 years agoMerge pull request #897 from Smoothieware/refactor/motorcontroller-for-config
Jim Morris [Thu, 31 Mar 2016 21:09:14 +0000 (14:09 -0700)]
Merge pull request #897 from Smoothieware/refactor/motorcontroller-for-config

refactor to allow for driver specific config settings

8 years agorefactor to allow for driver specific config settings
Jim Morris [Thu, 31 Mar 2016 21:05:38 +0000 (14:05 -0700)]
refactor to allow for driver specific config settings
 drv8711 has gain and sense_resistor
 TMC has sense_resistor

8 years agoMerge pull request #896 from wolfmanjm/upstreamedge
Jim Morris [Thu, 31 Mar 2016 20:32:55 +0000 (13:32 -0700)]
Merge pull request #896 from wolfmanjm/upstreamedge

fix setting raw registers in config for motordrivers

8 years agoIf raw registers are usied in config, write the registers to the chip after setting...
Jim Morris [Thu, 31 Mar 2016 20:31:05 +0000 (13:31 -0700)]
If raw registers are usied in config, write the registers to the chip after setting the local copy.

8 years agoupdate comments for M114
Jim Morris [Wed, 30 Mar 2016 05:02:22 +0000 (22:02 -0700)]
update comments for M114

8 years agoMerge pull request #888 from wolfmanjm/add/error_on_zero_or_negative_feed_rate
Jim Morris [Tue, 29 Mar 2016 01:52:34 +0000 (18:52 -0700)]
Merge pull request #888 from wolfmanjm/add/error_on_zero_or_negative_feed_rate

Add/error on zero or negative feed rate

8 years agoMerge pull request #887 from wolfmanjm/upstreamedge
Jim Morris [Tue, 29 Mar 2016 01:51:28 +0000 (18:51 -0700)]
Merge pull request #887 from wolfmanjm/upstreamedge

modify how homing order is set.

8 years agochange ERROR return to Error as that is what pronterface expects
Jim Morris [Tue, 29 Mar 2016 01:50:33 +0000 (18:50 -0700)]
change ERROR return to Error as that is what pronterface expects

8 years agoAdd the ability for a gcode command to set an error flag so ok is not returned but...
Jim Morris [Mon, 28 Mar 2016 08:57:03 +0000 (01:57 -0700)]
Add the ability for a gcode command to set an error flag so ok is not returned but an error is
return error on zero or negative feed rate for a G0/G1/G2/G3 command

8 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 28 Mar 2016 05:47:40 +0000 (22:47 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

8 years agomodify how homing order is set.
Jim Morris [Mon, 28 Mar 2016 05:44:48 +0000 (22:44 -0700)]
modify how homing order is set.
Make sure that endstops set as nc are not used.

8 years agoMerge pull request #883 from wolfmanjm/upstreamedge
Jim Morris [Tue, 22 Mar 2016 20:05:30 +0000 (13:05 -0700)]
Merge pull request #883 from wolfmanjm/upstreamedge

Allow float values for switch S parameter

8 years agoAllow float values for switch S parameter
Jim Morris [Tue, 22 Mar 2016 19:53:27 +0000 (12:53 -0700)]
Allow float values for switch S parameter

8 years agoMerge pull request #881 from wolfmanjm/upstreamedge
Jim Morris [Tue, 22 Mar 2016 02:24:04 +0000 (19:24 -0700)]
Merge pull request #881 from wolfmanjm/upstreamedge

add 'get status' command

8 years agoadd get status command
Jim Morris [Tue, 22 Mar 2016 02:23:04 +0000 (19:23 -0700)]
add get status command

8 years agoprotect against null stream
Jim Morris [Sun, 20 Mar 2016 19:03:36 +0000 (12:03 -0700)]
protect against null stream

8 years agoupdate firmware.bin
Jim Morris [Sun, 20 Mar 2016 18:52:15 +0000 (11:52 -0700)]
update firmware.bin

8 years agoMerge pull request #879 from hyperair/fix-deltagrid-loading
Jim Morris [Sun, 20 Mar 2016 18:50:14 +0000 (11:50 -0700)]
Merge pull request #879 from hyperair/fix-deltagrid-loading

Fix mistaken fwrite (should be fread)

8 years agoFix mistaken fwrite (should be fread)
Chow Loong Jin [Sun, 20 Mar 2016 12:35:51 +0000 (20:35 +0800)]
Fix mistaken fwrite (should be fread)

8 years agoupdate firmware.bin
Jim Morris [Sun, 20 Mar 2016 08:20:04 +0000 (01:20 -0700)]
update firmware.bin

8 years agoMerge pull request #878 from wolfmanjm/upstreamedge
Jim Morris [Sun, 20 Mar 2016 07:51:41 +0000 (00:51 -0700)]
Merge pull request #878 from wolfmanjm/upstreamedge

Fix saving of G92 with M500

8 years agoFix saving of G92 with M500
Jim Morris [Sun, 20 Mar 2016 07:50:26 +0000 (00:50 -0700)]
Fix saving of G92 with M500

8 years agoMerge pull request #877 from wolfmanjm/upstreamedge
Jim Morris [Sun, 20 Mar 2016 06:31:38 +0000 (23:31 -0700)]
Merge pull request #877 from wolfmanjm/upstreamedge

more useful error message from temperature control

8 years agoadd designator to halt message from temperature control
Jim Morris [Sun, 20 Mar 2016 06:30:00 +0000 (23:30 -0700)]
add designator to halt message from temperature control

8 years agoMerge pull request #876 from Smoothieware/config-example-comments
Arthur Wolf [Sat, 19 Mar 2016 19:16:51 +0000 (20:16 +0100)]
Merge pull request #876 from Smoothieware/config-example-comments

Very minor modifications to comments in config

8 years agoVery minor modifications to comments in config origin/config-example-comments
Arthur Wolf [Sat, 19 Mar 2016 19:13:51 +0000 (20:13 +0100)]
Very minor modifications to comments in config

 To make parsing easier.

8 years agoupdate firmware.bin
Jim Morris [Fri, 18 Mar 2016 20:48:51 +0000 (13:48 -0700)]
update firmware.bin

8 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 12 Mar 2016 04:49:24 +0000 (20:49 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

8 years agoadd somemore Mxxx codes that can be executed during halt state
Jim Morris [Sat, 12 Mar 2016 04:48:34 +0000 (20:48 -0800)]
add somemore Mxxx codes that can be executed during halt state

8 years agoMerge pull request #870 from wolfmanjm/upstreamedge
Jim Morris [Wed, 9 Mar 2016 07:10:21 +0000 (23:10 -0800)]
Merge pull request #870 from wolfmanjm/upstreamedge

Save the grid size and grid radius to the delta.grid file

8 years agoSave the grid size and grid radius to the delta.grid file
Jim Morris [Wed, 9 Mar 2016 07:08:19 +0000 (23:08 -0800)]
Save the grid size and grid radius to the delta.grid file
if the grid radius is different in saved file override the config radius

8 years agoMerge pull request #869 from wolfmanjm/upstreamedge
Jim Morris [Wed, 9 Mar 2016 04:38:52 +0000 (20:38 -0800)]
Merge pull request #869 from wolfmanjm/upstreamedge

some grbl mode fixes and other misc stuff, see commit log

8 years agofix M30 in grbl mode to mean end of program (not delete sd card file)
Jim Morris [Wed, 9 Mar 2016 04:20:36 +0000 (20:20 -0800)]
fix M30 in grbl mode to mean end of program (not delete sd card file)

8 years agoUpdate config
Jim Morris [Tue, 8 Mar 2016 21:00:46 +0000 (13:00 -0800)]
Update config

8 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Tue, 8 Mar 2016 19:18:16 +0000 (11:18 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

8 years agoMerge pull request #868 from tritao/typos
Jim Morris [Tue, 8 Mar 2016 18:55:41 +0000 (10:55 -0800)]
Merge pull request #868 from tritao/typos

Fixed some typos and minor consistency issues.

8 years agoFixed some typos and minor consistency issues.
Joao Matos [Tue, 8 Mar 2016 12:29:18 +0000 (12:29 +0000)]
Fixed some typos and minor consistency issues.

8 years agoadd option to not segment z only moves, useful for deltas.
Jim Morris [Tue, 8 Mar 2016 08:10:03 +0000 (00:10 -0800)]
add option to not segment z only moves, useful for deltas.

8 years agomove try-again in gcode_dispatch
Jim Morris [Tue, 8 Mar 2016 03:41:43 +0000 (19:41 -0800)]
move try-again in gcode_dispatch

8 years agoreply ok to empty lines
Jim Morris [Sun, 6 Mar 2016 21:05:55 +0000 (13:05 -0800)]
reply ok to empty lines
reply ok to grbl query commands

8 years agoMerge pull request #867 from wolfmanjm/upstreamedge
Jim Morris [Sat, 5 Mar 2016 20:55:09 +0000 (12:55 -0800)]
Merge pull request #867 from wolfmanjm/upstreamedge

Miscellaneous updates to probing

8 years agomisc documentation updates
Jim Morris [Sat, 5 Mar 2016 20:53:31 +0000 (12:53 -0800)]
misc documentation updates

8 years agofind bed for deltagrid grid probe
Jim Morris [Fri, 4 Mar 2016 01:20:15 +0000 (17:20 -0800)]
find bed for deltagrid grid probe

8 years agoSpee dup and optimize the deltacalibration probes by removing the second homing.
Jim Morris [Thu, 3 Mar 2016 23:12:53 +0000 (15:12 -0800)]
Spee dup and optimize the deltacalibration probes by removing the second homing.

8 years agoadd a straight grid probe to delta grid.
Jim Morris [Thu, 3 Mar 2016 08:04:00 +0000 (00:04 -0800)]
add a straight grid probe to delta grid.

8 years agotweak initial move to find bed on delta grid G31
Jim Morris [Thu, 3 Mar 2016 00:20:27 +0000 (16:20 -0800)]
tweak initial move to find bed on delta grid G31

8 years agoadd M670 I1 which will invert the status of the probe pin, so if it is inverted it...
Jim Morris [Wed, 2 Mar 2016 21:46:38 +0000 (13:46 -0800)]
add M670 I1 which will invert the status of the probe pin, so if it is inverted it will not be and vice versa. Temporary setting not saved with M500.

8 years agoMerge pull request #866 from FredMurphy/feature/laser-s-range
Jim Morris [Wed, 2 Mar 2016 09:00:26 +0000 (01:00 -0800)]
Merge pull request #866 from FredMurphy/feature/laser-s-range

Allow setting for range for S parameter to control laser power

8 years agoNew laser module parameter laser_module_maximum_s_value sets range for PWM power...
Fred Murphy [Mon, 29 Feb 2016 21:09:33 +0000 (21:09 +0000)]
New laser module parameter laser_module_maximum_s_value sets range for PWM power control - S0 to Snnn

8 years agoStoring new laser_module_maximum_s_value parameter but not being used
Fred Murphy [Sat, 27 Feb 2016 22:50:18 +0000 (22:50 +0000)]
Storing new laser_module_maximum_s_value parameter but not being used

8 years agoEnsure laser TTL isn't switched off until last block of a G2/G3
Fred Murphy [Sat, 27 Feb 2016 21:10:22 +0000 (21:10 +0000)]
Ensure laser TTL isn't switched off until last block of a G2/G3

8 years agoMerge pull request #865 from wolfmanjm/feature/delta-grid-strategy
Jim Morris [Tue, 1 Mar 2016 21:05:57 +0000 (13:05 -0800)]
Merge pull request #865 from wolfmanjm/feature/delta-grid-strategy

Feature/delta grid strategy

8 years agoadd documentation
Jim Morris [Tue, 1 Mar 2016 21:03:32 +0000 (13:03 -0800)]
add documentation

8 years agofix probe reverse direction
Jim Morris [Tue, 1 Mar 2016 09:30:57 +0000 (01:30 -0800)]
fix probe reverse direction

8 years agofix reverse z probe option
Jim Morris [Tue, 1 Mar 2016 08:45:21 +0000 (00:45 -0800)]
fix reverse z probe option

8 years agoSave G92 setting on M500 in compliance with linuxcnc and grbl
Jim Morris [Tue, 1 Mar 2016 08:32:24 +0000 (00:32 -0800)]
Save G92 setting on M500 in compliance with linuxcnc and grbl

8 years agofix saving grid on start up, and saving with M500
Jim Morris [Tue, 1 Mar 2016 07:05:11 +0000 (23:05 -0800)]
fix saving grid on start up, and saving with M500

8 years agofix bug in grid load
Jim Morris [Tue, 1 Mar 2016 06:53:26 +0000 (22:53 -0800)]
fix bug in grid load

8 years agomake grid size configurable
Jim Morris [Tue, 1 Mar 2016 06:45:07 +0000 (22:45 -0800)]
make grid size configurable
allocate grid in AHB0

8 years agoadd spiral probe to deltagrid to test the grid.
Jim Morris [Tue, 1 Mar 2016 03:11:50 +0000 (19:11 -0800)]
add spiral probe to deltagrid to test the grid.

8 years agoadd confirmatin of grid save and load
Jim Morris [Tue, 1 Mar 2016 00:43:42 +0000 (16:43 -0800)]
add confirmatin of grid save and load

8 years agofix typo
Jim Morris [Mon, 29 Feb 2016 08:04:51 +0000 (00:04 -0800)]
fix typo

8 years agomake grid file name a define
Jim Morris [Mon, 29 Feb 2016 07:26:44 +0000 (23:26 -0800)]
make grid file name a define
allow deletion of the grid file

8 years agoadd save/delete/load of grid file
Jim Morris [Mon, 29 Feb 2016 07:21:21 +0000 (23:21 -0800)]
add save/delete/load of grid file

8 years agoAdd DeltaGridStrategy based on Johann Rocholl Kossel/Marlin implementation - intial...
Jim Morris [Sun, 28 Feb 2016 23:58:24 +0000 (15:58 -0800)]
Add DeltaGridStrategy based on Johann Rocholl Kossel/Marlin implementation - intial checkin

8 years agoMerge pull request #864 from wolfmanjm/rdelta/improve-homing-and-calibration
Jim Morris [Sun, 28 Feb 2016 09:53:07 +0000 (01:53 -0800)]
Merge pull request #864 from wolfmanjm/rdelta/improve-homing-and-calibration

Rdelta/improve homing and calibration

8 years agocreate ROatryDEltaCalibration module
Jim Morris [Sun, 28 Feb 2016 09:44:27 +0000 (01:44 -0800)]
create ROatryDEltaCalibration module

8 years agorefactor
Jim Morris [Sun, 28 Feb 2016 09:37:56 +0000 (01:37 -0800)]
refactor

8 years agosplit off the M206/M306 for rotary delta into its own calibration module
Jim Morris [Sun, 28 Feb 2016 09:30:59 +0000 (01:30 -0800)]
split off the M206/M306 for rotary delta into its own calibration module

8 years agofix M306 for rdelta
Jim Morris [Sun, 28 Feb 2016 06:23:27 +0000 (22:23 -0800)]
fix M306 for rdelta
add M306 L1 which will use last probe position to reference so ankle finder can be probed
G30 saves actuator postion in last probe position

8 years agoMerge pull request #863 from wolfmanjm/fix/use-wrap-delete
Jim Morris [Sat, 27 Feb 2016 23:34:51 +0000 (15:34 -0800)]
Merge pull request #863 from wolfmanjm/fix/use-wrap-delete

Make the operator delete in MemoryPool.cpp global so it catches all d…

8 years agoMerge branch 'fix/use-wrap-delete' into rdelta/improve-homing-and-calibration
Jim Morris [Sat, 27 Feb 2016 23:32:21 +0000 (15:32 -0800)]
Merge branch 'fix/use-wrap-delete' into rdelta/improve-homing-and-calibration

8 years agoMake the operator delete in MemoryPool.cpp global so it catches all delete calls...
Jim Morris [Sat, 27 Feb 2016 23:30:26 +0000 (15:30 -0800)]
Make the operator delete in MemoryPool.cpp global so it catches all delete calls regardless of MemoryPool.h being included.
This fixes cases where a Module is laoded into AHB0 and deletes itself as it is not enabled.
No longer needed to include paltform_memory.h in Module.h

8 years agoOnly reset actuator for rdelta if all three actuators are specified in M306 or R1...
Jim Morris [Sat, 27 Feb 2016 23:03:03 +0000 (15:03 -0800)]
Only reset actuator for rdelta if all three actuators are specified in M306 or R1 is given

8 years agofix rotary delta FK to be mirrored like the IK
Jim Morris [Sat, 27 Feb 2016 09:24:33 +0000 (01:24 -0800)]
fix rotary delta FK to be mirrored like the IK
add config option to mirror or not mirror the XY on rotary delta
fix homing on rotarary delta
Allow zprobe to probe in reverse direction
allow ok as a command and just echo ok.

8 years agoZprobe recognizes rdelta so G30 and old style zprobe will work
Jim Morris [Thu, 25 Feb 2016 10:16:49 +0000 (02:16 -0800)]
Zprobe recognizes rdelta so G30 and old style zprobe will work

8 years agoMerge pull request #862 from wolfmanjm/upstreamedge
Jim Morris [Thu, 25 Feb 2016 07:38:19 +0000 (23:38 -0800)]
Merge pull request #862 from wolfmanjm/upstreamedge

make module.h include platform_memory.h so if any module is allcoated…

8 years agomake module.h include platform_memory.h so if any module is allcoated in AHB0 and...
Jim Morris [Thu, 25 Feb 2016 07:32:43 +0000 (23:32 -0800)]
make module.h include platform_memory.h so if any module is allcoated in AHB0 and releases itself it dosn't crash as it will use the correct delete
allocate some more moduoes into AHB0 so as to reduce the chances of out of memory crash while config is setting up.
Still have very little memory left after all config, especially if there is a big config file.

8 years agoMerge pull request #861 from wolfmanjm/upstreamedge
Jim Morris [Wed, 24 Feb 2016 23:36:00 +0000 (15:36 -0800)]
Merge pull request #861 from wolfmanjm/upstreamedge

fix more delete crashes when object is in AHB0

8 years agofix more delete crashes when object is in AHB0
Jim Morris [Wed, 24 Feb 2016 23:34:14 +0000 (15:34 -0800)]
fix more delete crashes when object is in AHB0

8 years agoMerge pull request #860 from wolfmanjm/upstreamedge
Jim Morris [Wed, 24 Feb 2016 08:36:20 +0000 (00:36 -0800)]
Merge pull request #860 from wolfmanjm/upstreamedge

fix discrepancies in realtime position vs last milestone when using ? …

8 years agofix discrepanceis in realtime postion vs last milestone when using ? to report position
Jim Morris [Wed, 24 Feb 2016 08:19:06 +0000 (00:19 -0800)]
fix discrepanceis in realtime postion vs last milestone when using ? to report position
Move modules that may be deleted as they are not enabled out of AHB0 due to possible bug is the delete routine when object is in AHB0
Move Adc module into AHB0 instead
make postion reports all use 4dp
clean up some grbl_mode issues
save state before and after endstop retract after home so it does not reset feed rates

8 years agoMerge pull request #859 from wolfmanjm/upstreamedge
Jim Morris [Wed, 24 Feb 2016 02:47:30 +0000 (18:47 -0800)]
Merge pull request #859 from wolfmanjm/upstreamedge

Add M0 as feed hold when in grbl mode

8 years agoAdd M0 as feed hold when in grbl mode
Jim Morris [Wed, 24 Feb 2016 02:46:48 +0000 (18:46 -0800)]
Add M0 as feed hold when in grbl mode

8 years agoMerge pull request #858 from wolfmanjm/upstreamedge
Jim Morris [Tue, 23 Feb 2016 23:39:47 +0000 (15:39 -0800)]
Merge pull request #858 from wolfmanjm/upstreamedge

turn off all heaters with panels cool down menu item

8 years agoturn off all heaters with panels cool down menu item
Jim Morris [Tue, 23 Feb 2016 23:38:35 +0000 (15:38 -0800)]
turn off all heaters with panels cool down menu item

8 years agoMerge pull request #857 from wolfmanjm/refactor/G38-processing-fix-for-deltas
Jim Morris [Tue, 23 Feb 2016 08:10:30 +0000 (00:10 -0800)]
Merge pull request #857 from wolfmanjm/refactor/G38-processing-fix-for-deltas

remove the fnc from stepticker used for probe checking.

8 years agoremove the fnc from stepticker used for probe checking.
Jim Morris [Tue, 23 Feb 2016 08:04:28 +0000 (00:04 -0800)]
remove the fnc from stepticker used for probe checking.
use a timer to check for probe and tell steppers to stop moving with a flag.
allow disabling of segmentation which is required to allow G38 to work this way.
G38 now works on deltas.

8 years agoMerge pull request #856 from wolfmanjm/upstreamedge
Jim Morris [Mon, 22 Feb 2016 08:55:02 +0000 (00:55 -0800)]
Merge pull request #856 from wolfmanjm/upstreamedge

move serial console module to AHB0

8 years agoMerge branch 'feature/correct-rotarydelta-homing' into upstreamedge
Jim Morris [Mon, 22 Feb 2016 08:53:23 +0000 (00:53 -0800)]
Merge branch 'feature/correct-rotarydelta-homing' into upstreamedge

8 years agoMerge pull request #851 from wolfmanjm/feature/correct-rotarydelta-homing
Jim Morris [Mon, 22 Feb 2016 08:50:57 +0000 (00:50 -0800)]
Merge pull request #851 from wolfmanjm/feature/correct-rotarydelta-homing

Changes for rotary delta homing...

8 years agoMerge remote-tracking branch 'upstream/edge' into feature/correct-rotarydelta-homing
Jim Morris [Sun, 21 Feb 2016 23:26:50 +0000 (15:26 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/correct-rotarydelta-homing

8 years agoMerge pull request #855 from wolfmanjm/upstreamedge
Jim Morris [Sun, 21 Feb 2016 23:26:08 +0000 (15:26 -0800)]
Merge pull request #855 from wolfmanjm/upstreamedge

fix firmware retract with zlift setting feed rate

8 years agofix firmware retract with zlift setting feed rate
Jim Morris [Sun, 21 Feb 2016 23:19:40 +0000 (15:19 -0800)]
fix firmware retract with zlift setting feed rate

8 years agofix firmware retract with zlift setting feed rate
Jim Morris [Sun, 21 Feb 2016 23:19:40 +0000 (15:19 -0800)]
fix firmware retract with zlift setting feed rate

8 years agoMerge pull request #854 from Smoothieware/fix/when-slow-ticker-is-started
Jim Morris [Sun, 21 Feb 2016 21:05:15 +0000 (13:05 -0800)]
Merge pull request #854 from Smoothieware/fix/when-slow-ticker-is-started

fix when slow ticker gets started

8 years agoMerge branch 'fix/when-slow-ticker-is-started' into feature/correct-rotarydelta-homing
Jim Morris [Sun, 21 Feb 2016 21:00:55 +0000 (13:00 -0800)]
Merge branch 'fix/when-slow-ticker-is-started' into feature/correct-rotarydelta-homing

8 years agofix when slow ticker gets started
Jim Morris [Sun, 21 Feb 2016 20:50:10 +0000 (12:50 -0800)]
fix when slow ticker gets started
refactor the slowticker setup
Fixes PR  #853