clinton/Smoothieware.git
7 years agoadd more info for M211 origin/feature/soft-endstops
Jim Morris [Mon, 27 Mar 2017 02:39:01 +0000 (19:39 -0700)]
add more info for M211

7 years agoadded some comments about how one would do clipping against boundaries.
Jim Morris [Fri, 24 Mar 2017 05:32:48 +0000 (22:32 -0700)]
added some comments about how one would do clipping against boundaries.

7 years agoM211 will report soft endstop status and whether axis are not homed (in which case...
Jim Morris [Thu, 23 Mar 2017 23:30:47 +0000 (16:30 -0700)]
M211 will report soft endstop status and whether axis are not homed (in which case soft endstops for that axis are ignored)

7 years agoInitial simple endstops..
Jim Morris [Wed, 22 Mar 2017 17:55:36 +0000 (10:55 -0700)]
Initial simple endstops..
  include ConfigSamples/Snippets/soft-endstops.config
  1. select halt (othewise it ignores bad move)
  2. set the soft-endstop.x_min, x_max, y_min, y_max, z_min, z_max
  3. comment out to disable checks on that axis
  4. axis must be homed before soft endstops will be checked
  5. M211 S0 turns soft endstops off, M211 S1 turns them on again.

7 years agoadded sample TMC26X spresadcycle setting
Jim Morris [Tue, 21 Mar 2017 19:23:37 +0000 (12:23 -0700)]
added sample TMC26X spresadcycle setting

7 years agofix reported block size from mem command
Jim Morris [Sun, 19 Mar 2017 04:47:34 +0000 (21:47 -0700)]
fix reported block size from mem command

7 years agofix bug in setting jog feed rate from panel (cnc mode)
Jim Morris [Sat, 18 Mar 2017 20:45:13 +0000 (13:45 -0700)]
fix bug in setting jog feed rate from panel (cnc mode)

7 years agocap current sent to i2c to 255
Jim Morris [Sat, 18 Mar 2017 20:36:53 +0000 (13:36 -0700)]
cap current sent to i2c to 255

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 13 Mar 2017 19:42:17 +0000 (12:42 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoMerge pull request #1124 from vbolshakov/edge
Jim Morris [Mon, 13 Mar 2017 19:41:14 +0000 (12:41 -0700)]
Merge pull request #1124 from vbolshakov/edge

Configure grid size on the fly with I J params of G31/G32

7 years agomake M911.x more robust in advanced motor driver
Jim Morris [Sun, 12 Mar 2017 02:01:44 +0000 (18:01 -0800)]
make M911.x more robust in advanced motor driver

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 8 Mar 2017 23:24:10 +0000 (15:24 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoMerge pull request #1145 from Fulg/PT100-E3D
Jim Morris [Wed, 8 Mar 2017 22:50:21 +0000 (14:50 -0800)]
Merge pull request #1145 from Fulg/PT100-E3D

Added support for PT100 using E3D amplifier.

7 years agoAdded support for PT100 using E3D amplifier.
Benoit Miller [Wed, 8 Mar 2017 22:12:43 +0000 (17:12 -0500)]
Added support for PT100 using E3D amplifier.

7 years agoincrease extruder position DP to 4
Jim Morris [Wed, 8 Mar 2017 21:24:03 +0000 (13:24 -0800)]
increase extruder position DP to 4

7 years agoRever I/J omitting handling logic
Victor Bolshakov [Sat, 4 Mar 2017 23:35:56 +0000 (02:35 +0300)]
Rever I/J omitting handling logic

7 years agoSeparate local and global variables
Victor Bolshakov [Sat, 4 Mar 2017 19:25:03 +0000 (22:25 +0300)]
Separate local and global variables

7 years agoDocumetation correction
Victor Bolshakov [Sat, 4 Mar 2017 15:10:10 +0000 (18:10 +0300)]
Documetation correction

7 years agoI and J optional. If only one provided it will use it as value for second.
Victor Bolshakov [Sat, 4 Mar 2017 09:14:23 +0000 (12:14 +0300)]
I and J optional. If only one provided it will use it as value for second.

7 years agoMerge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
Victor Bolshakov [Sat, 4 Mar 2017 08:13:40 +0000 (11:13 +0300)]
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge

7 years agoMerge pull request #1143 from wolfmanjm/upstreamedge
Jim Morris [Thu, 2 Mar 2017 20:11:33 +0000 (12:11 -0800)]
Merge pull request #1143 from wolfmanjm/upstreamedge

fix initial Z used for G98 drilling cycle

7 years agofix initial Z used for G98 drilling cycle
Jim Morris [Thu, 2 Mar 2017 20:10:43 +0000 (12:10 -0800)]
fix initial Z used for G98 drilling cycle

7 years agoMerge pull request #1140 from wolfmanjm/upstreamedge
Jim Morris [Wed, 1 Mar 2017 06:11:05 +0000 (22:11 -0800)]
Merge pull request #1140 from wolfmanjm/upstreamedge

release the include directive if found in config

7 years agorelease the include directive if found in config
Jim Morris [Wed, 1 Mar 2017 06:09:02 +0000 (22:09 -0800)]
release the include directive if found in config

7 years agoMerge pull request #1139 from wolfmanjm/upstreamedge
Jim Morris [Wed, 1 Mar 2017 05:51:17 +0000 (21:51 -0800)]
Merge pull request #1139 from wolfmanjm/upstreamedge

free up old config value when a duplicate is found.

7 years agofree up old config value when a duplicate is found.
Jim Morris [Wed, 1 Mar 2017 05:49:01 +0000 (21:49 -0800)]
free up old config value when a duplicate is found.

7 years agoMerge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
Victor Bolshakov [Sat, 25 Feb 2017 09:04:36 +0000 (12:04 +0300)]
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge

7 years agoMerge pull request #1137 from wolfmanjm/upstreamedge
Jim Morris [Fri, 24 Feb 2017 22:18:47 +0000 (14:18 -0800)]
Merge pull request #1137 from wolfmanjm/upstreamedge

fix null ptr deref in config porcessing

7 years agofix null ptr deref in config porcessing
Jim Morris [Fri, 24 Feb 2017 22:17:46 +0000 (14:17 -0800)]
fix null ptr deref in config porcessing

7 years agoMerge pull request #1134 from wolfmanjm/upstreamedge
Jim Morris [Wed, 22 Feb 2017 21:28:11 +0000 (13:28 -0800)]
Merge pull request #1134 from wolfmanjm/upstreamedge

Revert "Fix edge case where acceleration is too high for stepticker"

7 years agoRevert "Fix edge case where accleration is too high for stepticker"
Jim Morris [Wed, 22 Feb 2017 21:26:37 +0000 (13:26 -0800)]
Revert "Fix edge case where accleration is too high for stepticker"

This reverts commit 3d2dd8f9485ed642f8809e678366b242aa1fd7df.

7 years agoMerge pull request #1133 from wolfmanjm/upstreamedge
Jim Morris [Tue, 21 Feb 2017 23:51:30 +0000 (15:51 -0800)]
Merge pull request #1133 from wolfmanjm/upstreamedge

Fix edge case where acceleration is too high for stepticker

7 years agoFix edge case where accleration is too high for stepticker
Jim Morris [Tue, 21 Feb 2017 23:49:02 +0000 (15:49 -0800)]
Fix edge case where accleration is too high for stepticker
 - fixes the G1 X1 F1 issue

7 years agoRevert DEBUG format once again
Victor Bolshakov [Tue, 21 Feb 2017 19:29:53 +0000 (22:29 +0300)]
Revert DEBUG format once again

7 years agoAdded human redable format of current grid display
Victor Bolshakov [Tue, 21 Feb 2017 17:53:16 +0000 (20:53 +0300)]
Added human redable format of current grid display

7 years agoAdded leveling region definition using start point and x and y size
Victor Bolshakov [Tue, 21 Feb 2017 17:47:44 +0000 (20:47 +0300)]
Added leveling region definition using start point and x and y size

7 years agoMerge pull request #1132 from wolfmanjm/upstreamedge
Jim Morris [Tue, 21 Feb 2017 05:09:59 +0000 (21:09 -0800)]
Merge pull request #1132 from wolfmanjm/upstreamedge

revert c10aa2c8c4e34fd77734da623d4022e680856760

7 years agorevert c10aa2c8c4e34fd77734da623d4022e680856760
Jim Morris [Tue, 21 Feb 2017 05:08:35 +0000 (21:08 -0800)]
revert c10aa2c8c4e34fd77734da623d4022e680856760

7 years agoUpdate PULL_REQUEST_TEMPLATE.md
Jim Morris [Tue, 21 Feb 2017 02:19:41 +0000 (18:19 -0800)]
Update PULL_REQUEST_TEMPLATE.md

7 years agoMerge pull request #1131 from wolfmanjm/upstreamedge
Jim Morris [Tue, 21 Feb 2017 02:10:01 +0000 (18:10 -0800)]
Merge pull request #1131 from wolfmanjm/upstreamedge

Fix a bug where very slow feedrates could cause the step rate to be less than the stepticker period.

7 years agoFix a bug where very slow feedrates could cause the step rate to be less than the...
Jim Morris [Tue, 21 Feb 2017 02:05:46 +0000 (18:05 -0800)]
Fix a bug where very slow feedrates could cause the step rate to be less than the stepticker period.
  Potential fix used here is to make sure that the minimum ticks for acceleration is 1. Not sure if that may have consequences.
  This showed up as a problem doing G1 X1 F1 where it would step at high rates and finish immediately

7 years agoremove block debug
Jim Morris [Tue, 21 Feb 2017 00:30:32 +0000 (16:30 -0800)]
remove block debug

7 years agoadd some more block debugging
Jim Morris [Mon, 20 Feb 2017 23:36:43 +0000 (15:36 -0800)]
add some more block debugging

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 20 Feb 2017 22:32:20 +0000 (14:32 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoAllow larger strings for M114 and get pos
Jim Morris [Mon, 20 Feb 2017 22:31:25 +0000 (14:31 -0800)]
Allow larger strings for M114 and get pos
check for sane values of number of axis

7 years agoMerge pull request #1129 from wolfmanjm/upstreamedge
Jim Morris [Mon, 20 Feb 2017 21:41:47 +0000 (13:41 -0800)]
Merge pull request #1129 from wolfmanjm/upstreamedge

make default for get_axis size 3 not n_primary_axis

7 years agomake default for get_axis size 3 not n_primary_axis
Jim Morris [Mon, 20 Feb 2017 21:07:31 +0000 (13:07 -0800)]
make default for get_axis size 3 not n_primary_axis

7 years agoMerge branch 'edge' of https://github.com/vbolshakov/Smoothieware; branch 'edge'...
Victor Bolshakov [Mon, 20 Feb 2017 13:54:03 +0000 (16:54 +0300)]
Merge branch 'edge' of https://github.com/vbolshakov/Smoothieware; branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge

7 years agoRevert back coordinates format in DEBUG messages
Victor Bolshakov [Mon, 20 Feb 2017 13:46:50 +0000 (16:46 +0300)]
Revert back coordinates format in DEBUG messages

7 years agoStart probing from (0;0) by removing navigation to bottom right corner left from...
Victor Bolshakov [Sat, 18 Feb 2017 13:34:19 +0000 (16:34 +0300)]
Start probing from (0;0) by removing navigation to bottom right corner left from DeltaGrid

7 years agoWor If current grid size NxM less or equal to configured.
Victor Bolshakov [Fri, 17 Feb 2017 08:02:24 +0000 (11:02 +0300)]
Wor If current grid size NxM less or equal to configured.

7 years agoMerge pull request #1125 from Smoothieware/code-of-conduct
Arthur Wolf [Thu, 16 Feb 2017 13:59:02 +0000 (14:59 +0100)]
Merge pull request #1125 from Smoothieware/code-of-conduct

Stating the obvious : creating a code of conduct.

7 years agoStating the obvious : creating a code of conduct. origin/code-of-conduct
Arthur Wolf [Wed, 15 Feb 2017 22:44:47 +0000 (23:44 +0100)]
Stating the obvious : creating a code of conduct.

This is something that can be pointed at when people cross the line as happens sometimes. It might be useful to *some* people for who this isn't obvious, though I doubt it.

7 years agoTypos fixed
Victor Bolshakov [Wed, 15 Feb 2017 18:29:10 +0000 (21:29 +0300)]
Typos fixed

7 years agorevert .gitignore
Victor Bolshakov [Wed, 15 Feb 2017 17:55:38 +0000 (20:55 +0300)]
revert .gitignore

7 years agoCompact grid sizes into struct
Victor Bolshakov [Wed, 15 Feb 2017 10:33:55 +0000 (13:33 +0300)]
Compact grid sizes into struct

7 years agoG28 default grid size from configuration. Error messages for bigger that configured...
Victor Bolshakov [Wed, 15 Feb 2017 10:25:45 +0000 (13:25 +0300)]
G28 default grid size from configuration. Error messages for bigger that configured grid sizes.

7 years agoFix save and load to/from file
Victor Bolshakov [Tue, 14 Feb 2017 19:39:03 +0000 (22:39 +0300)]
Fix save and load to/from file

7 years agoCompatibility fix
Victor Bolshakov [Tue, 14 Feb 2017 19:17:52 +0000 (22:17 +0300)]
Compatibility fix

7 years agoGrid size on the fly
Victor Bolshakov [Tue, 14 Feb 2017 10:18:32 +0000 (13:18 +0300)]
Grid size on the fly

7 years agoGrid size on the fly
Victor Bolshakov [Tue, 14 Feb 2017 10:15:25 +0000 (13:15 +0300)]
Grid size on the fly

7 years agoMerge pull request #1123 from wolfmanjm/upstreamedge
Jim Morris [Mon, 13 Feb 2017 23:06:17 +0000 (15:06 -0800)]
Merge pull request #1123 from wolfmanjm/upstreamedge

allow rectangular grid to use G32 as well as G31

7 years agoallow rectangular grid to use G32 as well as G31
Jim Morris [Mon, 13 Feb 2017 23:05:20 +0000 (15:05 -0800)]
allow rectangular grid to use G32 as well as G31

7 years agoUpdate CartGridStrategy.cpp
Jim Morris [Sat, 11 Feb 2017 18:44:40 +0000 (10:44 -0800)]
Update CartGridStrategy.cpp

7 years agoMerge pull request #1121 from wolfmanjm/upstreamedge
Jim Morris [Sat, 11 Feb 2017 18:43:06 +0000 (10:43 -0800)]
Merge pull request #1121 from wolfmanjm/upstreamedge

remove extrapolation

7 years agoremove unused rotuiens in cart grid
Jim Morris [Sat, 11 Feb 2017 18:41:24 +0000 (10:41 -0800)]
remove unused rotuiens in cart grid

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 11 Feb 2017 18:39:35 +0000 (10:39 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoremove uneeded routine in cart grid
Jim Morris [Sat, 11 Feb 2017 18:39:08 +0000 (10:39 -0800)]
remove uneeded routine in cart grid

7 years agoMerge pull request #1120 from lordofhyphens/cart-grid
Jim Morris [Sat, 11 Feb 2017 18:38:26 +0000 (10:38 -0800)]
Merge pull request #1120 from lordofhyphens/cart-grid

Fix compensation to work over entire positive X,Y

7 years agoCalculate the compensation grid over +X and +Y only (lower-left 0,0), instead of...
Joseph Lenox [Sat, 11 Feb 2017 18:33:13 +0000 (12:33 -0600)]
Calculate the compensation grid over +X and +Y only (lower-left 0,0), instead of centered 0,0.

7 years agoMerge pull request #1118 from wolfmanjm/upstreamedge
Jim Morris [Fri, 10 Feb 2017 07:40:37 +0000 (23:40 -0800)]
Merge pull request #1118 from wolfmanjm/upstreamedge

remove is_square from delta grid, but return a deprecated error inste…

7 years agoremove is_square from delta grid, but return a deprecated error instead for now
Jim Morris [Fri, 10 Feb 2017 07:38:41 +0000 (23:38 -0800)]
remove is_square from delta grid, but return a deprecated error instead for now

7 years agoMerge pull request #1117 from Smoothieware/cart-grid
Jim Morris [Fri, 10 Feb 2017 07:15:51 +0000 (23:15 -0800)]
Merge pull request #1117 from Smoothieware/cart-grid

rectangular z grid probe

7 years agochange width length to x_size, y_size
Jim Morris [Fri, 10 Feb 2017 07:11:02 +0000 (23:11 -0800)]
change width length to x_size, y_size

7 years agofix some stuff modify other stuff
Jim Morris [Fri, 10 Feb 2017 07:05:41 +0000 (23:05 -0800)]
fix some stuff modify other stuff

7 years agoMerge branch 'cart-grid' of git://github.com/lordofhyphens/Smoothieware into cart...
Jim Morris [Fri, 10 Feb 2017 06:48:36 +0000 (22:48 -0800)]
Merge branch 'cart-grid' of git://github.com/lordofhyphens/Smoothieware into cart-grid

7 years agoFixed descriptive text.
Joseph Lenox [Fri, 10 Feb 2017 06:27:25 +0000 (00:27 -0600)]
Fixed descriptive text.

7 years agoInitial commit for cart-grid, or cartesian-grid.
Joseph Lenox [Fri, 10 Feb 2017 05:06:55 +0000 (23:06 -0600)]
Initial commit for cart-grid, or cartesian-grid.
Assumes that 0,0 is in the corner.

7 years agoMerge pull request #1114 from wolfmanjm/upstreamedge
Jim Morris [Wed, 8 Feb 2017 22:06:15 +0000 (14:06 -0800)]
Merge pull request #1114 from wolfmanjm/upstreamedge

fix switch momentary/toggle config setting

7 years agofix switch momentary/toggle config setting
Jim Morris [Wed, 8 Feb 2017 22:04:32 +0000 (14:04 -0800)]
fix switch momentary/toggle config setting

7 years agoupdate firmware.bin
Jim Morris [Wed, 8 Feb 2017 06:14:34 +0000 (22:14 -0800)]
update firmware.bin

7 years agoMerge pull request #1111 from wolfmanjm/upstreamedge
Jim Morris [Wed, 8 Feb 2017 05:49:17 +0000 (21:49 -0800)]
Merge pull request #1111 from wolfmanjm/upstreamedge

fix config entries for delta grid

7 years agofix config entries for delta grid
Jim Morris [Wed, 8 Feb 2017 05:48:29 +0000 (21:48 -0800)]
fix config entries for delta grid

7 years agoMerge pull request #1110 from wolfmanjm/upstreamedge
Jim Morris [Wed, 8 Feb 2017 05:40:49 +0000 (21:40 -0800)]
Merge pull request #1110 from wolfmanjm/upstreamedge

fix zprobe to detect if config of LS failed.

7 years agofix zprobe to deteect of config of LS failed.
Jim Morris [Wed, 8 Feb 2017 05:39:25 +0000 (21:39 -0800)]
fix zprobe to deteect of config of LS failed.

7 years agoMerge pull request #1109 from wolfmanjm/upstreamedge
Jim Morris [Wed, 8 Feb 2017 04:15:27 +0000 (20:15 -0800)]
Merge pull request #1109 from wolfmanjm/upstreamedge

when is_square is set return error if dimensions changed between conf…

7 years agowhen is_square is set return error if dimensions changed between config and saved...
Jim Morris [Wed, 8 Feb 2017 04:14:12 +0000 (20:14 -0800)]
when is_square is set return error if dimensions changed between config and saved grid

7 years agoMerge pull request #1108 from wolfmanjm/upstreamedge
Jim Morris [Wed, 8 Feb 2017 03:16:57 +0000 (19:16 -0800)]
Merge pull request #1108 from wolfmanjm/upstreamedge

Clean up is_square config handling for delta grid

7 years agoClean up is_square config handling for delta grid
Jim Morris [Wed, 8 Feb 2017 03:14:49 +0000 (19:14 -0800)]
Clean up is_square config handling for delta grid
  max_x and max_y MUST be defined now when is_square is set

7 years agoMerge pull request #1107 from lordofhyphens/fix-delta-radius
Jim Morris [Wed, 8 Feb 2017 02:23:11 +0000 (18:23 -0800)]
Merge pull request #1107 from lordofhyphens/fix-delta-radius

Set delta_grid when using is_square to be the half diagonal of square

7 years agoRedefine delta_grid when using is_square to be the half diagonal of the square define...
Joseph Lenox [Wed, 8 Feb 2017 02:10:54 +0000 (20:10 -0600)]
Redefine delta_grid when using is_square to be the half diagonal of the square defined by the larger of x_max or y_max.

7 years agoMerge pull request #1100 from wolfmanjm/upstreamedge
Jim Morris [Tue, 24 Jan 2017 05:27:32 +0000 (21:27 -0800)]
Merge pull request #1100 from wolfmanjm/upstreamedge

fix typo

7 years agofix type
Jim Morris [Tue, 24 Jan 2017 05:26:45 +0000 (21:26 -0800)]
fix type

7 years agoMerge pull request #1099 from wolfmanjm/upstreamedge
Jim Morris [Tue, 24 Jan 2017 04:37:33 +0000 (20:37 -0800)]
Merge pull request #1099 from wolfmanjm/upstreamedge

fast-stream.py handle target being in halt state

7 years agohandle target being in halt state
Jim Morris [Tue, 24 Jan 2017 04:35:34 +0000 (20:35 -0800)]
handle target being in halt state

7 years agocheck for halt condition
Jim Morris [Tue, 24 Jan 2017 04:29:58 +0000 (20:29 -0800)]
check for halt condition

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 22 Jan 2017 05:35:23 +0000 (21:35 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

Conflicts:
fast-stream.py

7 years agoCreate fast-stream.py
Jim Morris [Sun, 22 Jan 2017 05:31:29 +0000 (21:31 -0800)]
Create fast-stream.py

example of how to fast stream over USB serial to smoothie

7 years agoadded example script of fast stream over USB
Jim Morris [Sun, 22 Jan 2017 05:28:58 +0000 (21:28 -0800)]
added example script of fast stream over USB

7 years agoUpdating laser config to the latest format in delta config
Arthur Wolf [Thu, 19 Jan 2017 15:14:26 +0000 (16:14 +0100)]
Updating laser config to the latest format in delta config