Arthur Wolf [Tue, 31 May 2016 12:59:33 +0000 (14:59 +0200)]
verbose playing now works correctly in recursive mode
Arthur Wolf [Tue, 31 May 2016 12:38:44 +0000 (14:38 +0200)]
basic recursion works, still likely very buggy
Arthur Wolf [Mon, 30 May 2016 21:31:45 +0000 (23:31 +0200)]
added basic recursion skeleton, compiles, but not tested, and likely wont handle many things like resuming etc
Arthur Wolf [Mon, 30 May 2016 18:57:24 +0000 (20:57 +0200)]
file existence check was inverted, resulting in a crash when trying to open on_boot.gcode
Arthur Wolf [Sun, 29 May 2016 21:54:53 +0000 (23:54 +0200)]
simplified the module a bit, compiles but does not execute
Jim Morris [Sat, 28 May 2016 20:54:13 +0000 (13:54 -0700)]
Update Readme.md
Jim Morris [Sat, 28 May 2016 20:50:27 +0000 (13:50 -0700)]
add cnc build
Jim Morris [Sat, 28 May 2016 20:39:43 +0000 (13:39 -0700)]
Update .travis.yml
Jim Morris [Sat, 28 May 2016 20:37:42 +0000 (13:37 -0700)]
Update .travis.yml
Jim Morris [Sat, 28 May 2016 20:27:54 +0000 (13:27 -0700)]
Merge pull request #921 from wolfmanjm/feature/cnc-pendant-panel
Feature/cnc pendant panel
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
Jim Morris [Wed, 18 May 2016 22:37:40 +0000 (15:37 -0700)]
fix reset pin for st7565
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
Jim Morris [Wed, 18 May 2016 22:28:50 +0000 (15:28 -0700)]
Fix drillign cycles to use WCS
Arthur Wolf [Mon, 16 May 2016 18:31:35 +0000 (20:31 +0200)]
Adding license information
Arthur Wolf [Sun, 15 May 2016 07:22:49 +0000 (09:22 +0200)]
Added a bit of contribution information to the readme
Jim Morris [Fri, 13 May 2016 23:02:00 +0000 (16:02 -0700)]
print out CNC build if a CNC build
Jim Morris [Fri, 13 May 2016 22:58:55 +0000 (15:58 -0700)]
define -DCNC if a CNC build
Jim Morris [Wed, 11 May 2016 03:06:20 +0000 (20:06 -0700)]
only build the new test command for a cnc build (although they may be usefulk for 3d printers u=it uses a lot more flash).
Jim Morris [Wed, 11 May 2016 02:58:20 +0000 (19:58 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/cnc-pendant-panel
Jim Morris [Mon, 9 May 2016 03:11:02 +0000 (20:11 -0700)]
fix the actualy feedrate display on panel for cnc pendant
Jim Morris [Sun, 8 May 2016 23:44:42 +0000 (16:44 -0700)]
display in CNC pendant the requested feedrate and the actual nominal feedrate of current block.
Jim Morris [Sat, 7 May 2016 20:59:07 +0000 (13:59 -0700)]
fix abort when probing from panel in cnc mode
Jim Morris [Sat, 7 May 2016 20:46:18 +0000 (13:46 -0700)]
add workspace coordinate selection screen for cnc panel
fix probing screen
Jim Morris [Fri, 6 May 2016 08:25:47 +0000 (01:25 -0700)]
show 3dp for jog increment
Jim Morris [Fri, 6 May 2016 00:05:18 +0000 (17:05 -0700)]
add inches and millimeter settings to prepare menu for cnc
rename watch screen to DRO on main menu for CNC
Jim Morris [Thu, 5 May 2016 20:58:26 +0000 (13:58 -0700)]
Add more probing entries for CNC
Add more prepare options for CNC (spindle on etc)
Jim Morris [Thu, 5 May 2016 07:47:35 +0000 (00:47 -0700)]
make sure the WCS settings are handled correctly in inch mode, report in inches if in inch mode
Jim Morris [Thu, 5 May 2016 07:30:42 +0000 (00:30 -0700)]
Indicate if in inch or mm mode in watch screen
make sure jog feedrate is converted to inch mode if in inch mode
add touch off X Y Z to prepare menu (sets current WCS)
Jim Morris [Thu, 5 May 2016 07:14:19 +0000 (00:14 -0700)]
make sure panel jogs are in absolute mode
add another finer jog setting
Jim Morris [Wed, 4 May 2016 21:18:22 +0000 (14:18 -0700)]
rename to MPG mode
Jim Morris [Sat, 30 Apr 2016 19:41:07 +0000 (12:41 -0700)]
refactor screens to avoid duplication
add settable jog feedrates screen
Jim Morris [Sat, 30 Apr 2016 05:27:45 +0000 (22:27 -0700)]
add multiplier selection for encoder jog
Jim Morris [Sat, 30 Apr 2016 04:38:13 +0000 (21:38 -0700)]
Merge branch 'upstreamedge' into test/encoder-direct-step
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
Jim Morris [Fri, 29 Apr 2016 22:37:56 +0000 (15:37 -0700)]
add designator to motordriver messages
Jim Morris [Fri, 29 Apr 2016 20:57:49 +0000 (13:57 -0700)]
add feed hold to status
Jim Morris [Wed, 27 Apr 2016 01:05:27 +0000 (18:05 -0700)]
get direct step running from encoder
Jim Morris [Tue, 26 Apr 2016 07:07:40 +0000 (00:07 -0700)]
flush rx buffer on control X (probably should also do it on kill button)
rename some prepare menu items
Jim Morris [Mon, 25 Apr 2016 06:28:18 +0000 (23:28 -0700)]
Attempt to correct last milestone after an ON_HALT if queue was not empty.
Jim Morris [Sun, 24 Apr 2016 21:17:52 +0000 (14:17 -0700)]
allow for a default_excludes.mk file in src that will be used for the excluded midules but is not checked into git
Jim Morris [Sun, 24 Apr 2016 08:48:18 +0000 (01:48 -0700)]
Make a CNC based watchscreen for panel, shows WCS and MCS
(fix simpleshell accessing temp control if it is excluded)
Jim Morris [Sun, 24 Apr 2016 00:07:04 +0000 (17:07 -0700)]
refactor panel screens into 3dprinter and cnc
exclude cnc screens on regular build include when make CNC=1
Jim Morris [Fri, 22 Apr 2016 22:53:46 +0000 (15:53 -0700)]
update firmware.bin
Jim Morris [Fri, 22 Apr 2016 22:37:01 +0000 (15:37 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/cnc-pendant-panel
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…
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
Jim Morris [Fri, 22 Apr 2016 00:37:07 +0000 (17:37 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/cnc-pendant-panel
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
Jim Morris [Thu, 21 Apr 2016 08:18:41 +0000 (01:18 -0700)]
remove on_gcode_execute from Stepper
Jim Morris [Thu, 21 Apr 2016 07:48:15 +0000 (00:48 -0700)]
fix the test circle.
make it draw around the current position
Jim Morris [Tue, 19 Apr 2016 22:00:33 +0000 (15:00 -0700)]
Add some feedback on the test commands progress
Jim Morris [Tue, 19 Apr 2016 09:08:24 +0000 (02:08 -0700)]
added test circle radius segments iterations [speed]
Jim Morris [Tue, 19 Apr 2016 08:44:29 +0000 (01:44 -0700)]
add test patterns for testing actuator movements
test jog X 10 20 300 - will jog back and forth in the X axis for 10mm 20 times at a feedrate of 300
test square 10 20 300 - will draw a square of 10mm 20 times at a feedrate of 300
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
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
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
Sébastien Mischler (aka skarab) [Mon, 18 Apr 2016 08:47:29 +0000 (10:47 +0200)]
remove unused strings and useless shtml extension
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)
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/
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/
Sébastien Mischler (aka skarab) [Sun, 17 Apr 2016 11:00:06 +0000 (13:00 +0200)]
set "Access-Control-Allow-Origin" in all headers
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
Jim Morris [Sat, 16 Apr 2016 22:29:44 +0000 (15:29 -0700)]
add option to save G92 on M500
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.
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
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…
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
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
Jim Morris [Sun, 10 Apr 2016 18:53:47 +0000 (11:53 -0700)]
remove test for probe height being above bed in delta strategies
Jim Morris [Wed, 6 Apr 2016 05:44:01 +0000 (22:44 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
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
Jim Morris [Tue, 5 Apr 2016 23:13:28 +0000 (16:13 -0700)]
added more info on probe failures
Jim Morris [Tue, 5 Apr 2016 20:23:54 +0000 (13:23 -0700)]
handle S1000 on its own line
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
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
Jim Morris [Sun, 3 Apr 2016 08:25:17 +0000 (01:25 -0700)]
print header when delta grid is started
Jim Morris [Sat, 2 Apr 2016 20:45:25 +0000 (13:45 -0700)]
display grid size for delta grid when probe starts
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
Jim Morris [Thu, 31 Mar 2016 22:24:43 +0000 (15:24 -0700)]
Fix jog screen to use WCS as well
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
Jim Morris [Thu, 31 Mar 2016 21:33:29 +0000 (14:33 -0700)]
make Panel display workspace coordiantes not machine coordinates
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
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
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
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.
Jim Morris [Wed, 30 Mar 2016 05:02:22 +0000 (22:02 -0700)]
update comments for M114
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
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.
Jim Morris [Tue, 29 Mar 2016 01:50:33 +0000 (18:50 -0700)]
change ERROR return to Error as that is what pronterface expects
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
Jim Morris [Mon, 28 Mar 2016 05:47:40 +0000 (22:47 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
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.
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
Jim Morris [Tue, 22 Mar 2016 19:53:27 +0000 (12:53 -0700)]
Allow float values for switch S parameter
Jim Morris [Tue, 22 Mar 2016 02:24:04 +0000 (19:24 -0700)]
Merge pull request #881 from wolfmanjm/upstreamedge
add 'get status' command
Jim Morris [Tue, 22 Mar 2016 02:23:04 +0000 (19:23 -0700)]
add get status command
Jim Morris [Sun, 20 Mar 2016 19:03:36 +0000 (12:03 -0700)]
protect against null stream
Jim Morris [Sun, 20 Mar 2016 18:52:15 +0000 (11:52 -0700)]
update firmware.bin
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)