clinton/Smoothieware.git
6 years agoupdate firmware.bin origin/HEAD origin/edge
Jim Morris [Tue, 17 Oct 2017 20:24:46 +0000 (21:24 +0100)]
update firmware.bin

6 years agoupdate latest bins (same as normal bin)
Jim Morris [Fri, 13 Oct 2017 12:25:01 +0000 (13:25 +0100)]
update latest bins (same as normal bin)

6 years agoupdate firmware.bin
Jim Morris [Fri, 13 Oct 2017 12:21:39 +0000 (13:21 +0100)]
update firmware.bin

6 years agoMerge pull request #1226 from Zaaphod/Fix_XZ_Arcs
Jim Morris [Fri, 29 Sep 2017 21:02:52 +0000 (22:02 +0100)]
Merge pull request #1226 from Zaaphod/Fix_XZ_Arcs

Fix Math for Arcs in XZ Plane - Issue  #1181

6 years agoFix Math for Arcs in XZ Plane - Issue #1181
James Richters [Fri, 29 Sep 2017 20:40:39 +0000 (16:40 -0400)]
Fix Math for Arcs in XZ Plane - Issue  #1181

The math for calculating angular travel needs to be reversed only for XZ arcs, this is because the arc is now starting and ending in different quadrants than a similar arc in the other 2 planes.

6 years agoMerge pull request #1223 from DavidJRobertson/make-debug-store-win
Jim Morris [Sat, 23 Sep 2017 20:27:11 +0000 (21:27 +0100)]
Merge pull request #1223 from DavidJRobertson/make-debug-store-win

Fix `make debug-store` (and hence `make upload`) on Windows

6 years agoFix `make debug-store` (and hence `make upload`) on windows
David Robertson [Sat, 23 Sep 2017 20:17:40 +0000 (21:17 +0100)]
Fix `make debug-store` (and hence `make upload`) on windows

Note that the cd commands are to avoid having to translate between / and \ as path separators

6 years agoFix laser power read when pwm is inverted
Jim Morris [Fri, 22 Sep 2017 11:33:50 +0000 (12:33 +0100)]
Fix laser power read when pwm is inverted

6 years agoMerge pull request #891 from greyltc/ISR-SPI-fix
Jim Morris [Tue, 19 Sep 2017 09:36:57 +0000 (10:36 +0100)]
Merge pull request #891 from greyltc/ISR-SPI-fix

Max31855: stop using SPI from ISR

6 years agoMerge pull request #4 from JeffreyRodriguez/greyltc_ISR-SPI-fix_mergeEdge
Grey Christoforo [Tue, 19 Sep 2017 09:18:35 +0000 (10:18 +0100)]
Merge pull request #4 from JeffreyRodriguez/greyltc_ISR-SPI-fix_mergeEdge

Greyltc isr spi fix - merge edge

6 years agoMerged with current edge.
Jeff Rodriguez [Sun, 17 Sep 2017 03:04:30 +0000 (20:04 -0700)]
Merged with current edge.

6 years agoMerge pull request #1214 from DavidJRobertson/configurable-kill-poll-rate
Jim Morris [Fri, 1 Sep 2017 19:19:59 +0000 (20:19 +0100)]
Merge pull request #1214 from DavidJRobertson/configurable-kill-poll-rate

Add configuration option kill_button_poll_frequency, see #1212.

6 years agoAdd configuration option kill_button_poll_frequency, see #1212.
David Robertson [Fri, 1 Sep 2017 19:11:32 +0000 (20:11 +0100)]
Add configuration option kill_button_poll_frequency, see #1212.

6 years agoMerge pull request #1211 from DavidJRobertson/fix/panel-probe-truncated
Jim Morris [Fri, 1 Sep 2017 17:19:36 +0000 (18:19 +0100)]
Merge pull request #1211 from DavidJRobertson/fix/panel-probe-truncated

Fix truncation of command output from panel probe screen on large displays

6 years agoFix truncation of command output from panel probe screen on large displays.
David Robertson [Fri, 1 Sep 2017 16:42:42 +0000 (17:42 +0100)]
Fix truncation of command output from panel probe screen on large displays.

6 years agoMerge pull request #1204 from sdavi/Feature/ZProbe-Dwell
Jim Morris [Mon, 17 Jul 2017 00:18:37 +0000 (17:18 -0700)]
Merge pull request #1204 from sdavi/Feature/ZProbe-Dwell

Dwell before probing

6 years agoUpdated float comparison
sdavi [Sun, 16 Jul 2017 23:42:59 +0000 (09:42 +1000)]
Updated float comparison

