clinton/Smoothieware.git
8 years agoMerge pull request #749 from justinledwards/patch-1
Arthur Wolf [Sun, 29 Nov 2015 12:57:00 +0000 (13:57 +0100)]
Merge pull request #749 from justinledwards/patch-1

Removed old reference to max_jerk

8 years agoMerge pull request #773 from wolfmanjm/add/SPI-driver-setup
Jim Morris [Sun, 29 Nov 2015 04:07:09 +0000 (20:07 -0800)]
Merge pull request #773 from wolfmanjm/add/SPI-driver-setup

spi driver setup module for TMC26X and DRV8711

8 years agoMerge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
Jim Morris [Sun, 29 Nov 2015 02:41:29 +0000 (18:41 -0800)]
Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup

8 years agoMerge pull request #781 from wolfmanjm/upstreamedge
Jim Morris [Sun, 29 Nov 2015 02:41:03 +0000 (18:41 -0800)]
Merge pull request #781 from wolfmanjm/upstreamedge

add some M code exceptions to the on halt block

8 years agoadd some M code exeptions to the on halt block
Jim Morris [Sun, 29 Nov 2015 02:40:00 +0000 (18:40 -0800)]
add some M code exeptions to the on halt block

8 years agoMerge pull request #779 from wolfmanjm/upstreamedge
Jim Morris [Thu, 26 Nov 2015 05:33:08 +0000 (21:33 -0800)]
Merge pull request #779 from wolfmanjm/upstreamedge

fix occasional M500 crash

8 years agodisable interrupts during M500
Jim Morris [Thu, 26 Nov 2015 01:14:02 +0000 (17:14 -0800)]
disable interrupts during M500

8 years agoonly report error once
Jim Morris [Tue, 24 Nov 2015 22:42:34 +0000 (14:42 -0800)]
only report error once

8 years agofix ^X inserial console
Jim Morris [Tue, 24 Nov 2015 21:20:27 +0000 (13:20 -0800)]
fix ^X inserial console

8 years agofix ^X inserial console
Jim Morris [Tue, 24 Nov 2015 21:20:27 +0000 (13:20 -0800)]
fix ^X inserial console

8 years agoMerge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
Jim Morris [Mon, 23 Nov 2015 20:35:25 +0000 (12:35 -0800)]
Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup

8 years agoupdate firmware.bin
Jim Morris [Mon, 23 Nov 2015 20:32:46 +0000 (12:32 -0800)]
update firmware.bin

8 years agoMerge pull request #778 from wolfmanjm/upstreamedge
Jim Morris [Mon, 23 Nov 2015 20:31:13 +0000 (12:31 -0800)]
Merge pull request #778 from wolfmanjm/upstreamedge

fix bug where on_halt was called on startup

8 years agofix bug where on_halt was called on startup
Jim Morris [Mon, 23 Nov 2015 20:30:06 +0000 (12:30 -0800)]
fix bug where on_halt was called on startup

8 years agoMerge pull request #777 from errolt/AD8495
Jim Morris [Mon, 23 Nov 2015 19:29:41 +0000 (11:29 -0800)]
Merge pull request #777 from errolt/AD8495

Changed parameters to lower case

8 years agoChanged parameters to lower case
errolt [Mon, 23 Nov 2015 16:31:47 +0000 (18:31 +0200)]
Changed parameters to lower case

8 years agoupdate firmware.bin
Jim Morris [Sun, 22 Nov 2015 21:05:15 +0000 (13:05 -0800)]
update firmware.bin

8 years agoset a default stall guard setting
Jim Morris [Sun, 22 Nov 2015 21:02:58 +0000 (13:02 -0800)]
set a default stall guard setting

8 years agoMerge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
Jim Morris [Sun, 22 Nov 2015 21:01:15 +0000 (13:01 -0800)]
Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup

8 years agoUpdate config
Jim Morris [Sun, 22 Nov 2015 21:00:24 +0000 (13:00 -0800)]
Update config

8 years agoUpdate config
Jim Morris [Sun, 22 Nov 2015 20:59:37 +0000 (12:59 -0800)]
Update config

8 years agoMerge pull request #775 from errolt/AD8495
Jim Morris [Sun, 22 Nov 2015 19:50:15 +0000 (11:50 -0800)]
Merge pull request #775 from errolt/AD8495

Add offset option for AD8495

8 years agoRemove unused #define
errolt [Sun, 22 Nov 2015 15:14:50 +0000 (17:14 +0200)]
Remove unused #define

