clinton/Smoothieware.git
8 years agoadded check so that we dont re-enter halt
Arthur Wolf [Mon, 23 May 2016 21:08:44 +0000 (23:08 +0200)]
added check so that we dont re-enter halt

8 years agoMerge pull request #929 from Smoothieware/edge
Arthur Wolf [Mon, 23 May 2016 20:47:49 +0000 (22:47 +0200)]
Merge pull request #929 from Smoothieware/edge

Merging current edge into runaway to resume work on runaway

8 years agoMerge pull request #926 from wolfmanjm/upstreamedge
Jim Morris [Wed, 18 May 2016 22:38:37 +0000 (15:38 -0700)]
Merge pull request #926 from wolfmanjm/upstreamedge

fix reset pin for st7565

8 years agofix reset pin for st7565
Jim Morris [Wed, 18 May 2016 22:37:40 +0000 (15:37 -0700)]
fix reset pin for st7565

8 years agoMerge pull request #925 from wolfmanjm/upstreamedge
Jim Morris [Wed, 18 May 2016 22:31:22 +0000 (15:31 -0700)]
Merge pull request #925 from wolfmanjm/upstreamedge

Fix drilling cycles to use WCS

8 years agoFix drillign cycles to use WCS
Jim Morris [Wed, 18 May 2016 22:28:50 +0000 (15:28 -0700)]
Fix drillign cycles to use WCS

8 years agoAdding license information
Arthur Wolf [Mon, 16 May 2016 18:31:35 +0000 (20:31 +0200)]
Adding license information

8 years agoAdded a bit of contribution information to the readme
Arthur Wolf [Sun, 15 May 2016 07:22:49 +0000 (09:22 +0200)]
Added a bit of contribution information to the readme

8 years agoMerge pull request #920 from wolfmanjm/upstreamedge
Jim Morris [Fri, 29 Apr 2016 22:38:53 +0000 (15:38 -0700)]
Merge pull request #920 from wolfmanjm/upstreamedge

add designator to motordriver messages

8 years agoadd designator to motordriver messages
Jim Morris [Fri, 29 Apr 2016 22:37:56 +0000 (15:37 -0700)]
add designator to motordriver messages

8 years agoupdate firmware.bin
Jim Morris [Fri, 22 Apr 2016 22:53:46 +0000 (15:53 -0700)]
update firmware.bin

8 years agoMerge pull request #917 from wolfmanjm/upstreamedge
Jim Morris [Fri, 22 Apr 2016 22:36:31 +0000 (15:36 -0700)]
Merge pull request #917 from wolfmanjm/upstreamedge

ignore M0, as setting feed hold in non grbl mode basically stalls eve…

8 years agoignore M0, as setting feed hold in nom grbl mode basically stalls everything as trher...
Jim Morris [Fri, 22 Apr 2016 22:35:25 +0000 (15:35 -0700)]
ignore M0, as setting feed hold in nom grbl mode basically stalls everything as trhere is not way to release it

8 years agoMerge pull request #916 from wolfmanjm/upstreamedge
Jim Morris [Thu, 21 Apr 2016 08:20:51 +0000 (01:20 -0700)]
Merge pull request #916 from wolfmanjm/upstreamedge

remove on_gcode_execute from Stepper

8 years agoremove on_gcode_execute from Stepper
Jim Morris [Thu, 21 Apr 2016 08:18:41 +0000 (01:18 -0700)]
remove on_gcode_execute from Stepper

8 years agoMerge pull request #915 from lautr3k/fix/http_upload
Jim Morris [Tue, 19 Apr 2016 07:27:50 +0000 (00:27 -0700)]
Merge pull request #915 from lautr3k/fix/http_upload

Fix/http upload

8 years agoadd an header sent with all request and removed which is not necessary in http_header...
Sébastien Mischler (aka skarab) [Mon, 18 Apr 2016 09:50:10 +0000 (11:50 +0200)]
add an header sent with all request and removed which is not necessary in http_header_preflight

8 years agoMerge remote-tracking branch 'refs/remotes/Smoothieware/edge' into fix/http_upload
Sébastien Mischler (aka skarab) [Mon, 18 Apr 2016 08:47:59 +0000 (10:47 +0200)]
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into fix/http_upload

8 years agoremove unused strings and useless shtml extension
Sébastien Mischler (aka skarab) [Mon, 18 Apr 2016 08:47:29 +0000 (10:47 +0200)]
remove unused strings and useless shtml extension

8 years agoMerge pull request #913 from lautr3k/fix/http_upload
Jim Morris [Sun, 17 Apr 2016 18:01:34 +0000 (11:01 -0700)]
Merge pull request #913 from lautr3k/fix/http_upload

Allow remote file upload (CORS)

8 years agoAllow remote files upload (CORS)
Sébastien Mischler (aka skarab) [Sun, 17 Apr 2016 14:15:34 +0000 (16:15 +0200)]
Allow remote files upload (CORS)

Implement preflighted requests (OPTIONS) to allow remote files upload
(CORS).

-
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS#Preflighted_requests