6 years agoDwell before probing
sdavi [Sun, 16 Jul 2017 05:58:33 +0000 (15:58 +1000)]
Dwell before probing

Adds a configurable delay before probing

6 years agoMerge pull request #1200 from wolfmanjm/fix/delta-grid-write-corruption
Jim Morris [Thu, 22 Jun 2017 04:46:08 +0000 (21:46 -0700)]
Merge pull request #1200 from wolfmanjm/fix/delta-grid-write-corruption

close and reopen file every 400 bytes to avoid corruption

6 years agoMerge remote-tracking branch 'upstream/edge' into fix/delta-grid-write-corruption
Jim Morris [Thu, 22 Jun 2017 04:08:01 +0000 (21:08 -0700)]
Merge remote-tracking branch 'upstream/edge' into fix/delta-grid-write-corruption

6 years agoMerge pull request #1201 from wolfmanjm/upstreamedge
Jim Morris [Thu, 22 Jun 2017 04:07:35 +0000 (21:07 -0700)]
Merge pull request #1201 from wolfmanjm/upstreamedge

update firmware-latest

6 years agoupdate firmware-latest
Jim Morris [Thu, 22 Jun 2017 04:06:18 +0000 (21:06 -0700)]
update firmware-latest

6 years agoMerge remote-tracking branch 'upstream/edge' into fix/delta-grid-write-corruption
Jim Morris [Thu, 22 Jun 2017 03:59:43 +0000 (20:59 -0700)]
Merge remote-tracking branch 'upstream/edge' into fix/delta-grid-write-corruption

6 years agoMerge pull request #1199 from wolfmanjm/hack/interim-feed-hold
Jim Morris [Thu, 22 Jun 2017 03:58:47 +0000 (20:58 -0700)]
Merge pull request #1199 from wolfmanjm/hack/interim-feed-hold

interim feed hold

6 years agoalso fix cart grid
Jim Morris [Tue, 20 Jun 2017 18:20:14 +0000 (11:20 -0700)]
also fix cart grid

6 years agoclose and reopen file every 400 bytes to avoid corruption
Jim Morris [Tue, 20 Jun 2017 18:10:10 +0000 (11:10 -0700)]
close and reopen file every 400 bytes to avoid corruption

6 years agoMerge remote-tracking branch 'upstream/edge' into hack/interim-feed-hold
Jim Morris [Mon, 5 Jun 2017 04:36:39 +0000 (21:36 -0700)]
Merge remote-tracking branch 'upstream/edge' into hack/interim-feed-hold

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:34:55 +0000 (21:34 -0700)]
Update config

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:34:23 +0000 (21:34 -0700)]
Update config

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:34:01 +0000 (21:34 -0700)]
Update config

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:33:05 +0000 (21:33 -0700)]
Update config

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:32:31 +0000 (21:32 -0700)]
Update config

6 years agoUpdate config
Jim Morris [Mon, 5 Jun 2017 04:31:41 +0000 (21:31 -0700)]
Update config

6 years agoadd new_status_format for grbl1.1-like status format which is easier to parse and...
Jim Morris [Thu, 1 Jun 2017 04:42:23 +0000 (21:42 -0700)]
add new_status_format for grbl1.1-like status format which is easier to parse and adds ABC axis to MCS, and F: and S: and L:

6 years agoMerge branch 'upstreamedge' into hack/interim-feed-hold
Jim Morris [Wed, 31 May 2017 23:38:22 +0000 (16:38 -0700)]
Merge branch 'upstreamedge' into hack/interim-feed-hold

6 years agoMerge pull request #1195 from wolfmanjm/upstreamedge
Jim Morris [Wed, 31 May 2017 23:36:40 +0000 (16:36 -0700)]
Merge pull request #1195 from wolfmanjm/upstreamedge

Fix rectangular grid find bed, which was broken

6 years agofix error message
Jim Morris [Wed, 31 May 2017 23:35:33 +0000 (16:35 -0700)]
fix error message

6 years agoFix rectangular grid find bed, which was broken
Jim Morris [Wed, 31 May 2017 23:33:19 +0000 (16:33 -0700)]
Fix rectangular grid find bed, which was broken

6 years agoMerge pull request #1194 from wolfmanjm/upstreamedge
Jim Morris [Wed, 31 May 2017 23:04:26 +0000 (16:04 -0700)]
Merge pull request #1194 from wolfmanjm/upstreamedge

change prepare screen menu 'set home' to 'set X0Y0' to more properly …

