clinton/Smoothieware.git
10 years agoremove incorrect comment about block queue size
Jim Morris [Sat, 24 May 2014 23:17:43 +0000 (16:17 -0700)]
remove incorrect comment about block queue size

10 years agoMerge pull request #400 from Smoothieware/multitool
Logxen [Sat, 24 May 2014 20:08:23 +0000 (13:08 -0700)]
Merge pull request #400 from Smoothieware/multitool

Multitool

10 years agoUpdate to latest binary
Jim Morris [Mon, 19 May 2014 08:44:13 +0000 (01:44 -0700)]
Update to latest binary

10 years agofix what was previously fixed in config but was broken again :)
Jim Morris [Mon, 19 May 2014 03:38:55 +0000 (20:38 -0700)]
fix what was previously fixed in config but was broken again :)

10 years agotry another approach to tool offset
Jim Morris [Sun, 18 May 2014 23:25:21 +0000 (16:25 -0700)]
try another approach to tool offset

10 years agoChange the way tool offset is handled in robot
Jim Morris [Sun, 18 May 2014 22:11:15 +0000 (15:11 -0700)]
Change the way tool offset is handled in robot

10 years agoFix tool offset handling, it should not be reflected in last_milestone
Jim Morris [Sun, 18 May 2014 20:11:29 +0000 (13:11 -0700)]
Fix tool offset handling, it should not be reflected in last_milestone

10 years agoFix M92 Ennn to set the steps/mm for current tool
Jim Morris [Sun, 18 May 2014 07:46:11 +0000 (00:46 -0700)]
Fix M92 Ennn to set the steps/mm for current tool
Fix M500 to save M92 properly

10 years agowhite space fixes only
Jim Morris [Sun, 18 May 2014 05:44:08 +0000 (22:44 -0700)]
white space fixes only

10 years agoRefactor multi tool code
Jim Morris [Sun, 18 May 2014 05:30:14 +0000 (22:30 -0700)]
Refactor multi tool code
optimize so single extruder does not create a toolmanager
remove multiple inheritance from Extruder, make it a Tool which is a Module
move Tool specific fields to Tool from Extruder
Fix M500/M503 for multiple extruders and M92

10 years agoupdated ConfigSample/Smoothieboard for multitool
Logxen [Sun, 18 May 2014 00:53:58 +0000 (17:53 -0700)]
updated ConfigSample/Smoothieboard for multitool

10 years agoMerge branch 'edge' into multitool
Logxen [Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)]
Merge branch 'edge' into multitool

Conflicts:
ConfigSamples/Smoothieboard/config
src/modules/robot/Robot.cpp

10 years agoadded wait for empty queue back to toolchange
Logxen [Sun, 18 May 2014 00:28:48 +0000 (17:28 -0700)]
added wait for empty queue back to toolchange

10 years agoremoved clearToolOffset
Logxen [Sun, 18 May 2014 00:09:00 +0000 (17:09 -0700)]
removed clearToolOffset

10 years agoinit tool_offset with the offset of the first tool added
Logxen [Sat, 17 May 2014 23:46:01 +0000 (16:46 -0700)]
init tool_offset with the offset of the first tool added

10 years agoM105 works for all controllers again
Logxen [Sat, 17 May 2014 22:40:09 +0000 (15:40 -0700)]
M105 works for all controllers again

10 years agomoved header include out of header ToolManager.h
Logxen [Sat, 17 May 2014 22:07:47 +0000 (15:07 -0700)]
moved header include out of header ToolManager.h

10 years agomore cleaning of ToolManager
Logxen [Sat, 17 May 2014 22:02:12 +0000 (15:02 -0700)]
more cleaning of ToolManager

10 years agocleaned up ToolManager
Logxen [Sat, 17 May 2014 21:55:29 +0000 (14:55 -0700)]
cleaned up ToolManager

10 years agomade temp set commands work with multitool
Logxen [Sat, 17 May 2014 21:28:13 +0000 (14:28 -0700)]
made temp set commands work with multitool

10 years agoupdated ConfigSample/Smoothieboard for new link_to_tool setting for multitool temp...
Logxen [Sat, 17 May 2014 21:14:33 +0000 (14:14 -0700)]
updated ConfigSample/Smoothieboard for new link_to_tool setting for multitool temp control

10 years agomade ToolManager properly aware of the first tool name
Logxen [Sat, 17 May 2014 21:09:39 +0000 (14:09 -0700)]
made ToolManager properly aware of the first tool name