- https://www.w3.org/TR/cors/

8 years agoAllow remote upload (preflighted requests)
Sébastien Mischler (aka skarab) [Sun, 17 Apr 2016 14:13:39 +0000 (16:13 +0200)]
Allow remote upload (preflighted requests)

Implement preflighted requests (OPTIONS) to allow remote file upload
(CORS).

-
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS#Preflighted_requests

- https://www.w3.org/TR/cors/

8 years agoset "Access-Control-Allow-Origin" in all headers
Sébastien Mischler (aka skarab) [Sun, 17 Apr 2016 11:00:06 +0000 (13:00 +0200)]
set "Access-Control-Allow-Origin" in all headers

8 years agoMerge pull request #911 from wolfmanjm/upstreamedge
Jim Morris [Sat, 16 Apr 2016 22:30:44 +0000 (15:30 -0700)]
Merge pull request #911 from wolfmanjm/upstreamedge

add option to save G92 on M500

8 years agoadd option to save G92 on M500
Jim Morris [Sat, 16 Apr 2016 22:29:44 +0000 (15:29 -0700)]
add option to save G92 on M500

8 years agoMerge pull request #909 from wolfmanjm/upstreamedge
Jim Morris [Tue, 12 Apr 2016 00:27:03 +0000 (17:27 -0700)]
Merge pull request #909 from wolfmanjm/upstreamedge

attempt to make M501 use less stack.

8 years agoattempt to make M501 use less stack.
Jim Morris [Tue, 12 Apr 2016 00:24:31 +0000 (17:24 -0700)]
attempt to make M501 use less stack.
  refactor to where and when it is processed, and make it use on_gcode event

8 years agoMerge pull request #906 from wolfmanjm/refactor/network-build
Jim Morris [Sun, 10 Apr 2016 21:53:08 +0000 (14:53 -0700)]
Merge pull request #906 from wolfmanjm/refactor/network-build

make plan9 optional build, not built by default use make PLAN9=1 to b…

8 years agomake plan9 optional build, not built by default use make PLAN9=1 to build it
Jim Morris [Sun, 10 Apr 2016 21:24:22 +0000 (14:24 -0700)]
make plan9 optional build, not built by default use make PLAN9=1 to build it
refactor Network to remove most of the statics

8 years agoMerge pull request #905 from wolfmanjm/upstreamedge
Jim Morris [Sun, 10 Apr 2016 18:55:27 +0000 (11:55 -0700)]
Merge pull request #905 from wolfmanjm/upstreamedge

remove test for probe height

8 years agoremove test for probe height being above bed in delta strategies
Jim Morris [Sun, 10 Apr 2016 18:53:47 +0000 (11:53 -0700)]
remove test for probe height being above bed in delta strategies

8 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 6 Apr 2016 05:44:01 +0000 (22:44 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

8 years agoMerge pull request #903 from Smoothieware/feature/fix-spindle-module-to-handle-Sxxxx
Jim Morris [Wed, 6 Apr 2016 05:43:07 +0000 (22:43 -0700)]
Merge pull request #903 from Smoothieware/feature/fix-spindle-module-to-handle-Sxxxx

handle S1000 on its own line in spindle module

8 years agoadded more info on probe failures
Jim Morris [Tue, 5 Apr 2016 23:13:28 +0000 (16:13 -0700)]
added more info on probe failures

8 years agohandle S1000 on its own line
Jim Morris [Tue, 5 Apr 2016 20:23:54 +0000 (13:23 -0700)]
handle S1000 on its own line

8 years agoMerge pull request #901 from wolfmanjm/upstreamedge
Jim Morris [Tue, 5 Apr 2016 20:11:34 +0000 (13:11 -0700)]
Merge pull request #901 from wolfmanjm/upstreamedge

Allow S1000 on a line by itself or in mutli gcode lines

8 years agoAllow S111 on a line by itself, it will return ok, but currently wil be ignored.
Jim Morris [Tue, 5 Apr 2016 20:08:34 +0000 (13:08 -0700)]
Allow S111 on a line by itself, it will return ok, but currently wil be ignored.
  TODO the spindle module should be updated to handle a received Snnn by itself

8 years agoprint header when delta grid is started
Jim Morris [Sun, 3 Apr 2016 08:25:17 +0000 (01:25 -0700)]
print header when delta grid is started

8 years agodisplay grid size for delta grid when probe starts
Jim Morris [Sat, 2 Apr 2016 20:45:25 +0000 (13:45 -0700)]
display grid size for delta grid when probe starts

8 years agoMerge pull request #899 from wolfmanjm/upstreamedge
Jim Morris [Thu, 31 Mar 2016 22:26:41 +0000 (15:26 -0700)]
Merge pull request #899 from wolfmanjm/upstreamedge

Fix jog screen to use WCS as well

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 agoMerge pull request #898 from wolfmanjm/upstreamedge
Jim Morris [Thu, 31 Mar 2016 21:35:40 +0000 (14:35 -0700)]
Merge pull request #898 from wolfmanjm/upstreamedge

make Panel display workspace coordiantes not machine coordinates

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