6 years agoMerge branch 'upstreamedge' into hack/interim-feed-hold
Jim Morris [Wed, 31 May 2017 23:03:50 +0000 (16:03 -0700)]
Merge branch 'upstreamedge' into hack/interim-feed-hold

6 years agochange prepare screen menu 'set home' to 'set X0Y0' to more properly reflect what...
Jim Morris [Wed, 31 May 2017 23:02:52 +0000 (16:02 -0700)]
change prepare screen menu 'set home' to 'set X0Y0' to more properly reflect what it does and is supposed to do

6 years agoMerge branch 'upstreamedge' into hack/interim-feed-hold
Jim Morris [Wed, 31 May 2017 21:34:43 +0000 (14:34 -0700)]
Merge branch 'upstreamedge' into hack/interim-feed-hold

Conflicts:
FirmwareBin/firmware-latest.bin

6 years agoMerge pull request #1193 from wolfmanjm/upstreamedge
Jim Morris [Wed, 31 May 2017 21:24:25 +0000 (14:24 -0700)]
Merge pull request #1193 from wolfmanjm/upstreamedge

add zprobe.max_z config option

6 years agoupdate firmware-latest.bin
Jim Morris [Wed, 31 May 2017 21:18:03 +0000 (14:18 -0700)]
update firmware-latest.bin

6 years agoadd zprobe.max_z config option (falls back to gamma_max if not defined)
Jim Morris [Wed, 31 May 2017 21:16:46 +0000 (14:16 -0700)]
add zprobe.max_z config option (falls back to gamma_max if not defined)
fix delta homing for A only so Z does not move back when only homing A(BC)

6 years agoAdd ABC or E to the ? query
Jim Morris [Wed, 31 May 2017 02:50:27 +0000 (19:50 -0700)]
Add ABC or E to the ? query

6 years agofix comment typo
Jim Morris [Wed, 31 May 2017 01:46:13 +0000 (18:46 -0700)]
fix comment typo

6 years agoallow feed hold to be enabled independently of grbl mode, so in grbl mode it is set...
Jim Morris [Wed, 31 May 2017 01:43:41 +0000 (18:43 -0700)]
allow feed hold to be enabled independently of grbl mode, so in grbl mode it is set in 3d printer mode it is not set by default

6 years agoinitial attempt to implement a feedhold.
Jim Morris [Wed, 31 May 2017 01:34:05 +0000 (18:34 -0700)]
initial attempt to implement a feedhold.
  this acts like the planner queue is full, but will not pause immediately as the existing stuff in the planner queue will need to complete
  in grbl-mode ! will pause and ~ will resume

6 years agoMerge pull request #1192 from wolfmanjm/upstreamedge
Jim Morris [Wed, 31 May 2017 00:20:56 +0000 (17:20 -0700)]
Merge pull request #1192 from wolfmanjm/upstreamedge

fix G28 A0 for deltas, should be able to home just the A (or B or C) …

6 years agofix G28 A0 for deltas, should be able to home just the A (or B or C) axis
Jim Morris [Wed, 31 May 2017 00:18:51 +0000 (17:18 -0700)]
fix G28 A0 for deltas, should be able to home just the A (or B or C) axis

6 years agoMerge pull request #1191 from wolfmanjm/fix/delta-a-endstop
Jim Morris [Tue, 30 May 2017 19:36:51 +0000 (12:36 -0700)]
Merge pull request #1191 from wolfmanjm/fix/delta-a-endstop

Fix/delta a endstop

6 years agoupdate katest bin
Jim Morris [Tue, 30 May 2017 19:34:47 +0000 (12:34 -0700)]
update katest bin

6 years agoAllow ABC axis to be homed on a delta
Jim Morris [Tue, 30 May 2017 19:34:05 +0000 (12:34 -0700)]
Allow ABC axis to be homed on a delta

6 years agoMerge pull request #1189 from wolfmanjm/upstreamedge
Jim Morris [Sat, 27 May 2017 06:09:27 +0000 (23:09 -0700)]
Merge pull request #1189 from wolfmanjm/upstreamedge

remove debug printf from zprobe

6 years agoupdat firmnware
Jim Morris [Sat, 27 May 2017 06:08:07 +0000 (23:08 -0700)]
updat firmnware

6 years agoremove debug printf
Jim Morris [Sat, 27 May 2017 06:07:30 +0000 (23:07 -0700)]
remove debug printf

6 years agoMerge pull request #1188 from wolfmanjm/upstreamedge
Jim Morris [Fri, 26 May 2017 17:16:29 +0000 (10:16 -0700)]
Merge pull request #1188 from wolfmanjm/upstreamedge