10 years agoAdded multitool awareness to temperature_control
Logxen [Sat, 17 May 2014 21:05:43 +0000 (14:05 -0700)]
Added multitool awareness to temperature_control

10 years agoMerge pull request #4 from gestalt73/fixOffsets
Logxen [Sat, 17 May 2014 19:51:39 +0000 (12:51 -0700)]
Merge pull request #4 from gestalt73/fixOffsets

Fix offsets

10 years agoUpdate config
gestalt73 [Sat, 17 May 2014 19:47:29 +0000 (12:47 -0700)]
Update config

fixed copy paste error with offsets for multiple extruders.

10 years agoUpdate Robot.cpp
gestalt73 [Sat, 17 May 2014 19:46:52 +0000 (12:46 -0700)]
Update Robot.cpp

10 years agoUpdate config
gestalt73 [Sat, 17 May 2014 19:40:08 +0000 (12:40 -0700)]
Update config

10 years agoUpdate ToolManager.cpp
gestalt73 [Sat, 17 May 2014 19:37:10 +0000 (12:37 -0700)]
Update ToolManager.cpp

moved setooloffset call out of toolchange loop to trigger on all T commands,

10 years agoUpdate ToolManager.cpp
gestalt73 [Sat, 17 May 2014 19:04:31 +0000 (12:04 -0700)]
Update ToolManager.cpp

10 years agoUpdate ToolManager.cpp
gestalt73 [Sat, 17 May 2014 18:31:22 +0000 (11:31 -0700)]
Update ToolManager.cpp

10 years agoUpdate Robot.cpp
gestalt73 [Sat, 17 May 2014 18:29:55 +0000 (11:29 -0700)]
Update Robot.cpp

10 years agoremoved G92 tool offset code
Alan Timm [Sat, 17 May 2014 05:27:02 +0000 (22:27 -0700)]
removed G92 tool offset code
added setToolOffset functionality to Robot.cpp
ToolManager calls robot->setToolOffset() for every tool change
(Only works with slicers that send T Commands)
KISSlicer, Cura send T commands always
Slic3r only sends T commands when multiple extruders are defined
Still need to find a way to reset offsets on a new print job in a general way

10 years agoMerge pull request #397 from hg42/fix-readme-dfu-util
Jim Morris [Fri, 16 May 2014 08:52:45 +0000 (01:52 -0700)]
Merge pull request #397 from hg42/fix-readme-dfu-util

README: dfu-utils -> dfu-util, cosmetic

10 years agoREADME: dfu-utils -> dfu-util, cosmetic
hg42@gmx.net [Fri, 16 May 2014 08:34:29 +0000 (10:34 +0200)]
README: dfu-utils -> dfu-util, cosmetic

--HG--
extra : source : 700b7f53650156f8b927f1dbaabe14261e4ecad3

10 years agomaking thermistor reading queue 32 instead of 8 in an effort to mitigate the effect...
Arthur Wolf [Sun, 11 May 2014 19:42:29 +0000 (21:42 +0200)]
making thermistor reading queue 32 instead of 8 in an effort to mitigate the effect of bad readings

10 years agohave pwm do nothing if disabled
Logxen [Thu, 8 May 2014 20:56:21 +0000 (13:56 -0700)]
have pwm do nothing if disabled

10 years agoforced constant output for min and max pwm
Logxen [Thu, 8 May 2014 20:44:37 +0000 (13:44 -0700)]
forced constant output for min and max pwm

10 years agoimproved backwards compatibility of turning on switch without S parameter
Logxen [Thu, 8 May 2014 20:20:44 +0000 (13:20 -0700)]
improved backwards compatibility of turning on switch without S parameter

10 years agoimproved switch config parsing
Logxen [Thu, 8 May 2014 19:18:42 +0000 (12:18 -0700)]
improved switch config parsing

10 years agoplay command now plays the last line of a file
Logxen [Thu, 8 May 2014 17:16:23 +0000 (10:16 -0700)]
play command now plays the last line of a file

10 years agoremove direction hacking for trims in config, update firmware.bin
Jim Morris [Mon, 5 May 2014 21:49:37 +0000 (14:49 -0700)]
remove direction hacking for trims in config, update firmware.bin

10 years agoUpdate firmware.bin
Jim Morris [Mon, 5 May 2014 21:20:11 +0000 (14:20 -0700)]
Update firmware.bin