8 years agoAdd offset option to AD8495 module
errolt [Sun, 22 Nov 2015 15:10:41 +0000 (17:10 +0200)]
Add offset option to AD8495 module

8 years agoMerge remote-tracking branch 'upstream/edge' into edge
errolt [Sun, 22 Nov 2015 14:41:26 +0000 (16:41 +0200)]
Merge remote-tracking branch 'upstream/edge' into edge

8 years agoOnly report errors once
Jim Morris [Sun, 22 Nov 2015 07:57:05 +0000 (23:57 -0800)]
Only report errors once

8 years agoremove unused #define
Jim Morris [Sat, 21 Nov 2015 21:09:02 +0000 (13:09 -0800)]
remove unused #define

8 years agoMerge pull request #772 from mdebski/fix-arcs-extrude
Jim Morris [Sat, 21 Nov 2015 04:03:50 +0000 (20:03 -0800)]
Merge pull request #772 from mdebski/fix-arcs-extrude

Pay attention to G2/G3 in extruder module. Fix #771.

8 years agoadded error flag detection for DRV8711
Jim Morris [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
added error flag detection for DRV8711

8 years agoadd optional error status bit checking and optional halt on error
Jim Morris [Fri, 20 Nov 2015 22:19:42 +0000 (14:19 -0800)]
add optional error status bit checking and optional halt on error

8 years agouppercse the exclusion define for motorcontrolsetup
Jim Morris [Fri, 20 Nov 2015 03:49:49 +0000 (19:49 -0800)]
uppercse the exclusion define for motorcontrolsetup

8 years agoclean up registers initialization
Jim Morris [Fri, 20 Nov 2015 01:36:45 +0000 (17:36 -0800)]
clean up registers initialization

8 years agoPay attention to G2/G3 in extruder module. Fix #771.
Maciej Dębski [Wed, 18 Nov 2015 12:04:29 +0000 (13:04 +0100)]
Pay attention to G2/G3 in extruder module. Fix #771.

8 years agorefactor register read and writes for drv8711 and improve register dump
Jim Morris [Wed, 18 Nov 2015 05:29:41 +0000 (21:29 -0800)]
refactor register read and writes for drv8711 and improve register dump

8 years agoadded and implemente dmost of DRV8711
Jim Morris [Tue, 17 Nov 2015 09:23:45 +0000 (01:23 -0800)]
added and implemente dmost of DRV8711
refactored to use bit fields for registers

8 years agoadd machine readablke data format for TMC status for the processing sketch to tune
Jim Morris [Mon, 16 Nov 2015 22:22:43 +0000 (14:22 -0800)]
add machine readablke data format for TMC status for the processing sketch to tune

8 years agoadd support for the processing TMC26X tuning app
Jim Morris [Mon, 16 Nov 2015 08:55:50 +0000 (00:55 -0800)]
add support for the processing TMC26X tuning app

8 years agoonly output M500/M503 stuff if it has been set or overriden
Jim Morris [Sun, 15 Nov 2015 09:02:26 +0000 (01:02 -0800)]
only output M500/M503 stuff if it has been set or overriden

8 years agorefactor
Jim Morris [Sat, 14 Nov 2015 22:44:42 +0000 (14:44 -0800)]
refactor

8 years agoAdded more settings for TMC2660...
Jim Morris [Sat, 14 Nov 2015 22:33:54 +0000 (14:33 -0800)]
Added more settings for TMC2660...
            // M911.3 Onnn Qnnn setStallGuardThreshold O=stall_guard_threshold, Q=stall_guard_filter_enabled
            // M911.3 Hnnn Innn Jnnn Knnn Lnnn setCoolStepConfiguration H=lower_SG_threshold, I=SG_hysteresis, J=current_decrement_step_size, K=current_increment_step_size, L=lower_current_limit
            // M911.3 S0 Unnn Vnnn Wnnn Xnnn Ynnn setConstantOffTimeChopper  U=constant_off_time, V=blank_time, W=fast_decay_time_setting, X=sine_wave_offset, Y=use_current_comparator
            // M911.3 S1 Unnn Vnnn Wnnn Xnnn Ynnn setSpreadCycleChopper  U=constant_off_time, V=blank_time, W=hysteresis_start, X=hysteresis_end, Y=hysteresis_decrement
            // M911.3 S2 Zn setRandomOffTime Z1 is on Z0 is off
            // M911.3 S3 Zn setDoubleEdge  Z1 is on Z0 is off
            // M911.3 S4 Zn setStepInterpolation Z1 is on Z0 is off

8 years agofixup report
Jim Morris [Sat, 14 Nov 2015 22:07:14 +0000 (14:07 -0800)]
fixup report
add extra settings

8 years agoadd ability to set specific options for a chip from M911.3, will be different for...
Jim Morris [Sat, 14 Nov 2015 09:10:38 +0000 (01:10 -0800)]
add ability to set specific options for a chip from M911.3, will be different for different chips

8 years agoMerge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
Jim Morris [Fri, 13 Nov 2015 21:46:01 +0000 (13:46 -0800)]
Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup

8 years agoMerge pull request #769 from Smoothieware/add/grbl-queries-and-kill
Jim Morris [Fri, 13 Nov 2015 21:39:55 +0000 (13:39 -0800)]
Merge pull request #769 from Smoothieware/add/grbl-queries-and-kill

add GRBL ^X and ? to serial uart handler

8 years agoadd GRBL ^X and ? to serial uart handler
Jim Morris [Fri, 13 Nov 2015 21:12:18 +0000 (13:12 -0800)]
add GRBL ^X and ? to serial uart handler

8 years agoset per chip default max currrent
Jim Morris [Fri, 13 Nov 2015 21:29:43 +0000 (13:29 -0800)]
set per chip default max currrent

8 years agoadd GRBL ^X and ? to serial uart handler
Jim Morris [Fri, 13 Nov 2015 21:12:18 +0000 (13:12 -0800)]
add GRBL ^X and ? to serial uart handler

8 years agocheck steps/mm settings after automatic change after microstep change
Jim Morris [Fri, 13 Nov 2015 08:36:25 +0000 (00:36 -0800)]
check steps/mm settings after automatic change after microstep change

8 years agoadded M911 to set the raw registers of an advanced chip, for expert users.
Jim Morris [Fri, 13 Nov 2015 07:43:30 +0000 (23:43 -0800)]
added M911 to set the raw registers of an advanced chip, for expert users.

8 years agoadd motor enable handling with a new ON_ENABLE event
Jim Morris [Fri, 13 Nov 2015 07:15:14 +0000 (23:15 -0800)]
add motor enable handling with a new ON_ENABLE event

8 years agoMerge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
Jim Morris [Fri, 13 Nov 2015 06:32:12 +0000 (22:32 -0800)]
Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup

8 years agoMerge pull request #768 from Smoothieware/refactor/remove-play-pause
Jim Morris [Fri, 13 Nov 2015 06:27:35 +0000 (22:27 -0800)]
Merge pull request #768 from Smoothieware/refactor/remove-play-pause

Remove play/pause

8 years agoRemove play/pause
Jim Morris [Fri, 13 Nov 2015 06:24:42 +0000 (22:24 -0800)]
Remove play/pause
rename pause to kill
use kill functionality if old pause button enabled
refactor to rename pause to kill

8 years agoadd raw register setting from config
Jim Morris [Fri, 13 Nov 2015 05:46:27 +0000 (21:46 -0800)]
add raw register setting from config
fix a few things, now works for TMC26X

8 years agoadded current calculation for thew torque and gain values for the drv8711
Jim Morris [Thu, 12 Nov 2015 10:20:19 +0000 (02:20 -0800)]
added current calculation for thew torque and gain values for the drv8711

8 years agoadded drv8711 library, but it needs much work
Jim Morris [Thu, 12 Nov 2015 08:26:56 +0000 (00:26 -0800)]
added drv8711 library, but it needs much work

8 years agoadded debug output
Jim Morris [Thu, 12 Nov 2015 06:55:08 +0000 (22:55 -0800)]
added debug output
implemented the TMC control

8 years agoadded TMC26X driver library (fixed up)
Jim Morris [Thu, 12 Nov 2015 00:49:06 +0000 (16:49 -0800)]
added TMC26X driver library (fixed up)
implemented settings for the TMC chip

8 years agoMerge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
Errol [Wed, 11 Nov 2015 09:11:00 +0000 (11:11 +0200)]
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge

8 years agoRevert "Added an panel.init property to the ST7565 module to specify a custom"
Errol [Wed, 11 Nov 2015 09:08:53 +0000 (11:08 +0200)]
Revert "Added an panel.init property to the ST7565 module to specify a custom"

This reverts commit e5dd5aa55a5c1644ede7b38c40074f5e459e13fe.

8 years agoRevert "Added support for AD8495 Thermocouple amplifier"
Errol [Wed, 11 Nov 2015 09:08:33 +0000 (11:08 +0200)]
Revert "Added support for AD8495 Thermocouple amplifier"

This reverts commit 9cee995ddbe7c073958de722d49dc9fd3d052872.

8 years agoimplemented initial setup and configs
Jim Morris [Wed, 11 Nov 2015 07:42:22 +0000 (23:42 -0800)]
implemented initial setup and configs

8 years agoInitial creation of th emotor controller module
Jim Morris [Wed, 11 Nov 2015 06:08:08 +0000 (22:08 -0800)]
Initial creation of th emotor controller module

8 years agoMerge pull request #766 from wolfmanjm/upstreamedge
Jim Morris [Tue, 10 Nov 2015 20:10:35 +0000 (12:10 -0800)]
Merge pull request #766 from wolfmanjm/upstreamedge

fix warning for PR #765

8 years agofix warnign for PR #765
Jim Morris [Tue, 10 Nov 2015 20:09:06 +0000 (12:09 -0800)]
fix warnign for PR #765

8 years agoMerge pull request #765 from errolt/errolt
Jim Morris [Tue, 10 Nov 2015 19:26:10 +0000 (11:26 -0800)]
Merge pull request #765 from errolt/errolt

Add support for AD8495 Thermocouple amplifier

8 years agoMerge branch 'edge' of https://github.com/errolt/Smoothieware into edge
Errol [Tue, 10 Nov 2015 13:56:07 +0000 (15:56 +0200)]
Merge branch 'edge' of https://github.com/errolt/Smoothieware into edge

8 years agoAdd support for AD8495 Thermocouple amplifier
Errol [Tue, 10 Nov 2015 13:42:20 +0000 (15:42 +0200)]
Add support for AD8495 Thermocouple amplifier

8 years agoAdd support for AD8495 Thermocouple amplifier
Errol [Tue, 10 Nov 2015 13:42:20 +0000 (15:42 +0200)]
Add support for AD8495 Thermocouple amplifier

8 years agoMerge pull request #764 from RepRapMorgan/scara_cal_nov15
Jim Morris [Tue, 10 Nov 2015 09:08:18 +0000 (01:08 -0800)]
Merge pull request #764 from RepRapMorgan/scara_cal_nov15

SCARA solution updates

8 years ago deleted: config.default.new
Quentin Harley [Tue, 10 Nov 2015 09:03:14 +0000 (11:03 +0200)]
deleted:    config.default.new

8 years agoremoved config
Quentin Harley [Tue, 10 Nov 2015 07:08:24 +0000 (09:08 +0200)]
removed config

8 years agoSCARA solution updates
Quentin Harley [Tue, 10 Nov 2015 06:58:06 +0000 (08:58 +0200)]
SCARA solution updates
Improved calibration movements: configureable Z movement
Included D and E parameters to get and set optional: set min and max
singularity protection values on the fly and save to config-override

Calibration examle added in snippets.

8 years agoMerge pull request #763 from wolfmanjm/feature/enable-watchdog
Jim Morris [Tue, 10 Nov 2015 02:14:03 +0000 (18:14 -0800)]
Merge pull request #763 from wolfmanjm/feature/enable-watchdog

Feature/enable watchdog

8 years agolong running things like cat need to hit on_idle everynow and then or watchdog will...
Jim Morris [Tue, 10 Nov 2015 02:05:30 +0000 (18:05 -0800)]
long running things like cat need to hit on_idle everynow and then or watchdog will kick in

8 years agoenable the WDT interrupt if watchdog is enabled
Jim Morris [Tue, 10 Nov 2015 01:56:09 +0000 (17:56 -0800)]
enable the WDT interrupt if watchdog is enabled

8 years agoupdate configs
Jim Morris [Mon, 9 Nov 2015 23:20:35 +0000 (15:20 -0800)]
update configs

8 years agoallow both DFU and watchdog
Jim Morris [Mon, 9 Nov 2015 23:10:52 +0000 (15:10 -0800)]
allow both DFU and watchdog

8 years agomake watch dog timeout enter mri mode
Jim Morris [Mon, 9 Nov 2015 21:03:57 +0000 (13:03 -0800)]
make watch dog timeout enter mri mode
set a led pattern to indicate what happened

8 years agoMerge remote-tracking branch 'upstream/edge' into feature/enable-watchdog
Jim Morris [Mon, 9 Nov 2015 20:26:09 +0000 (12:26 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/enable-watchdog

8 years agoAdded support for AD8495 Thermocouple amplifier
Errol [Fri, 6 Nov 2015 09:53:32 +0000 (11:53 +0200)]
Added support for AD8495 Thermocouple amplifier

8 years agoAdded an panel.init property to the ST7565 module to specify a custom
Errol [Thu, 5 Nov 2015 15:41:36 +0000 (17:41 +0200)]
Added an panel.init property to the ST7565 module to specify a custom
display init sequence

8 years agoMerge pull request #754 from BrianGilbert/edge
Jim Morris [Thu, 22 Oct 2015 04:16:37 +0000 (21:16 -0700)]
Merge pull request #754 from BrianGilbert/edge

Fix OS X build script to run without 'ambiguous redirect' errors for references …

8 years agoupdate firmware.bin
Jim Morris [Sun, 18 Oct 2015 05:05:38 +0000 (22:05 -0700)]
update firmware.bin

8 years agoMerge pull request #755 from wolfmanjm/upstreamedge
Jim Morris [Fri, 16 Oct 2015 21:34:43 +0000 (14:34 -0700)]
Merge pull request #755 from wolfmanjm/upstreamedge

allow move_to_origin_after_home for deltas

8 years agoallow move_to_origin_after_home for deltas
Jim Morris [Fri, 16 Oct 2015 21:32:33 +0000 (14:32 -0700)]
allow move_to_origin_after_home for deltas

8 years agoFixed and fully tested mac install from path containing spaces
Brian Gilbert [Wed, 14 Oct 2015 06:13:45 +0000 (17:13 +1100)]
Fixed and fully tested mac install from path containing spaces

8 years agoFix script to run without 'ambiguous redirect' errors for references to $LOGFILE...
Brian Gilbert [Wed, 14 Oct 2015 04:16:48 +0000 (15:16 +1100)]
Fix script to run without 'ambiguous redirect' errors for references to $LOGFILE and $ERRORFILE when directory path has spaces in it

8 years agoMerge pull request #752 from wolfmanjm/fix/suspend-resume
Jim Morris [Mon, 12 Oct 2015 05:30:49 +0000 (22:30 -0700)]
Merge pull request #752 from wolfmanjm/fix/suspend-resume

use push/pop state to save current state on suspend/resume

8 years agouse push/pop state to save current state on suspend/resume
Jim Morris [Mon, 12 Oct 2015 05:28:08 +0000 (22:28 -0700)]
use push/pop state to save current state on suspend/resume
fix speed issues in extruder after suspend resume when left in relative mode

8 years agoadd option to enable watchdog. Enabled if dfu is disabled.
Jim Morris [Wed, 7 Oct 2015 04:06:48 +0000 (21:06 -0700)]
add option to enable watchdog. Enabled if dfu is disabled.

8 years agoRemoved old reference to max_jerk
Justin Edwards [Fri, 2 Oct 2015 16:16:51 +0000 (12:16 -0400)]
Removed old reference to max_jerk

8 years agoMerge pull request #748 from jnjackins/corexz
Jim Morris [Fri, 2 Oct 2015 09:15:24 +0000 (02:15 -0700)]
Merge pull request #748 from jnjackins/corexz

CoreXZ Support

8 years agofix typo in corexz snippet
Jeremy Jackins [Fri, 2 Oct 2015 07:50:14 +0000 (16:50 +0900)]
fix typo in corexz snippet

8 years agomove corexz-specific sample config to Snippets/corexz.config
Jeremy Jackins [Fri, 2 Oct 2015 07:38:59 +0000 (16:38 +0900)]
move corexz-specific sample config to Snippets/corexz.config

8 years agoupdate corexz config comments
Jeremy Jackins [Thu, 1 Oct 2015 05:19:20 +0000 (14:19 +0900)]
update corexz config comments

8 years agoadd x axis reduction configuration to CoreXZSolution
Jeremy Jackins [Thu, 1 Oct 2015 03:14:43 +0000 (12:14 +0900)]
add x axis reduction configuration to CoreXZSolution

8 years agoz_reduction is a private member of CoreXZSolution
Jeremy Jackins [Wed, 30 Sep 2015 05:04:36 +0000 (14:04 +0900)]
z_reduction is a private member of CoreXZSolution

8 years agoadd code and config for CoreXZ style printer
Jeremy Jackins [Wed, 30 Sep 2015 04:43:08 +0000 (13:43 +0900)]
add code and config for CoreXZ style printer

8 years agoMerge pull request #747 from wolfmanjm/add/G29-to-three-point-strategy
Jim Morris [Tue, 29 Sep 2015 04:39:56 +0000 (21:39 -0700)]
Merge pull request #747 from wolfmanjm/add/G29-to-three-point-strategy

Add G29 to test the probe points and report delta height