clinton/Smoothieware.git
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 agoFixed merge error
Logxen [Thu, 1 May 2014 20:28:33 +0000 (13:28 -0700)]
Fixed merge error

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 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

10 years agoimprove SPI communications with panel adapter
Jim Morris [Mon, 14 Apr 2014 06:58:13 +0000 (23:58 -0700)]
improve SPI communications with panel adapter

10 years agoMerge pull request #371 from wolfmanjm/upstreamedge
Jim Morris [Sun, 13 Apr 2014 19:39:22 +0000 (12:39 -0700)]
Merge pull request #371 from wolfmanjm/upstreamedge

make M114 output match Marlin

10 years agomake M114 output match Marlin
Jim Morris [Sun, 13 Apr 2014 19:37:33 +0000 (12:37 -0700)]
make M114 output match Marlin

10 years agoedited ConfigSamples readme to reflect removal of Rostock style samples
Logxen [Sun, 13 Apr 2014 11:15:14 +0000 (04:15 -0700)]
edited ConfigSamples readme to reflect removal of Rostock style samples

10 years agoUpdate config
Jim Morris [Sun, 13 Apr 2014 08:47:00 +0000 (01:47 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Sun, 13 Apr 2014 08:46:06 +0000 (01:46 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Sun, 13 Apr 2014 08:45:36 +0000 (01:45 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Sun, 13 Apr 2014 08:44:20 +0000 (01:44 -0700)]
Update config

10 years agoCreate Readme.md
Jim Morris [Sat, 12 Apr 2014 23:16:11 +0000 (16:16 -0700)]
Create Readme.md

10 years agoMerge pull request #370 from wolfmanjm/upstreamedge
Jim Morris [Sat, 12 Apr 2014 20:04:55 +0000 (13:04 -0700)]
Merge pull request #370 from wolfmanjm/upstreamedge

update kossel config

10 years agoupdate kossel config
Jim Morris [Sat, 12 Apr 2014 20:03:10 +0000 (13:03 -0700)]
update kossel config

10 years agoDelete config
Jim Morris [Sat, 12 Apr 2014 19:49:42 +0000 (12:49 -0700)]
Delete config

10 years agoMerge pull request #368 from wolfmanjm/add/universal-panel-adapter
Jim Morris [Sat, 12 Apr 2014 10:07:54 +0000 (03:07 -0700)]
Merge pull request #368 from wolfmanjm/add/universal-panel-adapter

Add/universal panel adapter

10 years agoTune the encoder polling frequency for intelligent panels
Jim Morris [Sat, 12 Apr 2014 10:03:57 +0000 (03:03 -0700)]
Tune the encoder polling frequency for intelligent panels
fix the encoder resolution so deltas other than 1 can be handled

10 years agoMerge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter
Jim Morris [Sat, 12 Apr 2014 05:01:53 +0000 (22:01 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter

10 years agoMerge pull request #367 from wolfmanjm/optimize/config-cache-use-vector
Jim Morris [Sat, 12 Apr 2014 04:49:29 +0000 (21:49 -0700)]
Merge pull request #367 from wolfmanjm/optimize/config-cache-use-vector

Optimize/config cache use vector

10 years agoreplace map with vector as map uses double the amount of memory and no signficant...
Jim Morris [Sat, 12 Apr 2014 04:35:31 +0000 (21:35 -0700)]
replace map with vector as map uses double the amount of memory and no signficant speed increase
clean up some morev stuff in config
added md5 for possible future use

10 years agouse map for config cache
Jim Morris [Sat, 12 Apr 2014 03:54:36 +0000 (20:54 -0700)]
use map for config cache

10 years agoclean up config-cache so it can encapsulate different storage mechanisms
Jim Morris [Fri, 11 Apr 2014 22:39:10 +0000 (15:39 -0700)]
clean up config-cache so it can encapsulate different storage mechanisms
fix various config realted bugs along the way

10 years agoMerge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter
Jim Morris [Fri, 11 Apr 2014 05:40:40 +0000 (22:40 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/universal-panel-adapter

10 years agoMerge pull request #365 from wolfmanjm/fix/config-set
Jim Morris [Fri, 11 Apr 2014 00:41:35 +0000 (17:41 -0700)]
Merge pull request #365 from wolfmanjm/fix/config-set

Fix get_checksums() to not need a terminating space

10 years agoFix get_checksums() to not need a terminating space
Jim Morris [Fri, 11 Apr 2014 00:37:12 +0000 (17:37 -0700)]
Fix get_checksums() to not need a terminating space
remove the append(" ") to checksum generation
fix config-set and allow it to append new key/vlaues to config file

10 years agoMerge pull request #364 from wolfmanjm/fix/config-tighten-up
Jim Morris [Thu, 10 Apr 2014 08:58:56 +0000 (01:58 -0700)]
Merge pull request #364 from wolfmanjm/fix/config-tighten-up

Fix/config tighten up

10 years agoFix some bugs
Jim Morris [Thu, 10 Apr 2014 08:55:58 +0000 (01:55 -0700)]
Fix some bugs
regain 4k by not using fstream
shorten lines in config example
max config line is now 132, it is truncated if longer

10 years agoclean up config parsing, make more robust
Jim Morris [Thu, 10 Apr 2014 07:33:14 +0000 (00:33 -0700)]
clean up config parsing, make more robust
clean up config code in general
in kernel setup serial before config so we can print errors to serial console

10 years agospeed up encoder tick
Jim Morris [Thu, 10 Apr 2014 03:38:45 +0000 (20:38 -0700)]
speed up encoder tick

10 years agoenable led for fan
Jim Morris [Wed, 9 Apr 2014 09:05:33 +0000 (02:05 -0700)]
enable led for fan
more tweaks, still getting spurious encoder clicks

10 years agomore tweaks
Jim Morris [Wed, 9 Apr 2014 04:28:09 +0000 (21:28 -0700)]
more tweaks

10 years agofine tune, handle busy signal
Jim Morris [Wed, 9 Apr 2014 00:26:56 +0000 (17:26 -0700)]
fine tune, handle busy signal
limit size of packet

10 years agoadded busy wait
Jim Morris [Tue, 8 Apr 2014 10:42:10 +0000 (03:42 -0700)]
added busy wait

10 years agotweak with delays
Jim Morris [Tue, 8 Apr 2014 09:10:12 +0000 (02:10 -0700)]
tweak with delays

10 years agoAdd Universal Panel Adapter driver to panels
Jim Morris [Mon, 7 Apr 2014 11:33:30 +0000 (04:33 -0700)]
Add Universal Panel Adapter driver to panels

10 years agoUpdate config
Jim Morris [Fri, 4 Apr 2014 22:09:10 +0000 (15:09 -0700)]
Update config

10 years agoUpdate config
Jim Morris [Fri, 4 Apr 2014 06:08:20 +0000 (23:08 -0700)]
Update config

10 years agoMerge pull request #362 from wolfmanjm/upstreamedge
Jim Morris [Fri, 4 Apr 2014 06:03:41 +0000 (23:03 -0700)]
Merge pull request #362 from wolfmanjm/upstreamedge

update samp;le config for X5 with rrd panel setup

10 years agoupdate samp;le config for X5 with rrd panel setup
Jim Morris [Fri, 4 Apr 2014 06:02:38 +0000 (23:02 -0700)]
update samp;le config for X5 with rrd panel setup

10 years agoMerge pull request #361 from wolfmanjm/upstreamedge
Jim Morris [Thu, 3 Apr 2014 22:37:22 +0000 (15:37 -0700)]
Merge pull request #361 from wolfmanjm/upstreamedge

fix response to M27 when paused

10 years agofix response to M27 when paused
Jim Morris [Thu, 3 Apr 2014 22:36:05 +0000 (15:36 -0700)]
fix response to M27 when paused

10 years agoMerge pull request #360 from wolfmanjm/upstreamedge
Jim Morris [Thu, 3 Apr 2014 20:09:31 +0000 (13:09 -0700)]
Merge pull request #360 from wolfmanjm/upstreamedge

Fix issues with using Mxx to play/pause SD files

10 years agoFix issues with using Mxx to play/pause SD files
Jim Morris [Thu, 3 Apr 2014 20:07:34 +0000 (13:07 -0700)]
Fix issues with using Mxx to play/pause SD files
properly cleanup if sd print was paused and abort is issued

10 years agoMerge pull request #359 from wolfmanjm/upstreamedge
Jim Morris [Wed, 2 Apr 2014 05:08:24 +0000 (22:08 -0700)]
Merge pull request #359 from wolfmanjm/upstreamedge

Fix positive trim values for delta M666, cleanup various header files

10 years agocleanup temperaturecontrol header file
Jim Morris [Wed, 2 Apr 2014 05:06:50 +0000 (22:06 -0700)]
cleanup temperaturecontrol header file

10 years agoCleanup headers in SimpleShell
Jim Morris [Wed, 2 Apr 2014 05:03:05 +0000 (22:03 -0700)]
Cleanup headers in SimpleShell

10 years agoFix positive trim values for delta M666
Jim Morris [Wed, 2 Apr 2014 04:58:55 +0000 (21:58 -0700)]
Fix positive trim values for delta M666
Cleanup includes in PID autotuner
use fgets in play rather than reading one character at a time, optimization

10 years agoMerge pull request #358 from wolfmanjm/upstreamedge
Jim Morris [Tue, 1 Apr 2014 18:10:09 +0000 (11:10 -0700)]
Merge pull request #358 from wolfmanjm/upstreamedge

change Switch pwm_output config to output_type pwm or digital

10 years agochange Switch pwm_output confin to output_type pwm or digital
Jim Morris [Tue, 1 Apr 2014 18:08:02 +0000 (11:08 -0700)]
change Switch pwm_output confin to output_type pwm or digital

10 years agoMerge pull request #357 from wolfmanjm/upstreamedge
Jim Morris [Tue, 1 Apr 2014 08:03:56 +0000 (01:03 -0700)]
Merge pull request #357 from wolfmanjm/upstreamedge

attempt to fix pwm switch putput pins

10 years agoattempt to fix pwm switch putput pins
Jim Morris [Tue, 1 Apr 2014 08:00:55 +0000 (01:00 -0700)]
attempt to fix pwm switch putput pins
added max_pwm config setting for the output pin
Turning pin on without an S parameter sets it to full on (max_pwm) rather than last setting, same as Marlin

10 years agoMerge pull request #356 from wolfmanjm/upstreamedge
Jim Morris [Tue, 1 Apr 2014 06:01:19 +0000 (23:01 -0700)]
Merge pull request #356 from wolfmanjm/upstreamedge

Fix some Switch issues

10 years agofix toggle/momentary input switches
Jim Morris [Tue, 1 Apr 2014 05:59:04 +0000 (22:59 -0700)]
fix toggle/momentary input switches

10 years agofix on_set_public_data for Switch
Jim Morris [Tue, 1 Apr 2014 05:48:14 +0000 (22:48 -0700)]
fix on_set_public_data for Switch

10 years agoMerge pull request #355 from wolfmanjm/upstreamedge
Jim Morris [Tue, 1 Apr 2014 05:35:28 +0000 (22:35 -0700)]
Merge pull request #355 from wolfmanjm/upstreamedge

on panel Only show fan icon if fan is on

10 years agoon panel Only show fan icon if fan is on
Jim Morris [Tue, 1 Apr 2014 05:33:44 +0000 (22:33 -0700)]
on panel Only show fan icon if fan is on

10 years agoMerge pull request #354 from wolfmanjm/upstreamedge
Jim Morris [Mon, 31 Mar 2014 20:00:10 +0000 (13:00 -0700)]
Merge pull request #354 from wolfmanjm/upstreamedge

fix bang bang on/off bug

10 years agofix bang bang on/off bug
Jim Morris [Mon, 31 Mar 2014 19:58:43 +0000 (12:58 -0700)]
fix bang bang on/off bug

10 years agoMerge pull request #353 from wolfmanjm/cleanup/headers
Jim Morris [Mon, 31 Mar 2014 07:06:38 +0000 (00:06 -0700)]
Merge pull request #353 from wolfmanjm/cleanup/headers

Cleanup/headers

10 years agocleanup more headers
Jim Morris [Mon, 31 Mar 2014 07:05:02 +0000 (00:05 -0700)]
cleanup more headers

10 years agocleanup all libs/ headers and dependent files
Jim Morris [Mon, 31 Mar 2014 06:49:18 +0000 (23:49 -0700)]
cleanup all libs/ headers and dependent files

10 years agomore header cleanup, compiles faster now
Jim Morris [Mon, 31 Mar 2014 06:16:57 +0000 (23:16 -0700)]
more header cleanup, compiles faster now

10 years agocleanup headers in network library
Jim Morris [Mon, 31 Mar 2014 05:49:46 +0000 (22:49 -0700)]
cleanup headers in network library

10 years agoUpdate config
Jim Morris [Mon, 31 Mar 2014 05:40:29 +0000 (22:40 -0700)]
Update config

10 years agoMerge pull request #352 from wolfmanjm/fix/telnet
Jim Morris [Mon, 31 Mar 2014 03:18:19 +0000 (20:18 -0700)]
Merge pull request #352 from wolfmanjm/fix/telnet

Fix telnet debug_printf

10 years agoFix telnet debug_printf
Jim Morris [Mon, 31 Mar 2014 03:17:10 +0000 (20:17 -0700)]
Fix telnet debug_printf

10 years agoMerge pull request #351 from wolfmanjm/upstreamedge
Jim Morris [Mon, 31 Mar 2014 03:04:22 +0000 (20:04 -0700)]
Merge pull request #351 from wolfmanjm/upstreamedge

add option to make a switch output pin logic on/off and not pwm, default...