10 years agoFix wrong direction for config based trim values
Jim Morris [Mon, 5 May 2014 21:14:40 +0000 (14:14 -0700)]
Fix wrong direction for config based trim values

10 years agoMerge pull request #394 from wolfmanjm/upstreamedge
Jim Morris [Mon, 5 May 2014 05:45:04 +0000 (22:45 -0700)]
Merge pull request #394 from wolfmanjm/upstreamedge

show trim being set to 0

10 years agoshow trim being set to 0
Jim Morris [Mon, 5 May 2014 05:44:17 +0000 (22:44 -0700)]
show trim being set to 0

10 years agoMerge pull request #393 from wolfmanjm/upstreamedge
Jim Morris [Mon, 5 May 2014 05:36:33 +0000 (22:36 -0700)]
Merge pull request #393 from wolfmanjm/upstreamedge

add public set for endstop trims

10 years agoadd public set for endstop trims
Jim Morris [Mon, 5 May 2014 05:34:21 +0000 (22:34 -0700)]
add public set for endstop trims
tweak zprobe and avoid potential race condition

10 years agoMerge pull request #392 from wolfmanjm/upstreamedge
Jim Morris [Sun, 4 May 2014 03:11:42 +0000 (20:11 -0700)]
Merge pull request #392 from wolfmanjm/upstreamedge

update config

