clinton/Smoothieware.git
7 years agoupdate firmware.bin
Jim Morris [Mon, 24 Apr 2017 18:47:51 +0000 (11:47 -0700)]
update firmware.bin

7 years agoMerge pull request #1176 from wolfmanjm/upstreamedge
Jim Morris [Sun, 23 Apr 2017 07:46:28 +0000 (00:46 -0700)]
Merge pull request #1176 from wolfmanjm/upstreamedge

allow get pos command to show A axis for E1 and B for E2

7 years agoRevert "FIx issue where a single temperature control with multiple extruders needs...
Jim Morris [Sun, 23 Apr 2017 07:44:30 +0000 (00:44 -0700)]
Revert "FIx issue where a single temperature control with multiple extruders needs to have tool 0 selected."

This reverts commit 1c9a010d073fe74288c035c790a03d296af15ad9.

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 23 Apr 2017 07:44:01 +0000 (00:44 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoallow get pos to show A axis for E1 and B for E2, M114 still shows E instead
Jim Morris [Sun, 23 Apr 2017 07:43:10 +0000 (00:43 -0700)]
allow get pos to show A axis for E1 and B for E2, M114 still shows E instead

7 years agoFIx issue where a single temperature control with multiple extruders needs to have...
Jim Morris [Wed, 19 Apr 2017 09:09:20 +0000 (02:09 -0700)]
FIx issue where a single temperature control with multiple extruders needs to have tool 0 selected.
Now temp setting will always work regardless of which extruder is set.

7 years agoMerge pull request #1172 from wolfmanjm/upstreamedge
Jim Morris [Mon, 17 Apr 2017 23:28:08 +0000 (16:28 -0700)]
Merge pull request #1172 from wolfmanjm/upstreamedge

Make the test moves not wait for idle between iterations

7 years agoMake the etst pmoves not wait for idle between iterations, makes it smoother.
Jim Morris [Mon, 17 Apr 2017 23:25:38 +0000 (16:25 -0700)]
Make the etst pmoves not wait for idle between iterations, makes it smoother.

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 17 Apr 2017 18:07:38 +0000 (11:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agofix another typo
Jim Morris [Mon, 17 Apr 2017 18:05:57 +0000 (11:05 -0700)]
fix another typo

7 years agoonly check max speeds for 3 axis
Jim Morris [Thu, 13 Apr 2017 04:38:14 +0000 (21:38 -0700)]
only check max speeds for 3 axis

7 years agoMerge pull request #1169 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 23:56:16 +0000 (16:56 -0700)]
Merge pull request #1169 from wolfmanjm/upstreamedge

FIx the size of the arc_target in the G2/G3 processing

7 years agou[date bin
Jim Morris [Wed, 12 Apr 2017 23:54:51 +0000 (16:54 -0700)]
u[date bin

7 years agofix arc_target size for G2/G3
Jim Morris [Wed, 12 Apr 2017 23:53:59 +0000 (16:53 -0700)]
fix arc_target size for G2/G3

7 years agoMerge pull request #1168 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 19:03:59 +0000 (12:03 -0700)]
Merge pull request #1168 from wolfmanjm/upstreamedge

fix the limit stop direction report

7 years agofix the limit stop direction report
Jim Morris [Wed, 12 Apr 2017 18:45:03 +0000 (11:45 -0700)]
fix the limit stop direction report

7 years agoMerge pull request #1167 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 18:32:09 +0000 (11:32 -0700)]
Merge pull request #1167 from wolfmanjm/upstreamedge

fix some inchmode issues when homing

7 years agofix some inchmode issues when homing
Jim Morris [Wed, 12 Apr 2017 17:55:18 +0000 (10:55 -0700)]
fix some inchmode issues when homing

7 years agoMerge pull request #1164 from wolfmanjm/upstreamedge
Jim Morris [Mon, 10 Apr 2017 19:56:00 +0000 (12:56 -0700)]
Merge pull request #1164 from wolfmanjm/upstreamedge

change goto park issues in mm or inches depends on setting instead of…

7 years agochange goto park issues in mm or inches depends on setting instead of switching to...
Jim Morris [Mon, 10 Apr 2017 19:54:12 +0000 (12:54 -0700)]
change goto park issues in mm or inches depends on setting instead of switching to mm mode for the move

7 years agoMerge pull request #1163 from wolfmanjm/upstreamedge
Jim Morris [Mon, 10 Apr 2017 06:34:52 +0000 (23:34 -0700)]
Merge pull request #1163 from wolfmanjm/upstreamedge

rename bins

7 years agorename bins
Jim Morris [Mon, 10 Apr 2017 06:33:04 +0000 (23:33 -0700)]
rename bins

7 years agoMerge pull request #1162 from Smoothieware/feature/homing-alarm
Jim Morris [Sat, 8 Apr 2017 02:21:24 +0000 (19:21 -0700)]
Merge pull request #1162 from Smoothieware/feature/homing-alarm

Feature/homing alarm

7 years agoAllow ? to show realtime coordinates when homing
Jim Morris [Sat, 8 Apr 2017 00:38:37 +0000 (17:38 -0700)]
Allow ? to show realtime coordinates when homing

7 years agoAdd an alarm if homing did not hit the endstops
Jim Morris [Fri, 7 Apr 2017 23:56:43 +0000 (16:56 -0700)]
Add an alarm if homing did not hit the endstops
fix ALARM: messages for grbl (it uses a space)
Attempt to fix halt condition detection in conveyor

7 years agoMerge pull request #1161 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 22:27:35 +0000 (15:27 -0700)]
Merge pull request #1161 from wolfmanjm/upstreamedge

update hires bins

7 years agoupdate hires bins
Jim Morris [Fri, 7 Apr 2017 22:25:42 +0000 (15:25 -0700)]
update hires bins

7 years agoMerge pull request #1160 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 22:20:55 +0000 (15:20 -0700)]
Merge pull request #1160 from wolfmanjm/upstreamedge

optimize print_position to use string and reduce stack usage.

7 years agooptimize print_position to use string and reduce stack usage.
Jim Morris [Fri, 7 Apr 2017 22:17:53 +0000 (15:17 -0700)]
optimize print_position to use string and reduce stack usage.

7 years agoMerge pull request #1158 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 19:56:36 +0000 (12:56 -0700)]
Merge pull request #1158 from wolfmanjm/upstreamedge

Optimize stack usage for probe commands

7 years agoOptimize stack usage for probe commands
Jim Morris [Fri, 7 Apr 2017 19:45:54 +0000 (12:45 -0700)]
Optimize stack usage for probe commands

7 years agoMerge pull request #1156 from Smoothieware/stepticker/use-64bit-fixed-point
Jim Morris [Thu, 6 Apr 2017 21:04:07 +0000 (14:04 -0700)]
Merge pull request #1156 from Smoothieware/stepticker/use-64bit-fixed-point

use 64bit fixed point for acceleration and step ticker accumulators

7 years agocleanup header files
Jim Morris [Thu, 6 Apr 2017 18:04:33 +0000 (11:04 -0700)]
cleanup header files

7 years agoupdate bins
Jim Morris [Wed, 5 Apr 2017 22:37:39 +0000 (15:37 -0700)]
update bins

7 years agorefactor...
Jim Morris [Wed, 5 Apr 2017 22:34:54 +0000 (15:34 -0700)]
refactor...
  rename HeapRing to BlockQueue
  remove templates and make it Block specific
  as it is now only used for the Planner queue and allocates its queue in AHB0

7 years agocover other allocatin in heapring
Jim Morris [Wed, 5 Apr 2017 08:06:03 +0000 (01:06 -0700)]
cover other allocatin in heapring

7 years agochange allocation to new[]
Jim Morris [Wed, 5 Apr 2017 07:42:08 +0000 (00:42 -0700)]
change allocation to new[]

7 years agoAllocate block queue blocks in AHB0, and tickinfo in main memory
Jim Morris [Wed, 5 Apr 2017 07:37:07 +0000 (00:37 -0700)]
Allocate block queue blocks in AHB0, and tickinfo in main memory

7 years agoupdate hires firmware images
Jim Morris [Wed, 5 Apr 2017 06:48:19 +0000 (23:48 -0700)]
update hires firmware images

7 years agoMerge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
Jim Morris [Wed, 5 Apr 2017 06:28:10 +0000 (23:28 -0700)]
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point

Conflicts:
fast-stream.py

7 years agoadd test for out of memory when allocating tickinfo
Jim Morris [Wed, 5 Apr 2017 06:04:38 +0000 (23:04 -0700)]
add test for out of memory when allocating tickinfo
add tickinfo size to mem

7 years agomove the tick_info array into AHB0 to save memory
Jim Morris [Wed, 5 Apr 2017 05:59:35 +0000 (22:59 -0700)]
move the tick_info array into AHB0 to save memory

7 years agooptimize 64bit fixed point usage
Jim Morris [Wed, 5 Apr 2017 05:39:19 +0000 (22:39 -0700)]
optimize 64bit fixed point usage

7 years agofix typo
Jim Morris [Tue, 4 Apr 2017 02:58:29 +0000 (19:58 -0700)]
fix typo

7 years agoMerge pull request #1153 from Speedy64i/patch-1
Jim Morris [Mon, 3 Apr 2017 21:47:55 +0000 (14:47 -0700)]
Merge pull request #1153 from Speedy64i/patch-1

Junction deviation tweak

7 years agochanged to <= 0.9999
Jim Morris [Mon, 3 Apr 2017 21:47:08 +0000 (14:47 -0700)]
changed to <= 0.9999

7 years agoUpdate Planner.cpp
JT [Mon, 3 Apr 2017 21:45:10 +0000 (16:45 -0500)]
Update Planner.cpp

7 years agoJunction deviation tweak
JT [Mon, 3 Apr 2017 19:55:25 +0000 (14:55 -0500)]
Junction deviation tweak

In the original code, junction deviation was not calculated at values less than 0.95 (~18.2 degrees).  Any gcode file that allows the machine to reach max speed in a straight line and then goes into a turn consisting of line segments less than 18 degrees of change between them will keep the machine at full speed throughout the turn.  If 10 very short segments are placed together in this manner, the machine can complete a 180 degree movement change at max set speed without decelerating through the turn.  The 0.95 value has been changed to 1.0 allowing the max junction speed calculation to work with any line segments that are not co-linear.  This makes the code match the description in the comment.

This also fixes an issue described in the smoothie forums: http://forum.smoothieware.org/forum/t-2146070/smoothie-takes-a-corner-too-fast.

7 years agoremove unused variable in Kernel
Jim Morris [Mon, 3 Apr 2017 06:40:58 +0000 (23:40 -0700)]
remove unused variable in Kernel

7 years agoadd keyboard interrupt handling to fast-stream.py
Jim Morris [Mon, 3 Apr 2017 02:35:37 +0000 (19:35 -0700)]
add keyboard interrupt handling to fast-stream.py
reset the current positions on clearing a HALT, this fixes any discrepancy when an abrupt abort is issued

7 years agoMerge pull request #1152 from wolfmanjm/upstreamedge
Jim Morris [Mon, 3 Apr 2017 03:04:30 +0000 (20:04 -0700)]
Merge pull request #1152 from wolfmanjm/upstreamedge

Fix what happens when we clear a HALT condition

7 years agofix what happens when we abort the fast-stream
Jim Morris [Mon, 3 Apr 2017 03:00:44 +0000 (20:00 -0700)]
fix what happens when we abort the fast-stream

7 years agoadd keyboard interrupt handling to fast-stream.py
Jim Morris [Mon, 3 Apr 2017 02:35:37 +0000 (19:35 -0700)]
add keyboard interrupt handling to fast-stream.py
reset the current positions on clearing a HALT, this fixes any discrepancy when an abrupt abort is issued

7 years agoUpdate CartGridStrategy.cpp
Jim Morris [Thu, 30 Mar 2017 17:25:13 +0000 (10:25 -0700)]
Update CartGridStrategy.cpp

fix typo

7 years agoMerge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
Jim Morris [Thu, 30 Mar 2017 04:43:03 +0000 (21:43 -0700)]
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point

7 years agoMerge pull request #1151 from wolfmanjm/feature/more-estop-config
Jim Morris [Thu, 30 Mar 2017 04:40:02 +0000 (21:40 -0700)]
Merge pull request #1151 from wolfmanjm/feature/more-estop-config

Feature/more estop config

7 years agoMerge branch 'feature/more-estop-config' into stepticker/use-64bit-fixed-point
Jim Morris [Thu, 30 Mar 2017 03:29:10 +0000 (20:29 -0700)]
Merge branch 'feature/more-estop-config' into stepticker/use-64bit-fixed-point

7 years agoAdd kill_button_toggle_enable to config settings
Jim Morris [Thu, 30 Mar 2017 03:27:15 +0000 (20:27 -0700)]
Add kill_button_toggle_enable to config settings
  - enable for an estop lock style button, halt will be cleared when unlocked and released

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 29 Mar 2017 20:09:04 +0000 (13:09 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoupdate firmware.bin
Jim Morris [Fri, 24 Mar 2017 05:14:06 +0000 (22:14 -0700)]
update firmware.bin

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 agoupdate pre built binaries origin/stepticker/use-64bit-fixed-point
Jim Morris [Sun, 19 Mar 2017 07:11:30 +0000 (00:11 -0700)]
update pre built binaries

7 years agominor optimization
Jim Morris [Sun, 19 Mar 2017 07:08:53 +0000 (00:08 -0700)]
minor optimization

7 years agoMerge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
Jim Morris [Sun, 19 Mar 2017 04:48:51 +0000 (21:48 -0700)]
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point

7 years agoMerge pull request #1148 from wolfmanjm/upstreamedge
Jim Morris [Sun, 19 Mar 2017 04:48:29 +0000 (21:48 -0700)]
Merge pull request #1148 from wolfmanjm/upstreamedge

fix reported block size from mem command

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 agoreduce block size by removing the acceleration_per_tick and decleration_per_tick...
Jim Morris [Sun, 19 Mar 2017 04:37:46 +0000 (21:37 -0700)]
reduce block size by removing the acceleration_per_tick and decleration_per_tick from block
refactor the prepare called from planner.
fix the block size reported by mem command

7 years agoMerge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
Jim Morris [Sun, 19 Mar 2017 01:58:20 +0000 (18:58 -0700)]
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point

7 years agoMerge pull request #1147 from wolfmanjm/upstreamedge
Jim Morris [Sat, 18 Mar 2017 23:47:22 +0000 (16:47 -0700)]
Merge pull request #1147 from wolfmanjm/upstreamedge

minor bug fixes

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