reduce stack usage for  zprobes when run from panel

6 years agoFix coordinated move
Jim Morris [Thu, 25 May 2017 21:24:27 +0000 (14:24 -0700)]
Fix coordinated move

6 years agoreduce stack usage for cart grid G32 and zprobe
Jim Morris [Thu, 25 May 2017 19:43:01 +0000 (12:43 -0700)]
reduce stack usage for cart grid G32 and zprobe

6 years agoMerge pull request #1187 from wolfmanjm/upstreamedge
Jim Morris [Fri, 19 May 2017 20:09:02 +0000 (13:09 -0700)]
Merge pull request #1187 from wolfmanjm/upstreamedge

fix momentary input switch to reflect input state not toggle it

6 years agofix momentary input switch to reflect input state not toggle it
Jim Morris [Fri, 19 May 2017 19:58:50 +0000 (12:58 -0700)]
fix momentary input switch to reflect input state not toggle it

6 years agoMerge pull request #1186 from wolfmanjm/upstreamedge
Jim Morris [Fri, 19 May 2017 17:42:23 +0000 (10:42 -0700)]
Merge pull request #1186 from wolfmanjm/upstreamedge

Save state when jogging G0

6 years agoSo streaming over network dos not hog all of main loop we now issue one net command...
Jim Morris [Sun, 14 May 2017 21:31:48 +0000 (14:31 -0700)]
So streaming over network dos not hog all of main loop we now issue one net command per main loop iteration
this allows another telnet connection and/or a USB serial connection to actually get a response

6 years agodo not send > prompt for a non telnet client connection
Jim Morris [Sun, 14 May 2017 05:42:54 +0000 (22:42 -0700)]
do not send > prompt for a non telnet client connection

