Jim Morris [Sat, 2 Jul 2016 21:03:15 +0000 (14:03 -0700)]
remove old bins
Jim Morris [Sat, 2 Jul 2016 21:02:35 +0000 (14:02 -0700)]
update firmeare.bin
Jim Morris [Fri, 1 Jul 2016 19:10:44 +0000 (12:10 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstream-master
Jim Morris [Tue, 28 Jun 2016 07:39:29 +0000 (00:39 -0700)]
Merge pull request #907 from lordofhyphens/deltagrid_cartesian
Permits cartesians to use delta-grid levelling strategy
Jim Morris [Mon, 27 Jun 2016 00:28:30 +0000 (17:28 -0700)]
update firmwre bin
Jim Morris [Mon, 27 Jun 2016 00:24:48 +0000 (17:24 -0700)]
update firmware
Jim Morris [Mon, 27 Jun 2016 00:23:47 +0000 (17:23 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstream-master
Conflicts:
FirmwareBin/firmware.bin
FirmwareBin/firmware.bin.md5sum
Jim Morris [Sun, 26 Jun 2016 20:45:18 +0000 (13:45 -0700)]
update firmware.bin
Arthur Wolf [Sun, 26 Jun 2016 20:23:22 +0000 (22:23 +0200)]
Merge pull request #782 from Smoothieware/runaway
Draft temperature runaway detection
Jim Morris [Fri, 24 Jun 2016 19:59:23 +0000 (12:59 -0700)]
Merge pull request #953 from Zaaphod/edge
Fix Homing when in G20
James Richters [Fri, 24 Jun 2016 18:46:20 +0000 (14:46 -0400)]
Update method
Remove G21 from in front of G53 as this is not valid. Turn off inch
mode directly.
James Richters [Fri, 24 Jun 2016 17:54:24 +0000 (13:54 -0400)]
Fix Homing when in G20
This is a bug fix when homing when in G20 mode. It was making the
final move in inches instead of mm. Homing should always bring you to
the same exact point whether you are in G20 or G21. See
https://github.com/Smoothieware/Smoothieware/issues/952
Jim Morris [Wed, 22 Jun 2016 07:39:50 +0000 (00:39 -0700)]
Merge pull request #949 from wolfmanjm/upstreamedge
add config sample for version 3 of the azteeg X5
Jim Morris [Wed, 22 Jun 2016 07:37:55 +0000 (00:37 -0700)]
add config sample for version 3 of the azteeg X5
Jim Morris [Tue, 21 Jun 2016 19:07:37 +0000 (12:07 -0700)]
Update TemperatureControl.h
optimize memory usage
Arthur Wolf [Tue, 21 Jun 2016 14:23:22 +0000 (16:23 +0200)]
removing runaway_timer and runaway_timeout as they do not seem useful
Jim Morris [Fri, 17 Jun 2016 20:16:38 +0000 (13:16 -0700)]
Update HowToFileIssues.md
Arthur Wolf [Fri, 17 Jun 2016 19:50:36 +0000 (21:50 +0200)]
Removed octoprint mention
Jim Morris [Thu, 16 Jun 2016 23:46:59 +0000 (16:46 -0700)]
Merge pull request #944 from Zaaphod/edge
Feature: Interpolate Arcs based on Maximum Error
Zaaphod [Thu, 16 Jun 2016 23:34:42 +0000 (19:34 -0400)]
Merge pull request #2 from Zaaphod/Update-Config---Change-Default
Update config change default
Zaaphod [Thu, 16 Jun 2016 23:32:39 +0000 (19:32 -0400)]
Merge pull request #1 from Zaaphod/remove-test-output
Remove test output
Zaaphod [Sun, 12 Jun 2016 18:00:20 +0000 (14:00 -0400)]
Change default
Change default for mm_per_arc_segment
Zaaphod [Sun, 12 Jun 2016 17:57:20 +0000 (13:57 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:55:38 +0000 (13:55 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:54:22 +0000 (13:54 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:53:14 +0000 (13:53 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:52:23 +0000 (13:52 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:51:33 +0000 (13:51 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Zaaphod [Sun, 12 Jun 2016 17:50:26 +0000 (13:50 -0400)]
Add mm_max_arc_error
Added mm_max_arc_error interpolation variable to sample config
Jim Morris [Fri, 10 Jun 2016 20:50:50 +0000 (13:50 -0700)]
update firmware.bin
Jim Morris [Fri, 10 Jun 2016 20:46:04 +0000 (13:46 -0700)]
Merge pull request #942 from wolfmanjm/upstreamedge
Fix resume so it uses G53 to restore position
Jim Morris [Fri, 10 Jun 2016 20:35:28 +0000 (13:35 -0700)]
Fix resume so it uses G53 to restore position
Fix the alpha_max_speed config setting so it is in mm/min not mm/sec (reverting bug introduced by PR #759
Jim Morris [Thu, 9 Jun 2016 18:37:39 +0000 (11:37 -0700)]
Update README.creole
Zaaphod [Thu, 9 Jun 2016 16:41:51 +0000 (12:41 -0400)]
Update Robot.cpp
Zaaphod [Thu, 9 Jun 2016 14:42:26 +0000 (10:42 -0400)]
disable test output
Comment out test output
Zaaphod [Thu, 9 Jun 2016 14:32:01 +0000 (10:32 -0400)]
Minor change
Jim Morris [Thu, 9 Jun 2016 08:12:18 +0000 (01:12 -0700)]
Update HowToFileIssues.md
Jim Morris [Thu, 9 Jun 2016 08:10:37 +0000 (01:10 -0700)]
Merge pull request #941 from wolfmanjm/upstreamedge
how to file issues document
Jim Morris [Thu, 9 Jun 2016 08:09:11 +0000 (01:09 -0700)]
how to file issues document
Zaaphod [Wed, 8 Jun 2016 21:23:03 +0000 (17:23 -0400)]
bug fix, changes with arc error, test output
Fixed a bug on line 185 so mm_max_arc_error now is correctly read in from config file
Changed line 1025 so setting mm_max_arc_error = 0 will disable the new calculation.
Setting mm_per_arc_segment = 0 will run only new calculation
setting both will use whichever value is larger
changed formula on line 1032 to more accurately divide segments. This prevents the error from ever being greater than the specified arc error. It is taking into account the start point that the original formula was ignoring.
added a printf to output relevant data to serial port for calculation verification testing purposes only
Arthur Wolf [Mon, 6 Jun 2016 07:04:51 +0000 (09:04 +0200)]
Merge pull request #933 from Smoothieware/edge
Mergin edge into runaway, mostly so travis starts working again.
Rene Aguirre [Fri, 3 Jun 2016 02:57:07 +0000 (19:57 -0700)]
[gcode] Limit arg segments by max arc error
Refer to issue 927.
Arc segments are limited by new mm_max_arc_error configuration.
The limit on generated segments is kept by existing mm_per_arc_segment.
Jim Morris [Wed, 1 Jun 2016 23:09:19 +0000 (16:09 -0700)]
update firmware.bin
Jim Morris [Wed, 1 Jun 2016 20:29:13 +0000 (13:29 -0700)]
Merge pull request #935 from wolfmanjm/upstreamedge
Attempt to fix the USB serial output stall
Jim Morris [Wed, 1 Jun 2016 20:14:17 +0000 (13:14 -0700)]
Attempt to fix the USB serial output stall
Jim Morris [Tue, 31 May 2016 21:30:35 +0000 (14:30 -0700)]
Update .gitignore
Jim Morris [Mon, 30 May 2016 23:00:15 +0000 (16:00 -0700)]
Merge pull request #934 from wolfmanjm/upstreamedge
make the cnc test circle use G2
Jim Morris [Mon, 30 May 2016 22:58:48 +0000 (15:58 -0700)]
make the cnc test circle use G2
fix float ops for G2/G3
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
Arthur Wolf [Wed, 25 May 2016 14:34:10 +0000 (16:34 +0200)]
made temperature runaway options configurable
Arthur Wolf [Wed, 25 May 2016 14:21:36 +0000 (16:21 +0200)]
added the enum as wolfmanjm asked for the state, and added the heating timeout
Arthur Wolf [Mon, 23 May 2016 21:08:44 +0000 (23:08 +0200)]
added check so that we dont re-enter halt
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
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]