clinton/Smoothieware.git
7 years agoinitial implementation of new laser module
Jim Morris [Sun, 31 Jul 2016 01:02:31 +0000 (18:02 -0700)]
initial implementation of new laser module

7 years agoMerge pull request #990 from wolfmanjm/upstreamedge
Jim Morris [Sat, 30 Jul 2016 20:49:34 +0000 (13:49 -0700)]
Merge pull request #990 from wolfmanjm/upstreamedge

Make the arm solution routines const to avoid issues in the future

7 years agoMake the arm solution routines const to avoid issues in the future
Jim Morris [Sat, 30 Jul 2016 20:46:18 +0000 (13:46 -0700)]
Make the arm solution routines const to avoid issues in the future

7 years agoUpdate upgrade-notes.md
Jim Morris [Fri, 22 Jul 2016 21:27:11 +0000 (14:27 -0700)]
Update upgrade-notes.md

7 years agoMerge pull request #988 from wolfmanjm/upstreamedge
Jim Morris [Fri, 22 Jul 2016 19:12:26 +0000 (12:12 -0700)]
Merge pull request #988 from wolfmanjm/upstreamedge

add gamma_max_travel for homing

7 years agominor refactoring for homing
Jim Morris [Fri, 22 Jul 2016 07:26:58 +0000 (00:26 -0700)]
minor refactoring for homing

7 years agoadd config settings gamma_max_travel instead of using gamma_max for homing motion...
Jim Morris [Fri, 22 Jul 2016 01:03:07 +0000 (18:03 -0700)]
add config settings gamma_max_travel instead of using gamma_max for homing motion limit
  ditto for alpha and beta

7 years agofix halt when queue is full
Jim Morris [Wed, 20 Jul 2016 02:25:18 +0000 (19:25 -0700)]
fix halt when queue is full

7 years agoCorerctly handle halt when queue was full and stuck in queue_head_block
Jim Morris [Wed, 20 Jul 2016 01:03:43 +0000 (18:03 -0700)]
Corerctly handle halt when queue was full and stuck in queue_head_block

7 years agoFix test circle to use relative rather than absolute
Jim Morris [Wed, 20 Jul 2016 00:17:31 +0000 (17:17 -0700)]
Fix test circle to use relative rather than absolute
allow abort of certain panel initiated custom commands

7 years agoupdate firmware.bin
Jim Morris [Mon, 18 Jul 2016 03:29:55 +0000 (20:29 -0700)]
update firmware.bin

7 years agoMerge pull request #986 from wolfmanjm/upstreamedge
Jim Morris [Sun, 17 Jul 2016 20:29:16 +0000 (13:29 -0700)]
Merge pull request #986 from wolfmanjm/upstreamedge

Clear current_tick when halted, or on start of new block

7 years agoclear current_tick when halted and when starting a new block
Jim Morris [Sun, 17 Jul 2016 20:25:56 +0000 (13:25 -0700)]
clear current_tick when halted and when starting a new block
clean up M999 processing

7 years agoinitialize step pin
Jim Morris [Sat, 16 Jul 2016 18:55:41 +0000 (11:55 -0700)]
initialize step pin

7 years agoMerge pull request #984 from wolfmanjm/upstreamedge
Jim Morris [Sat, 16 Jul 2016 17:52:37 +0000 (10:52 -0700)]
Merge pull request #984 from wolfmanjm/upstreamedge

various minor changes and fixes