6 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sat, 13 May 2017 19:04:03 +0000 (12:04 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

6 years agoadd command 'switch name' to query the state of a named switch
Jim Morris [Thu, 11 May 2017 22:40:55 +0000 (15:40 -0700)]
add command 'switch name' to query the state of a named switch

6 years agoAdd an AutoPushPop and RAII style to push state and pop state on exit of scope
Jim Morris [Thu, 11 May 2017 00:50:20 +0000 (17:50 -0700)]
Add an AutoPushPop and RAII style to push state and pop state on exit of scope
Use above for the test commands so we don;t leave G0 feedrate set incorrectly

6 years agoMerge pull request #1184 from nicofouli/patch-1
Jim Morris [Wed, 10 May 2017 22:07:20 +0000 (15:07 -0700)]
Merge pull request #1184 from nicofouli/patch-1

Fix missing zprobe_offset

6 years agoFix missing zprobe_offset
Nicolas Brlt [Wed, 10 May 2017 21:33:31 +0000 (22:33 +0100)]
Fix missing zprobe_offset

I added missing zprobe_offset values in the find_bed function to avoid the probe looking for the bed outside of the print surface. Now puts correctly the probe at 0,0.

6 years agoMerge pull request #1183 from wolfmanjm/upstreamedge
Jim Morris [Wed, 10 May 2017 20:49:23 +0000 (13:49 -0700)]
Merge pull request #1183 from wolfmanjm/upstreamedge

update firmware-latest.bin

6 years agoupdate firmware-latest.bin
Jim Morris [Wed, 10 May 2017 20:48:33 +0000 (13:48 -0700)]
update firmware-latest.bin

6 years agoMerge pull request #1182 from wolfmanjm/upstreamedge
Jim Morris [Wed, 10 May 2017 20:35:29 +0000 (13:35 -0700)]
Merge pull request #1182 from wolfmanjm/upstreamedge

save state when doing z probe

6 years agowhen doing zprobes save state first then restore it
Jim Morris [Wed, 10 May 2017 20:32:34 +0000 (13:32 -0700)]
when doing zprobes save state first then restore it

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 1 May 2017 07:27:47 +0000 (00:27 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoremove old extruder config settings #defines
Jim Morris [Mon, 1 May 2017 07:27:13 +0000 (00:27 -0700)]
remove old extruder config settings #defines

7 years agoMerge pull request #1179 from jkoelker/p9_fix
Jim Morris [Fri, 28 Apr 2017 04:44:08 +0000 (21:44 -0700)]
Merge pull request #1179 from jkoelker/p9_fix

plan9: Update error string names

7 years agoplan9: Update error string names
Jason Kölker [Fri, 28 Apr 2017 01:41:44 +0000 (01:41 +0000)]
plan9: Update error string names

Several of the error names are int values defined elsewhere. Prefix them
with `P9_` to prevent `plan9.cpp:27:12: error: expected unqualified-id
 before numeric constant`.

7 years agoUpdate abc-endstop.config
Jim Morris [Wed, 26 Apr 2017 13:15:22 +0000 (06:15 -0700)]
Update abc-endstop.config

7 years agoMerge pull request #1177 from wolfmanjm/upstreamedge
Jim Morris [Mon, 24 Apr 2017 18:56:41 +0000 (11:56 -0700)]
Merge pull request #1177 from wolfmanjm/upstreamedge

update the *-latest.bin binaries

7 years agoupdate the latest bin versions
Jim Morris [Mon, 24 Apr 2017 18:55:09 +0000 (11:55 -0700)]
update the latest bin versions

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 24 Apr 2017 18:54:22 +0000 (11:54 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoupdate firmware.bin
Jim Morris [Mon, 24 Apr 2017 18:47:51 +0000 (11:47 -0700)]
update firmware.bin

7 years agoremove unused bool in temp control
Jim Morris [Sun, 23 Apr 2017 07:57:33 +0000 (00:57 -0700)]
remove unused bool in temp control

7 years agoMerge pull request #1176 from wolfmanjm/upstreamedge
Jim Morris [Sun, 23 Apr 2017 07:46:28 +0000 (00:46 -0700)]
Merge pull request #1176 from wolfmanjm/upstreamedge

allow get pos command to show A axis for E1 and B for E2

7 years agoRevert "FIx issue where a single temperature control with multiple extruders needs...
Jim Morris [Sun, 23 Apr 2017 07:44:30 +0000 (00:44 -0700)]
Revert "FIx issue where a single temperature control with multiple extruders needs to have tool 0 selected."

This reverts commit 1c9a010d073fe74288c035c790a03d296af15ad9.

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 23 Apr 2017 07:44:01 +0000 (00:44 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agoallow get pos to show A axis for E1 and B for E2, M114 still shows E instead
Jim Morris [Sun, 23 Apr 2017 07:43:10 +0000 (00:43 -0700)]
allow get pos to show A axis for E1 and B for E2, M114 still shows E instead

7 years agoFIx issue where a single temperature control with multiple extruders needs to have...
Jim Morris [Wed, 19 Apr 2017 09:09:20 +0000 (02:09 -0700)]
FIx issue where a single temperature control with multiple extruders needs to have tool 0 selected.
Now temp setting will always work regardless of which extruder is set.

7 years agoMerge pull request #1172 from wolfmanjm/upstreamedge
Jim Morris [Mon, 17 Apr 2017 23:28:08 +0000 (16:28 -0700)]
Merge pull request #1172 from wolfmanjm/upstreamedge

Make the test moves not wait for idle between iterations

7 years agoMake the etst pmoves not wait for idle between iterations, makes it smoother.
Jim Morris [Mon, 17 Apr 2017 23:25:38 +0000 (16:25 -0700)]
Make the etst pmoves not wait for idle between iterations, makes it smoother.

7 years agoMerge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 17 Apr 2017 18:07:38 +0000 (11:07 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge

7 years agofix another typo
Jim Morris [Mon, 17 Apr 2017 18:05:57 +0000 (11:05 -0700)]
fix another typo

7 years agoonly check max speeds for 3 axis
Jim Morris [Thu, 13 Apr 2017 04:38:14 +0000 (21:38 -0700)]
only check max speeds for 3 axis

7 years agoMerge pull request #1169 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 23:56:16 +0000 (16:56 -0700)]
Merge pull request #1169 from wolfmanjm/upstreamedge

FIx the size of the arc_target in the G2/G3 processing

7 years agou[date bin
Jim Morris [Wed, 12 Apr 2017 23:54:51 +0000 (16:54 -0700)]
u[date bin

7 years agofix arc_target size for G2/G3
Jim Morris [Wed, 12 Apr 2017 23:53:59 +0000 (16:53 -0700)]
fix arc_target size for G2/G3

7 years agoMerge pull request #1168 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 19:03:59 +0000 (12:03 -0700)]
Merge pull request #1168 from wolfmanjm/upstreamedge

fix the limit stop direction report

7 years agofix the limit stop direction report
Jim Morris [Wed, 12 Apr 2017 18:45:03 +0000 (11:45 -0700)]
fix the limit stop direction report

7 years agoMerge pull request #1167 from wolfmanjm/upstreamedge
Jim Morris [Wed, 12 Apr 2017 18:32:09 +0000 (11:32 -0700)]
Merge pull request #1167 from wolfmanjm/upstreamedge

fix some inchmode issues when homing