adrianjobst [Wed, 6 Dec 2017 21:45:49 +0000 (22:45 +0100)]
moved dwell time to the begining of the function, so the if clause will not cancell the function before the dwell ever happened
Jim Morris [Mon, 20 Nov 2017 09:54:16 +0000 (09:54 +0000)]
Merge pull request #1237 from cilynx/fix/spindle_analog_report_speed
Report actual RPM and PWM instead of just target
Randy C. Will [Sun, 19 Nov 2017 22:03:54 +0000 (14:03 -0800)]
Report actual RPM and PWM instead of just target
The way `report_speed` was implemented, `M957` shows `target_rpm` as the
"Current RPM" and then calculates the PWM "Analog value" from there.
Because `turn_off` uses `update_pwm(0)` to turn off the output signal
without clobbering the `target_rpm` set by `M3`, if you `turn_off` the
spindle (via `M5`, a `HALT` state, etc), `M957` (`report_speed`)
incorrectly continues to report the old "Current RPM" and calculated
"Analog value" even thought the PWM signal has actually been cut off.
I turned this around so `report_speed` reads the real PWM ("Analog
value") being sent out `pwm_pin` and then calculates the real "Current
RPM" from there. I also appended a new "Target RPM" field to the
`report_speed` output containing `target_rpm`.
Tested over USB serial with `M597`, `M3`, `M5`, `M112`, `M999`, `^X`,
and `$X`.
Jim Morris [Sun, 19 Nov 2017 20:53:57 +0000 (20:53 +0000)]
Merge pull request #1236 from cilynx/fix/spindle_off_on_halt
Fix/spindle off on halt
Randy C. Will [Sun, 19 Nov 2017 20:41:11 +0000 (12:41 -0800)]
Add spindle.ignore_on_halt to config sample snippet
Randy C. Will [Sun, 19 Nov 2017 20:35:55 +0000 (12:35 -0800)]
Consolidate common spindle functions
Doing the exact same event registration in every sub-module isn't very
DRY and could lead to inadvertent missed registrations in new
sub-modules. Consolidating the registrations into `SpindleMaker`.
Randy C. Will [Sun, 19 Nov 2017 19:19:59 +0000 (11:19 -0800)]
Stop spindle on HALT
When a machine enters a `HALT` state for any reason, the spindle should
stop for safety along with everything else. This commit changes the
default behavior to `turn_off` the spindle `on_halt`. I added an
optional `spindle.ignore_on_halt` config parameter that defaults to
`false` in case anyone needs the previous less-safe behavior.
I believe this addresses #1069.
I confirmed functionality on `PWMSpindleControl` via `M957` as well as a
physical scope while causing `HALT` via `M112` or `^X` over the serial
interface.
I found some weirdness in `AnalogSpindleControl` around `report_speed`,
but I'll address that in another PR. I did confirm that `turn_off` is
being called `on_halt` as it should be and the PWM duty cycle is reduced
to 0 even though `M957` (`report_speed`) continues to report that the
spindle is moving.
Without having the equipment for the other side of the RS485 connection,
I can't do much to test `ModbusSpindleContol`, but
`HuanyangSpindleControl`, the only supported Modbus VFD right now,
implements `turn_off`, so I don't see any reason it shouldn't work fine
with this change.
Jim Morris [Sat, 18 Nov 2017 21:02:14 +0000 (21:02 +0000)]
update cnc firmware latest
Jim Morris [Sat, 18 Nov 2017 20:56:47 +0000 (20:56 +0000)]
move spindle.config
Jim Morris [Sat, 18 Nov 2017 20:28:39 +0000 (20:28 +0000)]
Merge pull request #1235 from cilynx/feature/spindle_max_pwm
Feature/spindle max pwm
Randy C. Will [Sat, 18 Nov 2017 20:03:37 +0000 (12:03 -0800)]
Feature/spindle max pwm
Treadmill motor controllers are becoming increasingly popular in DIY
machines. One such popular controller is the mc2100 which expects a
duty cycle of 0-85% for 0-100% speed. To keep the PWM signal below the
controller maximum and thus prevent the controller from going into an
error state when higher speeds than physically possible are requested,
we need a config option for the ceiling on the PWM signal.
I tested this for backwards compatibility with my original configuration
without this new parameter included and it works as expected, using 100%
as the maximum duty cycle.
I tested setting `spindle.max_pwm` to 0.85 (above the hard-coded 0.5
starting point) and 0.25 (below the hard-coded 0.5 starting point) and
confirmed expected function for both via M957 output and viewing the
physical PWM output with a scope.
I added a sample `spindle.config` showing this new parameter in context
with the other spindle parameters I could find with a quick grep of the
code and search through the docs.
Jim Morris [Sat, 18 Nov 2017 10:18:13 +0000 (10:18 +0000)]
Merge pull request #1234 from cilynx/fix/get_pid_settings
Align get_pid_settings() with report_settings()
Jim Morris [Sat, 18 Nov 2017 10:17:52 +0000 (10:17 +0000)]
Merge pull request #1233 from cilynx/fix/spindle_on
Remove conflicting bool spindle_on
Randy C. Will [Sat, 18 Nov 2017 06:46:08 +0000 (22:46 -0800)]
Align get_pid_settings() with report_settings()
In the handler for M958 in `SpindleControl`, a function,
`get_pid_settings()`, is called which does not appear to exist beyond
its virtual initialization also in `SpindleControl`. Because this
function does not really exist, M958 does not return any PID data.
`PWMSpindleControl` contains a function `report_settings()`, which
prints the PID data one would expect from M958. Replacing
`SpindleControl`'s references to the non-existent `get_pid_settings()`
with `report_setting()` causes M958 to return PID data as expected.
Randy C. Will [Sat, 18 Nov 2017 06:19:09 +0000 (22:19 -0800)]
Remove conflicting bool spindle_on
Bool `spindle_on` is initialized in `SpindleControl` and is shared
between `SpindleControl` and whichever control method (PWM, Modbus,
Huanyang, or Analog) is configured.
Initializing `spindle_on` in `PWMSpindleControl` as well clobbers the
shared variable and leads to `SpindleControl` and `PWMSpingleControl`
having different values for `spindle_on` and thus the spindle is never
actually turned on when sending M3 commands.
This can be confirmed via M957 which will always show that the current
PWM is 0, no matter what the current and target RPM.
Removing this superfluous initializion causes `spindle_on` from
`SpindleControl` to be shared as expeced and the module then works as
can be confirmed with M957 showing appropriate PWM values responding to
current and target RPM.
Jim Morris [Sun, 29 Oct 2017 15:31:58 +0000 (15:31 +0000)]
Merge pull request #1230 from oddstr13/edge
Added COPYING file
Odd Stråbø [Tue, 24 Oct 2017 20:10:31 +0000 (22:10 +0200)]
Added COPYING file
Jim Morris [Tue, 17 Oct 2017 20:24:46 +0000 (21:24 +0100)]
update firmware.bin
Jim Morris [Fri, 13 Oct 2017 12:25:01 +0000 (13:25 +0100)]
update latest bins (same as normal bin)
Jim Morris [Fri, 13 Oct 2017 12:21:39 +0000 (13:21 +0100)]
update firmware.bin
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
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.
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
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
Jim Morris [Fri, 22 Sep 2017 11:33:50 +0000 (12:33 +0100)]
Fix laser power read when pwm is inverted
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
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
Jeff Rodriguez [Sun, 17 Sep 2017 03:04:30 +0000 (20:04 -0700)]
Merged with current edge.
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.
David Robertson [Fri, 1 Sep 2017 19:11:32 +0000 (20:11 +0100)]
Add configuration option kill_button_poll_frequency, see #1212.
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
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.
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
sdavi [Sun, 16 Jul 2017 23:42:59 +0000 (09:42 +1000)]
Updated float comparison
sdavi [Sun, 16 Jul 2017 05:58:33 +0000 (15:58 +1000)]
Dwell before probing
Adds a configurable delay before probing
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
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
Jim Morris [Thu, 22 Jun 2017 04:07:35 +0000 (21:07 -0700)]
Merge pull request #1201 from wolfmanjm/upstreamedge
update firmware-latest
Jim Morris [Thu, 22 Jun 2017 04:06:18 +0000 (21:06 -0700)]
update firmware-latest
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
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
Jim Morris [Tue, 20 Jun 2017 18:20:14 +0000 (11:20 -0700)]
also fix cart grid
Jim Morris [Tue, 20 Jun 2017 18:10:10 +0000 (11:10 -0700)]
close and reopen file every 400 bytes to avoid corruption
Jim Morris [Mon, 5 Jun 2017 04:36:39 +0000 (21:36 -0700)]
Merge remote-tracking branch 'upstream/edge' into hack/interim-feed-hold
Jim Morris [Mon, 5 Jun 2017 04:34:55 +0000 (21:34 -0700)]
Update config
Jim Morris [Mon, 5 Jun 2017 04:34:23 +0000 (21:34 -0700)]
Update config
Jim Morris [Mon, 5 Jun 2017 04:34:01 +0000 (21:34 -0700)]
Update config
Jim Morris [Mon, 5 Jun 2017 04:33:05 +0000 (21:33 -0700)]
Update config
Jim Morris [Mon, 5 Jun 2017 04:32:31 +0000 (21:32 -0700)]
Update config
Jim Morris [Mon, 5 Jun 2017 04:31:41 +0000 (21:31 -0700)]
Update config
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:
Jim Morris [Wed, 31 May 2017 23:38:22 +0000 (16:38 -0700)]
Merge branch 'upstreamedge' into hack/interim-feed-hold
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
Jim Morris [Wed, 31 May 2017 23:35:33 +0000 (16:35 -0700)]
fix error message
Jim Morris [Wed, 31 May 2017 23:33:19 +0000 (16:33 -0700)]
Fix rectangular grid find bed, which was broken
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 …
Jim Morris [Wed, 31 May 2017 23:03:50 +0000 (16:03 -0700)]
Merge branch 'upstreamedge' into hack/interim-feed-hold
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
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
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
Jim Morris [Wed, 31 May 2017 21:18:03 +0000 (14:18 -0700)]
update firmware-latest.bin
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)
Jim Morris [Wed, 31 May 2017 02:50:27 +0000 (19:50 -0700)]
Add ABC or E to the ? query
Jim Morris [Wed, 31 May 2017 01:46:13 +0000 (18:46 -0700)]
fix comment typo
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
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
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) …
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
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
Jim Morris [Tue, 30 May 2017 19:34:47 +0000 (12:34 -0700)]
update katest bin
Jim Morris [Tue, 30 May 2017 19:34:05 +0000 (12:34 -0700)]
Allow ABC axis to be homed on a delta
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
Jim Morris [Sat, 27 May 2017 06:08:07 +0000 (23:08 -0700)]
updat firmnware
Jim Morris [Sat, 27 May 2017 06:07:30 +0000 (23:07 -0700)]
remove debug printf
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
Jim Morris [Thu, 25 May 2017 21:24:27 +0000 (14:24 -0700)]
Fix coordinated move
Jim Morris [Thu, 25 May 2017 19:43:01 +0000 (12:43 -0700)]
reduce stack usage for cart grid G32 and zprobe
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
Jim Morris [Fri, 19 May 2017 19:58:50 +0000 (12:58 -0700)]
fix momentary input switch to reflect input state not toggle it
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
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
Jim Morris [Sun, 14 May 2017 05:42:54 +0000 (22:42 -0700)]
do not send > prompt for a non telnet client connection
Jim Morris [Sat, 13 May 2017 19:04:03 +0000 (12:04 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
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
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
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
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.
Jim Morris [Wed, 10 May 2017 20:49:23 +0000 (13:49 -0700)]
Merge pull request #1183 from wolfmanjm/upstreamedge
update firmware-latest.bin
Jim Morris [Wed, 10 May 2017 20:48:33 +0000 (13:48 -0700)]
update firmware-latest.bin
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
Jim Morris [Wed, 10 May 2017 20:32:34 +0000 (13:32 -0700)]
when doing zprobes save state first then restore it
Jim Morris [Mon, 1 May 2017 07:27:47 +0000 (00:27 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 1 May 2017 07:27:13 +0000 (00:27 -0700)]
remove old extruder config settings #defines
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
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`.
Jim Morris [Wed, 26 Apr 2017 13:15:22 +0000 (06:15 -0700)]
Update abc-endstop.config
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
Jim Morris [Mon, 24 Apr 2017 18:55:09 +0000 (11:55 -0700)]
update the latest bin versions
Jim Morris [Mon, 24 Apr 2017 18:54:22 +0000 (11:54 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 24 Apr 2017 18:47:51 +0000 (11:47 -0700)]
update firmware.bin