clinton/Smoothieware.git
7 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

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

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

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

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

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

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

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

7 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

7 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

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

7 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

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

7 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

7 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

7 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

7 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

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

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

7 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

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

7 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

7 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

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

7 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

7 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

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

7 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

7 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

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

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

7 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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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

7 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

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

7 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

7 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

7 years agofix some inchmode issues when homing
Jim Morris [Wed, 12 Apr 2017 17:55:18 +0000 (10:55 -0700)]
fix some inchmode issues when homing

7 years agoMerge pull request #1164 from wolfmanjm/upstreamedge
Jim Morris [Mon, 10 Apr 2017 19:56:00 +0000 (12:56 -0700)]
Merge pull request #1164 from wolfmanjm/upstreamedge

change goto park issues in mm or inches depends on setting instead of…

7 years agochange goto park issues in mm or inches depends on setting instead of switching to...
Jim Morris [Mon, 10 Apr 2017 19:54:12 +0000 (12:54 -0700)]
change goto park issues in mm or inches depends on setting instead of switching to mm mode for the move

7 years agoMerge pull request #1163 from wolfmanjm/upstreamedge
Jim Morris [Mon, 10 Apr 2017 06:34:52 +0000 (23:34 -0700)]
Merge pull request #1163 from wolfmanjm/upstreamedge

rename bins

7 years agorename bins
Jim Morris [Mon, 10 Apr 2017 06:33:04 +0000 (23:33 -0700)]
rename bins

7 years agoMerge pull request #1162 from Smoothieware/feature/homing-alarm
Jim Morris [Sat, 8 Apr 2017 02:21:24 +0000 (19:21 -0700)]
Merge pull request #1162 from Smoothieware/feature/homing-alarm

Feature/homing alarm

7 years agoAllow ? to show realtime coordinates when homing
Jim Morris [Sat, 8 Apr 2017 00:38:37 +0000 (17:38 -0700)]
Allow ? to show realtime coordinates when homing

7 years agoAdd an alarm if homing did not hit the endstops
Jim Morris [Fri, 7 Apr 2017 23:56:43 +0000 (16:56 -0700)]
Add an alarm if homing did not hit the endstops
fix ALARM: messages for grbl (it uses a space)
Attempt to fix halt condition detection in conveyor

7 years agoMerge pull request #1161 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 22:27:35 +0000 (15:27 -0700)]
Merge pull request #1161 from wolfmanjm/upstreamedge

update hires bins

7 years agoupdate hires bins
Jim Morris [Fri, 7 Apr 2017 22:25:42 +0000 (15:25 -0700)]
update hires bins

7 years agoMerge pull request #1160 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 22:20:55 +0000 (15:20 -0700)]
Merge pull request #1160 from wolfmanjm/upstreamedge

optimize print_position to use string and reduce stack usage.

7 years agooptimize print_position to use string and reduce stack usage.
Jim Morris [Fri, 7 Apr 2017 22:17:53 +0000 (15:17 -0700)]
optimize print_position to use string and reduce stack usage.

7 years agoMerge pull request #1158 from wolfmanjm/upstreamedge
Jim Morris [Fri, 7 Apr 2017 19:56:36 +0000 (12:56 -0700)]
Merge pull request #1158 from wolfmanjm/upstreamedge

Optimize stack usage for probe commands

7 years agoOptimize stack usage for probe commands
Jim Morris [Fri, 7 Apr 2017 19:45:54 +0000 (12:45 -0700)]
Optimize stack usage for probe commands

7 years agoMerge pull request #1156 from Smoothieware/stepticker/use-64bit-fixed-point
Jim Morris [Thu, 6 Apr 2017 21:04:07 +0000 (14:04 -0700)]
Merge pull request #1156 from Smoothieware/stepticker/use-64bit-fixed-point

use 64bit fixed point for acceleration and step ticker accumulators

7 years agocleanup header files
Jim Morris [Thu, 6 Apr 2017 18:04:33 +0000 (11:04 -0700)]
cleanup header files

7 years agoupdate bins
Jim Morris [Wed, 5 Apr 2017 22:37:39 +0000 (15:37 -0700)]
update bins

7 years agorefactor...
Jim Morris [Wed, 5 Apr 2017 22:34:54 +0000 (15:34 -0700)]
refactor...
  rename HeapRing to BlockQueue
  remove templates and make it Block specific
  as it is now only used for the Planner queue and allocates its queue in AHB0

7 years agocover other allocatin in heapring
Jim Morris [Wed, 5 Apr 2017 08:06:03 +0000 (01:06 -0700)]
cover other allocatin in heapring

7 years agochange allocation to new[]
Jim Morris [Wed, 5 Apr 2017 07:42:08 +0000 (00:42 -0700)]
change allocation to new[]

7 years agoAllocate block queue blocks in AHB0, and tickinfo in main memory
Jim Morris [Wed, 5 Apr 2017 07:37:07 +0000 (00:37 -0700)]
Allocate block queue blocks in AHB0, and tickinfo in main memory

7 years agoupdate hires firmware images
Jim Morris [Wed, 5 Apr 2017 06:48:19 +0000 (23:48 -0700)]
update hires firmware images

7 years agoMerge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point
Jim Morris [Wed, 5 Apr 2017 06:28:10 +0000 (23:28 -0700)]
Merge remote-tracking branch 'upstream/edge' into stepticker/use-64bit-fixed-point

Conflicts:
fast-stream.py

7 years agoadd test for out of memory when allocating tickinfo
Jim Morris [Wed, 5 Apr 2017 06:04:38 +0000 (23:04 -0700)]
add test for out of memory when allocating tickinfo
add tickinfo size to mem

7 years agomove the tick_info array into AHB0 to save memory
Jim Morris [Wed, 5 Apr 2017 05:59:35 +0000 (22:59 -0700)]
move the tick_info array into AHB0 to save memory

7 years agooptimize 64bit fixed point usage
Jim Morris [Wed, 5 Apr 2017 05:39:19 +0000 (22:39 -0700)]
optimize 64bit fixed point usage