James Richters [Mon, 23 Apr 2018 17:31:37 +0000 (13:31 -0400)]
Initialize invert_probe
James Richters [Mon, 23 Apr 2018 17:11:42 +0000 (13:11 -0400)]
Set invert_probe only once conditionally for G38.x commands
James Richters [Mon, 23 Apr 2018 16:55:08 +0000 (12:55 -0400)]
Always set invert_probe back to false when finished.
James Richters [Mon, 23 Apr 2018 16:49:29 +0000 (12:49 -0400)]
Remove condition and set invet_probe to false for all G38 gcodes-- it's already set to false for all Gcodes from 29 to 32 on line 259
James Richters [Mon, 23 Apr 2018 16:36:31 +0000 (12:36 -0400)]
Remove un-nessecary code
James Richters [Mon, 23 Apr 2018 14:27:48 +0000 (10:27 -0400)]
Initialize invert_probe for any command that is not G38.x
James Richters [Mon, 23 Apr 2018 14:15:50 +0000 (10:15 -0400)]
Simplify logic of probe already triggered
James Richters [Mon, 23 Apr 2018 14:06:24 +0000 (10:06 -0400)]
Use invert_probe bit
James Richters [Mon, 23 Apr 2018 12:02:29 +0000 (08:02 -0400)]
Remove Diagnostic Output
James Richters [Mon, 23 Apr 2018 11:59:42 +0000 (07:59 -0400)]
Test G38.4 and G38.5 with output to confirm when pin inversion happens
Jim Morris [Sat, 21 Apr 2018 07:31:49 +0000 (08:31 +0100)]
Merge pull request #1316 from cilynx/fix/example_config_zprobe_debounce
Update sample configs for proper debounce entry
Randy C. Will [Fri, 20 Apr 2018 23:29:57 +0000 (16:29 -0700)]
Update sample configs for proper debounce entry
While the Endstop module supports both `debounce_count` and
`debounce_ms`, the ZProbe module supports only `debounce_count`.
https://github.com/Smoothieware/Smoothieware/blob/edge/src/modules/tools/endstops/Endstops.cpp
https://github.com/Smoothieware/Smoothieware/blob/edge/src/modules/tools/zprobe/ZProbe.cpp
This commit updates all of the sample config files that included
`zprobe.debounce_count` to use `zprobe.debounce_ms` instead.
Jim Morris [Thu, 19 Apr 2018 08:41:41 +0000 (09:41 +0100)]
Merge pull request #1314 from lordofhyphens/nosend-comment
Fixed bug where newlines were stripped by accident by putting them back in
Joseph Lenox [Wed, 18 Apr 2018 23:34:48 +0000 (18:34 -0500)]
Fixed bug where newlines were stripped by accident by putting them back in.
Jim Morris [Wed, 18 Apr 2018 20:34:31 +0000 (21:34 +0100)]
Merge pull request #1289 from wolfmanjm/feature/add-xy-maxspeed
Add max_speed parameter and M203 Sxxx to set maximum feedrate
Jim Morris [Wed, 18 Apr 2018 20:28:18 +0000 (21:28 +0100)]
Merge branch 'upstreamedge' into feature/add-xy-maxspeed
Jim Morris [Wed, 18 Apr 2018 13:25:13 +0000 (14:25 +0100)]
Merge pull request #1311 from lordofhyphens/nosend-comment
Suppresses sending GCode comments to printer with smoothie-stream.
Joseph Lenox [Wed, 18 Apr 2018 13:14:00 +0000 (08:14 -0500)]
Fixed accidental deletion of waiting.
Joseph Lenox [Wed, 18 Apr 2018 03:55:03 +0000 (22:55 -0500)]
Suppresses sending GCode comments (text after ;) to printer with smoothie-stream. YAGNI.
Jim Morris [Wed, 11 Apr 2018 20:44:19 +0000 (21:44 +0100)]
Merge pull request #1307 from wolfmanjm/upstreamedge
clean up defines of vector when not actually used
Jim Morris [Wed, 11 Apr 2018 20:41:48 +0000 (21:41 +0100)]
clean up defines of vector when not actually used
Jim Morris [Wed, 11 Apr 2018 18:32:48 +0000 (19:32 +0100)]
Merge pull request #1306 from wolfmanjm/upstreamedge
save some memory in endstops
Jim Morris [Wed, 11 Apr 2018 18:28:28 +0000 (19:28 +0100)]
save some memory by using shrink_to_fit on the homing arrays
Jim Morris [Wed, 11 Apr 2018 17:58:00 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 11 Apr 2018 17:57:14 +0000 (18:57 +0100)]
Merge pull request #1305 from Smoothieware/fix/homing-ABC
Allow non contiguous definition of ABC homing endstops
Jim Morris [Wed, 11 Apr 2018 14:00:29 +0000 (15:00 +0100)]
fix control X from serial uart
Jim Morris [Wed, 11 Apr 2018 13:23:42 +0000 (14:23 +0100)]
disable endstos if there is a configuration error
Jim Morris [Wed, 11 Apr 2018 12:33:19 +0000 (13:33 +0100)]
make sure we define extruders before endstops for obscure reasons
Jim Morris [Wed, 11 Apr 2018 12:31:41 +0000 (13:31 +0100)]
protect against defining a homing endstop when the motor/actuator is not defined
Jim Morris [Wed, 11 Apr 2018 11:05:14 +0000 (12:05 +0100)]
Make sure we only handle homing axis that have been correctly defined
Jim Morris [Wed, 11 Apr 2018 10:46:35 +0000 (11:46 +0100)]
Allow non contigous definition of ABC homing endstops
Jim Morris [Thu, 5 Apr 2018 12:48:42 +0000 (13:48 +0100)]
fix typo
Jim Morris [Wed, 4 Apr 2018 15:52:50 +0000 (16:52 +0100)]
update latest bins
Jim Morris [Wed, 4 Apr 2018 15:45:15 +0000 (16:45 +0100)]
Merge pull request #1301 from wolfmanjm/add/temps_to_query
add temp readings to query format (replace M105)
Jim Morris [Wed, 4 Apr 2018 14:26:14 +0000 (15:26 +0100)]
add temp readings to query format (replace M105)
Jim Morris [Tue, 3 Apr 2018 20:58:11 +0000 (21:58 +0100)]
Merge pull request #1300 from wolfmanjm/upstreamedge
fix some error: strings when in grbl mode
Jim Morris [Tue, 3 Apr 2018 20:56:29 +0000 (21:56 +0100)]
fix some error: strings when in grbl mode
If in alarm state ignore line not each multiple gcode on line
Jim Morris [Tue, 3 Apr 2018 20:24:01 +0000 (21:24 +0100)]
Merge pull request #1299 from wolfmanjm/upstreamedge
Fix M115 format to match reprap.org specs
Jim Morris [Tue, 3 Apr 2018 20:22:28 +0000 (21:22 +0100)]
FIx M115 format as per reprap.org specs.
Jim Morris [Sat, 31 Mar 2018 10:35:39 +0000 (11:35 +0100)]
add comment
Jim Morris [Sat, 31 Mar 2018 10:32:57 +0000 (11:32 +0100)]
remove the ARC epsilon define
Jim Morris [Sat, 31 Mar 2018 10:27:52 +0000 (11:27 +0100)]
Merge pull request #1296 from Zaaphod/Use_Arc_Milestone
Use arc_milestone
James Richters [Sat, 31 Mar 2018 00:56:35 +0000 (20:56 -0400)]
Cleanup and add comments
James Richters [Sat, 31 Mar 2018 00:17:19 +0000 (20:17 -0400)]
Remove Report for testing
James Richters [Fri, 30 Mar 2018 23:31:31 +0000 (19:31 -0400)]
Use Arc_Milestone for arc calculations - improve accuracy of rt_axis0 and rt_axis1
Also added more tests for comparison in the temporary report
James Richters [Fri, 30 Mar 2018 20:51:44 +0000 (16:51 -0400)]
Put diagnostic info back in
James Richters [Fri, 30 Mar 2018 20:48:48 +0000 (16:48 -0400)]
Merge remote-tracking branch 'Smoothieware/edge' into Arc_Diagnosetic2
Jim Morris [Fri, 30 Mar 2018 19:16:47 +0000 (20:16 +0100)]
Merge pull request #1295 from Smoothieware/add/arc_milestone
added arc_milestone
Jim Morris [Fri, 30 Mar 2018 19:15:04 +0000 (20:15 +0100)]
added arc_milestone
Jim Morris [Fri, 30 Mar 2018 10:38:29 +0000 (11:38 +0100)]
Merge pull request #1294 from wolfmanjm/upstreamedge
revert PR #1293
Jim Morris [Fri, 30 Mar 2018 10:35:30 +0000 (11:35 +0100)]
Revert "Merge pull request #1293 from Zaaphod/Missing_Arcs"
This reverts commit
2ed924ed1e5bc6ae2f341f8c22ec3bf3c85c6476, reversing
changes made to
573ed7c0c719008075acb1d36850e718a2707372.
Jim Morris [Fri, 30 Mar 2018 10:29:35 +0000 (11:29 +0100)]
Revert "Update Robot.cpp"
This reverts commit
402a31afb0efab312e3fc2e51d6b3954246c9631.
Jim Morris [Fri, 30 Mar 2018 09:00:03 +0000 (10:00 +0100)]
Update Robot.cpp
replace and with &&
Jim Morris [Fri, 30 Mar 2018 08:58:17 +0000 (09:58 +0100)]
Merge pull request #1293 from Zaaphod/Missing_Arcs
Improvements to G2/G3 Arcs
James Richters [Thu, 29 Mar 2018 22:06:36 +0000 (18:06 -0400)]
Remove diagnostic output to console and add comments
James Richters [Wed, 28 Mar 2018 12:24:27 +0000 (08:24 -0400)]
Add test tor full circles and only perform atan2 if not a full circle. fix correction for atan2 to prevent accidental giant circles
Modify dignostic output and perform both old and new atan corrections to see the difference.
Jim Morris [Tue, 27 Mar 2018 14:26:14 +0000 (15:26 +0100)]
fix offset
Jim Morris [Tue, 27 Mar 2018 14:06:47 +0000 (15:06 +0100)]
actually improve the probe result panel screen
James Richters [Mon, 26 Mar 2018 23:51:31 +0000 (19:51 -0400)]
Diagnostic variables sent to console for evaluation
Jim Morris [Mon, 26 Mar 2018 20:48:14 +0000 (21:48 +0100)]
clean up cnc panel probe output
Jim Morris [Fri, 23 Mar 2018 09:16:43 +0000 (09:16 +0000)]
Add max_speed parameter and M203 Sxxx to set maximum feedrate
Jim Morris [Tue, 13 Mar 2018 18:48:28 +0000 (18:48 +0000)]
call on_idle
fixes issue #1286
Jim Morris [Thu, 8 Mar 2018 11:24:27 +0000 (11:24 +0000)]
Update config
Jim Morris [Wed, 7 Mar 2018 20:22:28 +0000 (20:22 +0000)]
Merge pull request #1282 from wolfmanjm/upstreamedge
Allow G38 to do arbitrary move to xyz
Jim Morris [Wed, 7 Mar 2018 20:08:13 +0000 (20:08 +0000)]
Allow G38 to do arbitrary move to xyz
Jim Morris [Wed, 7 Mar 2018 14:57:12 +0000 (14:57 +0000)]
Merge pull request #1281 from wolfmanjm/upstreamedge
fix percent complete for panels
Jim Morris [Wed, 7 Mar 2018 14:55:08 +0000 (14:55 +0000)]
FIx percent progress for panels
Jim Morris [Mon, 5 Mar 2018 14:52:40 +0000 (14:52 +0000)]
fix up some style issues in the laser PR
Jim Morris [Mon, 5 Mar 2018 14:50:08 +0000 (14:50 +0000)]
Merge pull request #1278 from wolfmanjm/upstreamedge
fix bad formatting from laser PR
Jim Morris [Mon, 5 Mar 2018 14:47:35 +0000 (14:47 +0000)]
fix bad formattingfrom PR
Jim Morris [Mon, 5 Mar 2018 14:20:16 +0000 (14:20 +0000)]
Merge pull request #1277 from nuclearcat/edge
Add more safety to laser testing by optional duration parameter and s…
Denys Fedoryshchenko [Mon, 5 Mar 2018 00:10:29 +0000 (02:10 +0200)]
Fixing compile warnings, sorry
Denys Fedoryshchenko [Mon, 5 Mar 2018 00:04:53 +0000 (02:04 +0200)]
Properly handling when PWM frequency is slower than 1khz
Denys Fedoryshchenko [Sun, 4 Mar 2018 04:22:02 +0000 (06:22 +0200)]
Add more safety to laser testing by optional duration parameter and status query
Jim Morris [Fri, 2 Mar 2018 11:22:15 +0000 (11:22 +0000)]
update latest bins
Jim Morris [Fri, 2 Mar 2018 11:20:11 +0000 (11:20 +0000)]
Merge pull request #1276 from wolfmanjm/upstreamedge
return Error on exceeding soft limit
Jim Morris [Fri, 2 Mar 2018 11:17:47 +0000 (11:17 +0000)]
return Error on exceeding soft limit
Jim Morris [Thu, 1 Mar 2018 22:33:22 +0000 (22:33 +0000)]
Merge pull request #1149 from Smoothieware/feature/soft-endstops
Feature/soft endstops
Jim Morris [Thu, 1 Mar 2018 16:26:57 +0000 (16:26 +0000)]
Merge pull request #1274 from ahmetipkin/edge
Compansation dampening functionality is added
Ipkin, Ahmet [Thu, 1 Mar 2018 16:13:45 +0000 (17:13 +0100)]
Fixed indentation and braces
Ipkin, Ahmet [Thu, 1 Mar 2018 15:25:09 +0000 (16:25 +0100)]
Deleted the bogus files.
Ipkin, Ahmet [Thu, 1 Mar 2018 14:44:01 +0000 (15:44 +0100)]
Made the Compansation Dampening as optional
If the config values are not set; the compansation dampening is shut down; so the compansation is applied everywhere - like the old behaviour
If you want to enable it; you should define both of
leveling-strategy.rectangular-grid.height_limit
leveling-strategy.rectangular-grid.dampening_start
configs.
Jim Morris [Thu, 1 Mar 2018 08:53:56 +0000 (08:53 +0000)]
Merge pull request #1275 from Zaaphod/Probe-G20
Display results of probe in inches if in G20 mode
James Richters [Thu, 1 Mar 2018 02:48:30 +0000 (21:48 -0500)]
Display results of probe in inches if in G20 mode
Ahmet Ipkin [Thu, 1 Mar 2018 02:02:32 +0000 (03:02 +0100)]
Added compensation degragation function for rectangular grid
Now the compensation is not applied always - rather is applied only for limited amount (like Repetier firmware does). In order to configure it, you add two new configs:
leveling-strategy.rectangular-grid.height_limit <height_limit>
leveling-strategy.rectangular-grid.dampening_start <start limit>
Basically what it does is; until Z axis is below 'start limit', any compensation that would be applied is applied as is (full power). However, after this 'start limit' is hit, until 'height limit' is reached, the compensation is dampened gradually (linearly) from full power to none (i.e. no compensation after 'height limit' is passed)
Main reason for this is: we generally use Mesh bed leveling for compensating our non-flat beds; but generally after first few layers; the extruded plastic can cover for this bent; and it is no longer needed.
Jim Morris [Mon, 26 Feb 2018 17:31:46 +0000 (17:31 +0000)]
fix merge
Merge remote-tracking branch 'upstream/edge' into feature/soft-endstops
Jim Morris [Mon, 26 Feb 2018 17:04:05 +0000 (17:04 +0000)]
Merge remote-tracking branch 'upstream/edge' into feature/soft-endstops
Jim Morris [Mon, 26 Feb 2018 11:26:41 +0000 (11:26 +0000)]
update latest bins
Jim Morris [Sun, 25 Feb 2018 20:49:46 +0000 (20:49 +0000)]
Merge pull request #1272 from wolfmanjm/upstreamedge
fix arc generation for tiny arcs
Jim Morris [Sun, 25 Feb 2018 20:44:40 +0000 (20:44 +0000)]
fix arc generation for tiny arcs
Jim Morris [Tue, 20 Feb 2018 14:51:18 +0000 (14:51 +0000)]
Merge pull request #1270 from wolfmanjm/upstreamedge
fix usbdevice.
Jim Morris [Tue, 20 Feb 2018 14:48:16 +0000 (14:48 +0000)]
fix typos in USBdevice
Jim Morris [Tue, 20 Feb 2018 14:46:08 +0000 (14:46 +0000)]
make query new format the default
Jim Morris [Sat, 17 Feb 2018 09:05:08 +0000 (09:05 +0000)]
Merge pull request #1269 from cilynx/feature/m115_get_firmware_version
Add M115 Get Firmware Version
Randy C. Will [Sat, 17 Feb 2018 01:28:32 +0000 (17:28 -0800)]
Add M115 Get Firmware Version
I based this implementation on the existing `version` command in
SimpleShell as well as looking what the other players are doing with
M115:
http://reprap.org/wiki/G-code#M115:_Get_Firmware_Version_and_Capabilities
http://marlinfw.org/docs/gcode/M115.html
https://duet3d.com/wiki/G-code#M115:_Get_Firmware_Version_and_Capabilities
I did not bring MCU over from `version` as I felt there would be too
much code duplication / complexity for too little gain. The M115 output
from my test branch looks like this:
FIRMWARE_NAME:Smoothieware, FIRMWARE_URL:http://smoothieware.org,
SOURCE_CODE_URL:https://github.com/Smoothieware/Smoothieware,
FIRMWARE_VERSION:feature/m115_get_firmware_version-
8d5ff26,
BUILD_DATE:Feb 16 2018 17:11:15, SYSTEM_CLOCK:100MHz, AXES:3, CNC:1,
MSD:1
ok
Of course FIRMWARE_VERSION will look better when it's `edge` as opposed
to my overly long branch name.
I arbitrarily followed Marlin's example of leaving colons in the value
of the k-v pair as a problem for the parser instead of URL encoding them
like RepRap or avoiding them entirely like Duet3d. I'm not married to
this, so if there's a preference for another direction, I'm open.
If accepted, I believe this fixes #279.
Jim Morris [Fri, 9 Feb 2018 17:03:10 +0000 (17:03 +0000)]
Merge pull request #1267 from cilynx/fix/spindle_pid_tuning
Fix M958 Set Spindle PID Parameters
Randy C. Will [Fri, 9 Feb 2018 16:49:18 +0000 (08:49 -0800)]
Fix M958 Set Spindle PID Parameters
Original code sets the P term to any values provided for P, I, or D with
no way to set I or D terms. This change sets I and D correctly as one
would expect when I and D are passed to M958. The set_i_term() and
set_d_term() functions already existed, so the layout in
on_gcode_received() was likely a simple oversight by the original
author.
I tested this change on the bench with a Smoothieboard driving an MC2100
DC controller hooked up to a 2HP treadmill motor. Prior to the change,
M958 would only set the P term. After the change, M958 works as
expected and the PID controller can be tuned live.
Jim Morris [Thu, 8 Feb 2018 15:31:02 +0000 (15:31 +0000)]
Merge pull request #1266 from wolfmanjm/upstreamedge
some convenience features
Jim Morris [Thu, 8 Feb 2018 15:12:15 +0000 (15:12 +0000)]
add example six-axis config snippet
Jim Morris [Thu, 8 Feb 2018 15:04:14 +0000 (15:04 +0000)]
add max_travel warning to homing cycle fail