7 years agoreset position after test raw.
Jim Morris [Sat, 16 Jul 2016 17:50:12 +0000 (10:50 -0700)]
reset position after test raw.
mark manual_step() as experimental and unsupported.

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 16 Jul 2016 16:54:47 +0000 (09:54 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoMerge pull request #983 from Viproz/edge-stepperfix
Jim Morris [Sat, 16 Jul 2016 16:54:10 +0000 (09:54 -0700)]
Merge pull request #983 from Viproz/edge-stepperfix

Fixed StepperMotor direction being undefined

7 years agoFixed StepperMotor direction being undefined
Viproz [Sat, 16 Jul 2016 15:23:10 +0000 (17:23 +0200)]
Fixed StepperMotor direction being undefined

7 years agoFix block debug
Jim Morris [Fri, 15 Jul 2016 21:13:45 +0000 (14:13 -0700)]
Fix block debug

7 years agohave unstep timer stop on match, so no more interrupts until it is re enabled
Jim Morris [Wed, 13 Jul 2016 22:05:20 +0000 (15:05 -0700)]
have unstep timer stop on match, so no more interrupts until it is re enabled

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Tue, 12 Jul 2016 23:59:57 +0000 (16:59 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoprepare to check the step pulse length compared to stepping frequency
Jim Morris [Tue, 12 Jul 2016 01:14:30 +0000 (18:14 -0700)]
prepare to check the step pulse length compared to stepping frequency

7 years agoMerge pull request #981 from wolfmanjm/upstreamedge
Jim Morris [Mon, 11 Jul 2016 19:39:48 +0000 (12:39 -0700)]
Merge pull request #981 from wolfmanjm/upstreamedge

added test raw axis steps steps/mm to simpleshell

7 years agoadded test raw axis steps steps/mm to simpleshell
Jim Morris [Sun, 10 Jul 2016 22:53:57 +0000 (15:53 -0700)]
added test raw axis steps steps/mm to simpleshell

7 years agoMerge pull request #980 from Smoothieware/wolfmanjm-patch-2
Jim Morris [Sat, 9 Jul 2016 23:01:43 +0000 (16:01 -0700)]
Merge pull request #980 from Smoothieware/wolfmanjm-patch-2

Rename ISSUETEMPLATE.md to ISSUE_TEMPLATE.md

7 years agoRename ISSUETEMPLATE.md to ISSUE_TEMPLATE.md
Jim Morris [Sat, 9 Jul 2016 23:01:34 +0000 (16:01 -0700)]
Rename ISSUETEMPLATE.md to ISSUE_TEMPLATE.md

7 years agoMerge pull request #979 from Smoothieware/wolfmanjm-patch-1
Jim Morris [Sat, 9 Jul 2016 23:00:27 +0000 (16:00 -0700)]
Merge pull request #979 from Smoothieware/wolfmanjm-patch-1

Rename HowToFileIssues.md to ISSUETEMPLATE.md

7 years agoRename HowToFileIssues.md to ISSUETEMPLATE.md
Jim Morris [Sat, 9 Jul 2016 23:00:14 +0000 (16:00 -0700)]
Rename HowToFileIssues.md to ISSUETEMPLATE.md

7 years agoDelete CONTRIBUTNG
Jim Morris [Sat, 9 Jul 2016 22:58:18 +0000 (15:58 -0700)]
Delete CONTRIBUTNG

7 years agoCreate CONTRIBUTNG
Jim Morris [Sat, 9 Jul 2016 22:57:00 +0000 (15:57 -0700)]
Create CONTRIBUTNG

7 years agoupdate firmware.bin
Jim Morris [Sat, 9 Jul 2016 07:12:08 +0000 (00:12 -0700)]
update firmware.bin

7 years agoMerge pull request #973 from wolfmanjm/upstreamedge
Jim Morris [Sat, 9 Jul 2016 07:04:31 +0000 (00:04 -0700)]
Merge pull request #973 from wolfmanjm/upstreamedge

fix an issue with tiny moves that generate no actual steps

7 years agofix issue for very small moves that do not generate any steps
Jim Morris [Sat, 9 Jul 2016 07:03:07 +0000 (00:03 -0700)]
fix issue for very small moves that do not generate any steps

7 years agorename some network commands ? becomes h, test becomes ntest
Jim Morris [Sat, 9 Jul 2016 00:33:25 +0000 (17:33 -0700)]
rename some network commands ? becomes h, test becomes ntest

7 years agoMerge pull request #971 from wolfmanjm/upstreamedge
Jim Morris [Fri, 8 Jul 2016 20:39:29 +0000 (13:39 -0700)]
Merge pull request #971 from wolfmanjm/upstreamedge

enter alarm/halt state when encountering an invalid feedrate

7 years agoenter alarm/halt state when encountering an invalid feedrate
Jim Morris [Fri, 8 Jul 2016 20:38:37 +0000 (13:38 -0700)]
enter alarm/halt state when encountering an invalid feedrate

7 years agoMerge pull request #970 from wolfmanjm/upstreamedge
Jim Morris [Thu, 7 Jul 2016 22:49:32 +0000 (15:49 -0700)]
Merge pull request #970 from wolfmanjm/upstreamedge

print the temp delta on runaway alarm

7 years agoprint the temp delta on runaway alarm
Jim Morris [Thu, 7 Jul 2016 22:48:40 +0000 (15:48 -0700)]
print the temp delta on runaway alarm

7 years agoMerge pull request #968 from wolfmanjm/upstreamedge
Jim Morris [Thu, 7 Jul 2016 04:23:11 +0000 (21:23 -0700)]
Merge pull request #968 from wolfmanjm/upstreamedge

potential fox for stack overflow in #967

7 years agodon;t cal lprintf in play unless -v is specified
Jim Morris [Thu, 7 Jul 2016 04:21:10 +0000 (21:21 -0700)]
don;t cal lprintf in play unless -v is specified

7 years agoremove debug printout
Jim Morris [Tue, 5 Jul 2016 03:15:01 +0000 (20:15 -0700)]
remove debug printout

7 years agoupdate firmware.bin
Jim Morris [Mon, 4 Jul 2016 19:51:17 +0000 (12:51 -0700)]
update firmware.bin

7 years agoMerge pull request #966 from wolfmanjm/upstreamedge
Jim Morris [Mon, 4 Jul 2016 07:35:04 +0000 (00:35 -0700)]
Merge pull request #966 from wolfmanjm/upstreamedge

make firmware retraction independent of any flow rate setting

7 years agomake firmware retraction independent of any flow rate setting
Jim Morris [Mon, 4 Jul 2016 07:32:50 +0000 (00:32 -0700)]
make firmware retraction independent of any flow rate setting
refactor the e scale function

7 years agoMerge pull request #965 from wolfmanjm/upstreamedge
Jim Morris [Mon, 4 Jul 2016 05:54:26 +0000 (22:54 -0700)]
Merge pull request #965 from wolfmanjm/upstreamedge

disable compensation transform for G30 probe

7 years agodisable compensation transform for G30 probe
Jim Morris [Mon, 4 Jul 2016 05:53:18 +0000 (22:53 -0700)]
disable compensation transform for G30 probe

7 years agoMerge pull request #964 from wolfmanjm/upstreamedge
Jim Morris [Mon, 4 Jul 2016 05:37:18 +0000 (22:37 -0700)]
Merge pull request #964 from wolfmanjm/upstreamedge

fix potential firmware retract bug

7 years agofix a bug where compensation transform and a delta move would not recogize a solo...
Jim Morris [Mon, 4 Jul 2016 05:21:43 +0000 (22:21 -0700)]
fix a bug where compensation transform and a delta move would not recogize a solo move, affected firmware retract on certain setups
delta_move leaves compensation tranform on.
Homing turns off compensation transform

7 years agoif G92 E0 is detected after a G10 (retract) then we save the position before G11...
Jim Morris [Mon, 4 Jul 2016 01:35:50 +0000 (18:35 -0700)]
if G92 E0 is detected after a G10 (retract) then we save the position before G11 and restore it after so in case there is no G92 E0 after G11 we are still zeroed out in E

7 years agoMerge pull request #962 from wolfmanjm/upstreamedge
Jim Morris [Sun, 3 Jul 2016 07:18:56 +0000 (00:18 -0700)]
Merge pull request #962 from wolfmanjm/upstreamedge

fix issue when filament diameter or flow rate are changed d…

7 years agopotentiall fix issue when filemant diamted or flow rate are changed during a print
Jim Morris [Sun, 3 Jul 2016 06:25:47 +0000 (23:25 -0700)]
potentiall fix issue when filemant diamted or flow rate are changed during a print

7 years agoUpdate upgrade-notes.md
Jim Morris [Sat, 2 Jul 2016 21:55:47 +0000 (14:55 -0700)]
Update upgrade-notes.md

7 years agoUpdate upgrade-notes.md
Jim Morris [Sat, 2 Jul 2016 21:38:41 +0000 (14:38 -0700)]
Update upgrade-notes.md

7 years agoupdate firmware.bin
Jim Morris [Sat, 2 Jul 2016 21:23:34 +0000 (14:23 -0700)]
update firmware.bin

7 years agoMerge pull request #961 from wolfmanjm/upstreamedge
Jim Morris [Sat, 2 Jul 2016 21:21:29 +0000 (14:21 -0700)]
Merge pull request #961 from wolfmanjm/upstreamedge

Major update, read upgrade notes and log for changes

7 years agotypo fix
Jim Morris [Sat, 2 Jul 2016 20:13:00 +0000 (13:13 -0700)]
typo fix

7 years agomake default baud rate 9600 to match builtin default
Jim Morris [Fri, 1 Jul 2016 19:10:03 +0000 (12:10 -0700)]
make default baud rate 9600 to match builtin default

7 years agoset grbl_mode true by default for CNC build
Jim Morris [Thu, 30 Jun 2016 21:12:29 +0000 (14:12 -0700)]
set grbl_mode true by default for CNC build

7 years agoMerge remote-tracking branch 'upstream/edge-unstable' into feature/5-axis
Jim Morris [Thu, 30 Jun 2016 19:55:16 +0000 (12:55 -0700)]
Merge remote-tracking branch 'upstream/edge-unstable' into feature/5-axis

7 years agoMerge pull request #957 from Zaaphod/G28.1-minor-adjustment
Jim Morris [Thu, 30 Jun 2016 19:54:19 +0000 (12:54 -0700)]
Merge pull request #957 from Zaaphod/G28.1-minor-adjustment

G28.1 minor adjustment

7 years agoG28.1 minor refinement
James Richters [Thu, 30 Jun 2016 19:34:53 +0000 (15:34 -0400)]
G28.1 minor refinement

Only X and Y are used to move to predefined position with G28.2 (or G28
in GRBL mode), so Z should not be saved in the config-override file.

7 years agoshow nominal speed for each curren tblock on CNC panel
Jim Morris [Thu, 30 Jun 2016 19:01:56 +0000 (12:01 -0700)]
show nominal speed for each curren tblock on CNC panel

7 years agoMerge pull request #3 from Smoothieware/edge-unstable
Zaaphod [Thu, 30 Jun 2016 18:52:59 +0000 (14:52 -0400)]
Merge pull request #3 from Smoothieware/edge-unstable

Edge unstable update

7 years agoimplement current_speed for panel display
Jim Morris [Wed, 29 Jun 2016 05:49:14 +0000 (22:49 -0700)]
implement current_speed for panel display

7 years agofix MPG mode for CNC pendant
Jim Morris [Tue, 28 Jun 2016 22:36:45 +0000 (15:36 -0700)]
fix MPG mode for CNC pendant

7 years agoallow restoration of G28.1 position
Jim Morris [Tue, 28 Jun 2016 20:35:34 +0000 (13:35 -0700)]
allow restoration of G28.1 position

7 years agoupdate upgrade notes
Jim Morris [Tue, 28 Jun 2016 19:07:01 +0000 (12:07 -0700)]
update upgrade notes

7 years agoMerge remote-tracking branch 'upstream/edge' into experiment/merge-delta-grid
Jim Morris [Tue, 28 Jun 2016 07:49:59 +0000 (00:49 -0700)]
Merge remote-tracking branch 'upstream/edge' into experiment/merge-delta-grid

Conflicts:
src/modules/tools/zprobe/DeltaGridStrategy.cpp

7 years agoMerge pull request #907 from lordofhyphens/deltagrid_cartesian
Jim Morris [Tue, 28 Jun 2016 07:39:29 +0000 (00:39 -0700)]
Merge pull request #907 from lordofhyphens/deltagrid_cartesian

Permits cartesians to use delta-grid levelling strategy

7 years agofix homing an individual axis
Jim Morris [Tue, 28 Jun 2016 05:03:17 +0000 (22:03 -0700)]
fix homing an individual axis

7 years agoimplement on helt in player toavoid race conditions
Jim Morris [Tue, 28 Jun 2016 02:22:06 +0000 (19:22 -0700)]
implement on helt in player toavoid race conditions

7 years agoremove acceleration_ticks_per_second from all sample configs
Jim Morris [Mon, 27 Jun 2016 07:02:33 +0000 (00:02 -0700)]
remove acceleration_ticks_per_second from all sample configs

7 years agoalos make sure stepticker handles ablock with no steps on any motor
Jim Morris [Mon, 27 Jun 2016 06:39:50 +0000 (23:39 -0700)]
alos make sure stepticker handles ablock with no steps on any motor

7 years agoFix a bug where a move could result in zero steps for all axis
Jim Morris [Mon, 27 Jun 2016 06:28:31 +0000 (23:28 -0700)]
Fix a bug where a move could result in zero steps for all axis

7 years agocomment out laser for now
Jim Morris [Mon, 27 Jun 2016 03:38:54 +0000 (20:38 -0700)]
comment out laser for now

7 years agofix M207 Zxxx
Jim Morris [Mon, 27 Jun 2016 03:26:39 +0000 (20:26 -0700)]
fix M207 Zxxx
Update config extruder config syntax

7 years agonote that old extruder syntax is no longer supported
Jim Morris [Mon, 27 Jun 2016 01:58:10 +0000 (18:58 -0700)]
note that old extruder syntax is no longer supported

7 years agoifdef laser out
Jim Morris [Mon, 27 Jun 2016 01:07:06 +0000 (18:07 -0700)]
ifdef laser out

7 years agoupdate firmware.bin
Jim Morris [Sun, 26 Jun 2016 20:45:18 +0000 (13:45 -0700)]
update firmware.bin

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/5-axis
Jim Morris [Sun, 26 Jun 2016 20:38:58 +0000 (13:38 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/5-axis

7 years agoallow deprectaed M203 A B C format, but warn about deprecation
Jim Morris [Sun, 26 Jun 2016 20:37:14 +0000 (13:37 -0700)]
allow deprectaed M203 A B C format, but warn about deprecation

7 years agoMerge pull request #782 from Smoothieware/runaway
Arthur Wolf [Sun, 26 Jun 2016 20:23:22 +0000 (22:23 +0200)]
Merge pull request #782 from Smoothieware/runaway

Draft temperature runaway detection

7 years agominor refactor
Jim Morris [Sun, 26 Jun 2016 20:15:55 +0000 (13:15 -0700)]
minor refactor

7 years agorevert change to back off at fast rate, it is too violent on deltas.
Jim Morris [Sun, 26 Jun 2016 05:39:46 +0000 (22:39 -0700)]
revert change to back off at fast rate, it is too violent on deltas.

7 years agouse fast rate for backoff endstops
Jim Morris [Sun, 26 Jun 2016 03:10:18 +0000 (20:10 -0700)]
use fast rate for backoff endstops

7 years agoadd M114.3 for extruder
Jim Morris [Sun, 26 Jun 2016 01:20:06 +0000 (18:20 -0700)]
add M114.3 for extruder
fix for CNC build

7 years agofix M205 when printed out by M500
Jim Morris [Sat, 25 Jun 2016 07:03:17 +0000 (00:03 -0700)]
fix M205 when printed out by M500

7 years agofix M207 and M205
Jim Morris [Sat, 25 Jun 2016 06:58:56 +0000 (23:58 -0700)]
fix M207 and M205

7 years agoreset axis before trying to home
Jim Morris [Sat, 25 Jun 2016 06:08:25 +0000 (23:08 -0700)]
reset axis before trying to home

7 years agorename wait_for_empty_queue to wait for idle
Jim Morris [Sat, 25 Jun 2016 01:00:32 +0000 (18:00 -0700)]
rename wait_for_empty_queue to wait for idle

7 years agofix move to origin for deltas and cartesians when not homing all axis
Jim Morris [Fri, 24 Jun 2016 21:44:42 +0000 (14:44 -0700)]
fix move to origin for deltas and cartesians when not homing all axis

7 years agoallow $H to initiate homing when in halt, and clears halt as well (as per GRBL)
Jim Morris [Fri, 24 Jun 2016 21:10:26 +0000 (14:10 -0700)]
allow $H to initiate homing when in halt, and clears halt as well (as per GRBL)

7 years agoMerge remote-tracking branch 'upstream/edge' into feature/5-axis
Jim Morris [Fri, 24 Jun 2016 20:02:56 +0000 (13:02 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/5-axis

Conflicts:
src/modules/tools/endstops/Endstops.cpp

7 years agoMerge pull request #953 from Zaaphod/edge
Jim Morris [Fri, 24 Jun 2016 19:59:23 +0000 (12:59 -0700)]
Merge pull request #953 from Zaaphod/edge

Fix Homing when in G20

7 years agofix using is queue empty when it should be is_idle
Jim Morris [Fri, 24 Jun 2016 19:54:20 +0000 (12:54 -0700)]
fix using is queue empty when it should be is_idle

7 years agoUpdate method
James Richters [Fri, 24 Jun 2016 18:46:20 +0000 (14:46 -0400)]
Update method

Remove G21 from in front of G53 as this is not valid.   Turn off inch
mode directly.

7 years agoFix Homing when in G20
James Richters [Fri, 24 Jun 2016 17:54:24 +0000 (13:54 -0400)]
Fix Homing when in G20

This is a bug fix when homing when in G20  mode.  It was making the
final move in inches instead of mm.  Homing should always bring you to
the same exact point whether you are in G20 or G21.  See
https://github.com/Smoothieware/Smoothieware/issues/952

7 years agofix inconsistencies in disyance for e only moves and accleration scaling etc
Jim Morris [Thu, 23 Jun 2016 23:47:08 +0000 (16:47 -0700)]
fix inconsistencies in disyance for e only moves and accleration scaling etc
removed hack for G92 between G10 and G11

7 years agofix extruder E values when in volumetric mode. this is a breaking change as it now...
Jim Morris [Thu, 23 Jun 2016 22:39:20 +0000 (15:39 -0700)]
fix extruder E values when in volumetric mode. this is a breaking change as it now always expects the E parameter to be in mm^3
  - the down side here is that when you extrude 10mm form pronterface it will be interpreted as 10mm^3 instead
G10/G11 should now work, M207 still specifes retract length in mm, but is converted to mm^3 when G10 is executed
  - we now have a function pointer set by the active extruder to get the E scaling from robot