10 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 4 May 2014 03:11:01 +0000 (20:11 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

10 years agoupdate config
Jim Morris [Sun, 4 May 2014 03:09:59 +0000 (20:09 -0700)]
update config

10 years agoMerge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Sun, 4 May 2014 03:07:35 +0000 (20:07 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge

10 years agoupdat econfig
Jim Morris [Sun, 4 May 2014 03:07:07 +0000 (20:07 -0700)]
updat econfig

10 years agoMerge pull request #391 from wolfmanjm/upstreamedge
Jim Morris [Sun, 4 May 2014 02:22:54 +0000 (19:22 -0700)]
Merge pull request #391 from wolfmanjm/upstreamedge

Add K option to G32 to use current endstop trims when probing ratherthan...

10 years agoAdd K option to G32 to use current endstop trims when probing ratherthan zero them...
Jim Morris [Sun, 4 May 2014 02:20:04 +0000 (19:20 -0700)]
Add K option to G32 to use current endstop trims when probing ratherthan zero them and re calibrate

10 years agoUpdate config
Jim Morris [Sat, 3 May 2014 20:29:59 +0000 (13:29 -0700)]
Update config

10 years agoMerge pull request #390 from wolfmanjm/upstreamedge
Jim Morris [Sat, 3 May 2014 05:54:18 +0000 (22:54 -0700)]
Merge pull request #390 from wolfmanjm/upstreamedge

have M910 turn on motors

10 years agohave M910 turn on motors
Jim Morris [Sat, 3 May 2014 05:53:01 +0000 (22:53 -0700)]
have M910 turn on motors

10 years agoupdate FirmwareBin/firmware.bin to latest edge
Jim Morris [Fri, 2 May 2014 03:12:17 +0000 (20:12 -0700)]
update FirmwareBin/firmware.bin to latest edge

10 years agoFixed merge error
Logxen [Thu, 1 May 2014 20:28:33 +0000 (13:28 -0700)]
Fixed merge error

10 years agoMerge pull request #388 from wolfmanjm/upstreamedge
Jim Morris [Wed, 30 Apr 2014 06:29:37 +0000 (23:29 -0700)]
Merge pull request #388 from wolfmanjm/upstreamedge

use regular move for intial move down from home in zprobe

10 years agouse regular move for intial move down from home in zprobe
Jim Morris [Wed, 30 Apr 2014 06:27:02 +0000 (23:27 -0700)]
use regular move for intial move down from home in zprobe

10 years agoUpdate config
Jim Morris [Mon, 28 Apr 2014 22:25:28 +0000 (15:25 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Mon, 28 Apr 2014 22:15:57 +0000 (15:15 -0700)]
Update config

10 years agoMerge pull request #386 from wolfmanjm/upstreamedge
Jim Morris [Mon, 28 Apr 2014 04:47:03 +0000 (21:47 -0700)]
Merge pull request #386 from wolfmanjm/upstreamedge

refactor endstops and zprobe to not use config steps/mm but to use live ...

10 years agorefactor endstops and zprobe to not use config steps/mm but to use live value instead
Jim Morris [Mon, 28 Apr 2014 04:19:13 +0000 (21:19 -0700)]
refactor endstops and zprobe to not use config steps/mm but to use live value instead
clean up endstops ugly code
add I parameter to G32 to set the accuracy

10 years agoUpdate config
Jim Morris [Sun, 27 Apr 2014 04:30:24 +0000 (21:30 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Sun, 27 Apr 2014 04:27:33 +0000 (21:27 -0700)]
Update config

10 years agoMerge pull request #385 from wolfmanjm/upstreamedge
Jim Morris [Sat, 26 Apr 2014 23:41:46 +0000 (16:41 -0700)]
Merge pull request #385 from wolfmanjm/upstreamedge

Added auto delta radius calibration to G32

10 years agoAdded auto delta radius calibration to G32
Jim Morris [Sat, 26 Apr 2014 23:39:36 +0000 (16:39 -0700)]
Added auto delta radius calibration to G32

10 years agoMerge pull request #384 from wolfmanjm/feature/auto-delta-calibration
Jim Morris [Sat, 26 Apr 2014 04:52:39 +0000 (21:52 -0700)]
Merge pull request #384 from wolfmanjm/feature/auto-delta-calibration

Feature/auto delta calibration

10 years agoAdded G32 to autocalibrate delta endstops
Jim Morris [Sat, 26 Apr 2014 04:46:21 +0000 (21:46 -0700)]
Added G32 to autocalibrate delta endstops
Optimized Vector3 and added a few useful functions
cleanup kossel
play comamnd should display ok and other output if -v is specified on play command

10 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 26 Apr 2014 04:35:16 +0000 (21:35 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

10 years agoAdded prebuilt binary
Jim Morris [Thu, 24 Apr 2014 19:40:54 +0000 (12:40 -0700)]
Added prebuilt binary

10 years agoUpdate Endstops.cpp
Jim Morris [Thu, 24 Apr 2014 08:00:19 +0000 (01:00 -0700)]
Update Endstops.cpp

make debounce count 100 the default again

10 years agofixed queued processing of Tcodes and made inactive extruders continue to listen...
Logxen [Wed, 23 Apr 2014 16:29:11 +0000 (09:29 -0700)]
fixed queued processing of Tcodes and made inactive extruders continue to listen for settings

10 years agoMerge branch 'edge' into multitool
Logxen [Wed, 23 Apr 2014 14:10:01 +0000 (07:10 -0700)]
Merge branch 'edge' into multitool

Conflicts:
ConfigSamples/Smoothieboard/config
src/libs/Kernel.h
src/modules/tools/extruder/Extruder.h
src/modules/tools/extruder/ExtruderMaker.cpp

10 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Tue, 22 Apr 2014 08:34:56 +0000 (01:34 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

10 years agoclean up some more headers files
Jim Morris [Tue, 22 Apr 2014 08:33:00 +0000 (01:33 -0700)]
clean up some more headers files
move printf implementation out of steamoutput header

10 years agoMerge pull request #378 from hakalan/thermocouple
Jim Morris [Mon, 21 Apr 2014 22:49:35 +0000 (15:49 -0700)]
Merge pull request #378 from hakalan/thermocouple

Support for MAX31855 thermocouple

10 years agoMerge pull request #382 from wolfmanjm/upstreamedge
Jim Morris [Mon, 21 Apr 2014 06:43:29 +0000 (23:43 -0700)]
Merge pull request #382 from wolfmanjm/upstreamedge

Save arm specific options with M500 disspaly with M503

10 years agoSave arm specific options with M500 disspaly with M503
Jim Morris [Mon, 21 Apr 2014 06:40:09 +0000 (23:40 -0700)]
Save arm specific options with M500 disspaly with M503
change the arm solution options to a map, and optimize how they are set and get
add delta knowledge to z probe so deltas can be probed

10 years agoMerge pull request #381 from wolfmanjm/upstreamedge
Jim Morris [Sun, 20 Apr 2014 20:53:15 +0000 (13:53 -0700)]
Merge pull request #381 from wolfmanjm/upstreamedge

Add Z probe to M119

10 years agoAdd Z probe to M119
Jim Morris [Sun, 20 Apr 2014 20:51:04 +0000 (13:51 -0700)]
Add Z probe to M119
Change G30 to return to originalpostion after probe
G30 Znnn will stop probe on hit and set Z to nnn

10 years agoMerge pull request #380 from wolfmanjm/feature/z-probe
Jim Morris [Sun, 20 Apr 2014 09:31:50 +0000 (02:31 -0700)]
Merge pull request #380 from wolfmanjm/feature/z-probe

Added G30 simple Z probe, will probe for Z at current XY and report how ...

10 years agoAdded G30 simple Z probe, will probe for Z at current XY and report how far the probe...
Jim Morris [Sun, 20 Apr 2014 09:29:49 +0000 (02:29 -0700)]
Added G30 simple Z probe, will probe for Z at current XY and report how far the probe moved down

10 years agoAdded buffer for averaging of measurements to improve PID robustness.
hakalan [Fri, 18 Apr 2014 22:42:02 +0000 (00:42 +0200)]
Added buffer for averaging of measurements to improve PID robustness.

Also ignore occasional failed measurements from the thermocouple.
Formatting changes.

10 years agoMerge pull request #377 from wolfmanjm/upstreamedge
Jim Morris [Wed, 16 Apr 2014 08:34:08 +0000 (01:34 -0700)]
Merge pull request #377 from wolfmanjm/upstreamedge

Only report long lines in config if not truncating a comment

10 years agoOnly report long lines in config if not truncating a comment
Jim Morris [Wed, 16 Apr 2014 08:30:06 +0000 (01:30 -0700)]
Only report long lines in config if not truncating a comment
report the line number the long line is on
Add a DEFAULT_SERIAL_BAUD_RATE define to src/makefile to set the default baud rate used when config has not yet been loaded

10 years agoMerge pull request #376 from wolfmanjm/upstreamedge
Jim Morris [Wed, 16 Apr 2014 03:08:33 +0000 (20:08 -0700)]
Merge pull request #376 from wolfmanjm/upstreamedge

fix case where mri is not loaded for serial.

10 years agofix case where mri is not loaded for serial.
Jim Morris [Wed, 16 Apr 2014 03:07:29 +0000 (20:07 -0700)]
fix case where mri is not loaded for serial.

10 years agoMerge pull request #375 from powertomato/uart_sel_for_release_fix
Jim Morris [Wed, 16 Apr 2014 03:02:50 +0000 (20:02 -0700)]
Merge pull request #375 from powertomato/uart_sel_for_release_fix

Uart sel for release fix

10 years agoChanged tabs to spaces
powertomato [Wed, 16 Apr 2014 02:33:39 +0000 (04:33 +0200)]
Changed tabs to spaces

10 years agoFor release builds MRI is not enabled, and the selection wouldn't work. This is a...
powertomato [Wed, 16 Apr 2014 02:27:51 +0000 (04:27 +0200)]
For release builds MRI is not enabled, and the selection wouldn't work. This is a patch for it

10 years agoChanged config parameter name.
hakla [Tue, 15 Apr 2014 08:42:41 +0000 (10:42 +0200)]
Changed config parameter name.

10 years agoMerge pull request #374 from wolfmanjm/upstreamedge
Jim Morris [Tue, 15 Apr 2014 05:57:13 +0000 (22:57 -0700)]
Merge pull request #374 from wolfmanjm/upstreamedge

CHanged the universal panel adapters protocol

10 years agoCHanged the universal panel adapters protocol
Jim Morris [Tue, 15 Apr 2014 05:55:11 +0000 (22:55 -0700)]
CHanged the universal panel adapters protocol

10 years agoSome error handling cleanup.
hakla [Mon, 14 Apr 2014 20:25:03 +0000 (22:25 +0200)]
Some error handling cleanup.

10 years agoLimit SPI transaction to 16 bits.
hakla [Mon, 14 Apr 2014 19:34:20 +0000 (21:34 +0200)]
Limit SPI transaction to 16 bits.

10 years agoSupport max31855 thermocouple over spi.
hakla [Mon, 14 Apr 2014 18:21:48 +0000 (20:21 +0200)]
Support max31855 thermocouple over spi.

10 years agoMerge pull request #372 from wolfmanjm/fix/universal-panel-adapter
Jim Morris [Mon, 14 Apr 2014 06:59:27 +0000 (23:59 -0700)]
Merge pull request #372 from wolfmanjm/fix/universal-panel-adapter

improve SPI communications with panel adapter