0x23 [Fri, 30 May 2014 08:42:33 +0000 (10:42 +0200)]
changed pow to powf
Jim Morris [Tue, 3 Jun 2014 21:38:24 +0000 (14:38 -0700)]
update firmware.bin
Jim Morris [Tue, 3 Jun 2014 20:44:07 +0000 (13:44 -0700)]
Merge pull request #410 from wolfmanjm/upstreamedge
fix panel wrap
Jim Morris [Tue, 3 Jun 2014 20:43:02 +0000 (13:43 -0700)]
fix panel wrap
Jim Morris [Mon, 2 Jun 2014 20:22:38 +0000 (13:22 -0700)]
Merge pull request #409 from wolfmanjm/fix/rename-delta-arm-solutions
rename delta arm solutions
Jim Morris [Mon, 2 Jun 2014 20:20:46 +0000 (13:20 -0700)]
rename delta arm solutions
Jim Morris [Mon, 2 Jun 2014 06:19:34 +0000 (23:19 -0700)]
update firmware.bin
Jim Morris [Mon, 2 Jun 2014 06:10:21 +0000 (23:10 -0700)]
Merge pull request #408 from wolfmanjm/fix/dont_use_hash_for_simpleshell_commands
Fix/dont use hash for simpleshell commands
Jim Morris [Mon, 2 Jun 2014 06:09:28 +0000 (23:09 -0700)]
fix config get command
Jim Morris [Mon, 2 Jun 2014 05:54:22 +0000 (22:54 -0700)]
Remove CHECKSUMMING of console commands to avoid unwanted duplicate hits.
Also moves the tables into FLASH out of RAM.
Jim Morris [Sat, 31 May 2014 07:22:45 +0000 (00:22 -0700)]
Merge pull request #407 from wolfmanjm/panel/add-settings-and-temp
add settings and temp to panel, refactor panel, minor refactor StepTicker
Jim Morris [Sat, 31 May 2014 07:00:53 +0000 (00:00 -0700)]
Enumerate hotends for display in panel temperature settings
refactor the panel to be a singleton saving having to store panel pointer in every screen
lazy load the configure screen
Jim Morris [Sat, 31 May 2014 00:21:00 +0000 (17:21 -0700)]
add z homing offset to settings
Jim Morris [Fri, 30 May 2014 09:43:55 +0000 (02:43 -0700)]
fix minor update bug after changing a value
Jim Morris [Fri, 30 May 2014 07:33:53 +0000 (00:33 -0700)]
Added e steps for panel
Jim Morris [Fri, 30 May 2014 05:17:44 +0000 (22:17 -0700)]
Initial addition of settings and temperature control to Panel
made some fields private in stepper steppermotor stepticker
Jim Morris [Thu, 29 May 2014 08:37:43 +0000 (01:37 -0700)]
Merge pull request #406 from wolfmanjm/upstreamedge
Add 1 to recieved frame index to get length
Jim Morris [Thu, 29 May 2014 08:35:37 +0000 (01:35 -0700)]
Add 1 to recieved frame index to get length
Jim Morris [Wed, 28 May 2014 22:55:48 +0000 (15:55 -0700)]
update firmware.bin
Jim Morris [Wed, 28 May 2014 20:30:59 +0000 (13:30 -0700)]
Merge pull request #405 from wolfmanjm/upstreamedge
Workaround driver sending 3 bytes more than packet size by adding 4 byte...
Jim Morris [Wed, 28 May 2014 20:27:10 +0000 (13:27 -0700)]
Workaround driver sending 3 bytes more than packet size by adding 4 bytes to uip buffer size
Discard packets that are too big for uip buffer (UDP broadcasts usually)
Jim Morris [Mon, 26 May 2014 04:24:53 +0000 (21:24 -0700)]
update firmware.bin
Jim Morris [Mon, 26 May 2014 04:08:34 +0000 (21:08 -0700)]
Merge pull request #403 from wolfmanjm/upstreamedge
fix bug in extruder which was introdcuded by multiextruder edits. F shou...
Jim Morris [Mon, 26 May 2014 04:07:05 +0000 (21:07 -0700)]
fix bug in extruder which was introdcuded by multiextruder edits. F should only be appied when a G0 or G1
Jim Morris [Sat, 24 May 2014 23:37:09 +0000 (16:37 -0700)]
Merge pull request #402 from wolfmanjm/upstreamedge
remove link_to_tool config as it is not needed
Jim Morris [Sat, 24 May 2014 23:33:25 +0000 (16:33 -0700)]
remove link_to_tool, as it is not needed
update Sample configs
Jim Morris [Sat, 24 May 2014 23:21:31 +0000 (16:21 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Conflicts:
src/modules/robot/Conveyor.h
Jim Morris [Sat, 24 May 2014 23:20:30 +0000 (16:20 -0700)]
Merge pull request #401 from wolfmanjm/fix/cleanup-private-fields
Fix/cleanup private fields
Jim Morris [Sat, 24 May 2014 23:19:30 +0000 (16:19 -0700)]
remove incorrect comment about queue size
Jim Morris [Sat, 24 May 2014 23:17:43 +0000 (16:17 -0700)]
remove incorrect comment about block queue size
Jim Morris [Sat, 24 May 2014 23:13:43 +0000 (16:13 -0700)]
cleanup a bunch of fields that should be private
add a few getters where the value is needed in many other classes
Jim Morris [Sat, 24 May 2014 21:30:36 +0000 (14:30 -0700)]
update firmware.bin
Logxen [Sat, 24 May 2014 20:08:23 +0000 (13:08 -0700)]
Merge pull request #400 from Smoothieware/multitool
Multitool
Jim Morris [Mon, 19 May 2014 08:44:13 +0000 (01:44 -0700)]
Update to latest binary
Jim Morris [Mon, 19 May 2014 03:38:55 +0000 (20:38 -0700)]
fix what was previously fixed in config but was broken again :)
Jim Morris [Sun, 18 May 2014 23:25:21 +0000 (16:25 -0700)]
try another approach to tool offset
Jim Morris [Sun, 18 May 2014 22:11:15 +0000 (15:11 -0700)]
Change the way tool offset is handled in robot
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
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
Jim Morris [Sun, 18 May 2014 05:44:08 +0000 (22:44 -0700)]
white space fixes only
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
Logxen [Sun, 18 May 2014 00:53:58 +0000 (17:53 -0700)]
updated ConfigSample/Smoothieboard for 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
Logxen [Sun, 18 May 2014 00:28:48 +0000 (17:28 -0700)]
added wait for empty queue back to toolchange
Logxen [Sun, 18 May 2014 00:09:00 +0000 (17:09 -0700)]
removed clearToolOffset
Logxen [Sat, 17 May 2014 23:46:01 +0000 (16:46 -0700)]
init tool_offset with the offset of the first tool added
Logxen [Sat, 17 May 2014 22:40:09 +0000 (15:40 -0700)]
M105 works for all controllers again
Logxen [Sat, 17 May 2014 22:07:47 +0000 (15:07 -0700)]
moved header include out of header ToolManager.h
Logxen [Sat, 17 May 2014 22:02:12 +0000 (15:02 -0700)]
more cleaning of ToolManager
Logxen [Sat, 17 May 2014 21:55:29 +0000 (14:55 -0700)]
cleaned up ToolManager
Logxen [Sat, 17 May 2014 21:28:13 +0000 (14:28 -0700)]
made temp set commands work with multitool
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
Logxen [Sat, 17 May 2014 21:09:39 +0000 (14:09 -0700)]
made ToolManager properly aware of the first tool name
Logxen [Sat, 17 May 2014 21:05:43 +0000 (14:05 -0700)]
Added multitool awareness to temperature_control
Logxen [Sat, 17 May 2014 19:51:39 +0000 (12:51 -0700)]
Merge pull request #4 from gestalt73/fixOffsets
Fix offsets
gestalt73 [Sat, 17 May 2014 19:47:29 +0000 (12:47 -0700)]
Update config
fixed copy paste error with offsets for multiple extruders.
gestalt73 [Sat, 17 May 2014 19:46:52 +0000 (12:46 -0700)]
Update Robot.cpp
gestalt73 [Sat, 17 May 2014 19:40:08 +0000 (12:40 -0700)]
Update config
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,
gestalt73 [Sat, 17 May 2014 19:04:31 +0000 (12:04 -0700)]
Update ToolManager.cpp
gestalt73 [Sat, 17 May 2014 18:31:22 +0000 (11:31 -0700)]
Update ToolManager.cpp
gestalt73 [Sat, 17 May 2014 18:29:55 +0000 (11:29 -0700)]
Update Robot.cpp
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
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
hg42@gmx.net [Fri, 16 May 2014 08:34:29 +0000 (10:34 +0200)]
README: dfu-utils -> dfu-util, cosmetic
--HG--
extra : source :
700b7f53650156f8b927f1dbaabe14261e4ecad3
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
Logxen [Thu, 8 May 2014 20:56:21 +0000 (13:56 -0700)]
have pwm do nothing if disabled
Logxen [Thu, 8 May 2014 20:44:37 +0000 (13:44 -0700)]
forced constant output for min and max pwm
Logxen [Thu, 8 May 2014 20:20:44 +0000 (13:20 -0700)]
improved backwards compatibility of turning on switch without S parameter
Logxen [Thu, 8 May 2014 19:18:42 +0000 (12:18 -0700)]
improved switch config parsing
Logxen [Thu, 8 May 2014 17:16:23 +0000 (10:16 -0700)]
play command now plays the last line of a file
Jim Morris [Mon, 5 May 2014 21:49:37 +0000 (14:49 -0700)]
remove direction hacking for trims in config, update firmware.bin
Jim Morris [Mon, 5 May 2014 21:20:11 +0000 (14:20 -0700)]
Update firmware.bin
Jim Morris [Mon, 5 May 2014 21:14:40 +0000 (14:14 -0700)]
Fix wrong direction for config based trim values
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
Jim Morris [Mon, 5 May 2014 05:44:17 +0000 (22:44 -0700)]
show trim being set to 0
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
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
Jim Morris [Sun, 4 May 2014 03:11:42 +0000 (20:11 -0700)]
Merge pull request #392 from wolfmanjm/upstreamedge
update config
Jim Morris [Sun, 4 May 2014 03:11:01 +0000 (20:11 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 4 May 2014 03:09:59 +0000 (20:09 -0700)]
update config
Jim Morris [Sun, 4 May 2014 03:07:35 +0000 (20:07 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Sun, 4 May 2014 03:07:07 +0000 (20:07 -0700)]
updat econfig
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...
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
Jim Morris [Sat, 3 May 2014 20:29:59 +0000 (13:29 -0700)]
Update config
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
Jim Morris [Sat, 3 May 2014 05:53:01 +0000 (22:53 -0700)]
have M910 turn on motors
Jim Morris [Fri, 2 May 2014 03:12:17 +0000 (20:12 -0700)]
update FirmwareBin/firmware.bin to latest edge
Logxen [Thu, 1 May 2014 20:28:33 +0000 (13:28 -0700)]
Fixed merge error
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
Jim Morris [Wed, 30 Apr 2014 06:27:02 +0000 (23:27 -0700)]
use regular move for intial move down from home in zprobe
Jim Morris [Mon, 28 Apr 2014 22:25:28 +0000 (15:25 -0700)]
Update config
Jim Morris [Mon, 28 Apr 2014 22:15:57 +0000 (15:15 -0700)]
Update config
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 ...
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
Jim Morris [Sun, 27 Apr 2014 04:30:24 +0000 (21:30 -0700)]
Update config
Jim Morris [Sun, 27 Apr 2014 04:27:33 +0000 (21:27 -0700)]
Update config
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
Jim Morris [Sat, 26 Apr 2014 23:39:36 +0000 (16:39 -0700)]
Added auto delta radius calibration to G32