Rob Giseburt
5b11fb9cd5
Merge branch 'edge' into 4c-recovery
2019-10-14 20:01:59 -05:00
Rob Giseburt
3687a786e1
Four-cable kinematics
2019-06-17 13:14:42 -05:00
MitchBradley
71e29cde9a
Fix #367 - Status report with wrong stat
2019-03-01 17:46:19 +00:00
Alden Hart
d03a10e8b8
Updated copyright dates. Tested dev-304-uvw-9axis/edge merge. Passed baseline testing. Fails Spindle test SPIN-02. ToGo - GPIO, Feedhold, Probing, Homing and Planner cases.
2018-03-26 12:18:26 -04:00
Rob Giseburt
d61f27296f
Merge commit '59a00f0d45f1092b28825579e8c6fa96a038d059' into dev-168-gquintic
...
# Conflicts:
# g2core/settings/settings_Printrbot_Play.h
# g2core/settings/settings_Printrbot_Simple_1608.h
# g2core/temperature.cpp
2017-12-01 20:43:18 -06:00
Rob Giseburt
1203584a9d
Marlin: Add support from M205, which changes jerk settings
2017-06-20 20:41:28 -05:00
Alden Hart
6a45a43534
Moved UVW to middle of enumeration (3,4,5); Increased size of configurations for axis, coordinate, offsets, tool tables and others for 9 axes; Enabled UVW in Gcode parser
2017-05-04 15:31:27 -04:00
Alden Hart
6d8d925195
merged g2/edge 100.26
2017-04-26 07:33:08 -04:00
Ryan Sturmer
9df36e25bd
Fix M100.1
2017-04-14 13:49:24 -04:00
Rob Giseburt
7b629124f7
Marlin: fix M4 to be in milliseconds for Marlin flavor gcode
2017-04-12 20:24:58 -05:00
Alden Hart
1278b0b824
Interim commit - fixes JSON command queuing, sequencing job kill. Still has problems with embedded M30’s in the file. Which perhaps is as it should.
2017-04-10 12:59:57 -04:00
Alden Hart
9fe3aac5a1
Fixed issue #263 - G10 L20 commands not working
2017-04-10 08:18:17 -04:00
Alden Hart
4c4ee14466
Notes
2017-03-24 11:11:53 -04:00
Alden Hart
3c441ff55d
Restored overrides to their stubbed settings; some cleanup
2017-03-24 08:34:54 -04:00
Alden Hart
693cb04d1a
Cleanup after very messy merge
2017-03-23 11:50:18 -04:00
Alden Hart
c60dc581f7
resolved merge conflicts between edge marlin-compatibility and dev-p24
2017-03-23 11:07:12 -04:00
Rob Giseburt
735b9dcad7
Fix marlin compatibility bed controls not working.
2017-03-21 22:23:57 -05:00
Alden Hart
ae0145c28f
Some comments and naming changes to offsets for clarity
2017-03-21 06:32:45 -04:00
Alden Hart
5c451cfcb4
Fixed Gcode parser to preserve large line numbers
2017-03-20 07:18:26 -04:00
Alden Hart
e31be2ae0d
Line number validation
2017-03-18 20:05:48 -04:00
Rob Giseburt
6e343c1f6d
Fix marlin compatibility bed controls not working.
2017-03-17 00:13:48 -05:00
Alden Hart
0a466861f6
Converted cm_cycle_start to use operations runner; Stubbed in motion profiles
2017-03-12 07:52:27 -04:00
Rob Giseburt
d770cb81d4
Fix non-Marlin compatibility compile
2017-03-07 11:20:38 -06:00
Rob Giseburt
6e5d073e7e
Introducing checksums and sequential-line-number checking.
...
Use {nxln:0} to reset the next line number expected.
Add *nnn to the end of a line (can be after a ; for gcode cleanness) where non is the decimal (NOT with leading zeroes) value of the XOR of every character before the *.
If there is a *checksum AND a line number, then the checksum is verified and the line number is checked to be the next one it was expecting (the value of nxln or the previous line’s N + 1).
2017-03-07 11:03:02 -06:00
Alden Hart
747cdf02d1
Review and formatting. No code changes other than {} wrappers in some places in bio where they were missing
2017-02-24 10:58:15 -05:00
Alden Hart
0abc3af2de
Moved Code MODAL_GROUP enums to Gcode_parser.cpp from canonical_machine.h
2017-02-24 10:20:52 -05:00
Alden Hart
c8a99ad73f
Created Marlin state object (removed variables from cm.gmx);
2017-02-24 10:17:39 -05:00
Alden Hart
86908cabe5
Code documentation and organization pass
2017-02-24 09:33:56 -05:00
Alden Hart
a42c6a3759
resolved merge conflicts
2017-02-23 11:11:03 -05:00
Alden Hart
6549d21e6d
resolved merge conflict with edge 110.20
2017-02-23 09:01:47 -05:00
Alden Hart
8199c1816f
resolved merge conflicts
2017-02-16 13:17:33 -05:00
Alden Hart
22737fd75f
Optimistically, Issue #33 is fixed. Still has a whole lot of diagnostics enabled that would blow up the JSON parser, and it has not been well tested yet. So don’t use this.
2017-02-15 13:20:10 -05:00
Alden Hart
2325c1119e
Removed some cruft
2017-02-08 16:04:33 -05:00
Alden Hart
23012a0351
cleaning up complex merge with dev-237-probing-improvements. Passes a a bunch of regressions
2017-02-08 15:13:12 -05:00
Rob Giseburt
8dded6a9f3
Marlin: Now requests line resend on non-sequential line numbers, and for checksum failures.
2017-02-08 13:53:07 -06:00
Alden Hart
e592ce1339
Checkpoint. Passes G28 and G53 tests
2017-02-08 13:22:49 -05:00
Rob Giseburt
eff4939bf5
Improve handling of too-long lines, and up minimum buffers to 512bytes.
...
Fixes #206
2017-02-06 16:57:05 -06:00
Rob Giseburt
ecc09e0b54
Marlin: *fake* support for SD M-codes (M20, M21, M22, M23)
2017-02-06 16:53:11 -06:00
Rob Giseburt
96b4e0c52e
Marlin: If an E is seen, switch to Marlin-flavor gcode.
2017-02-06 15:20:49 -06:00
Rob Giseburt
dcba477058
Improve handling of too-long lines, and up minimum buffers to 512bytes.
...
Fixes #206
2017-02-06 15:20:20 -06:00
Rob Giseburt
bca3848b9a
Marlin: M84, M84 Sxxx, M85 Sxxx, and M18 Sxx
...
Note, M18 Sxx, M84 Sxx, and M85 Sxx have the same implementation.
M84 is different.
2017-02-06 15:18:06 -06:00
Rob Giseburt
1350523c37
Mute probing, and ensure that tool 0 is never selected in Marlin-flavor gcode.
2017-02-01 20:58:12 -06:00
Alden Hart
b8af55c653
More testing, some name changes to clarify things
2017-02-01 13:14:01 -05:00
Alden Hart
ba730ddf6c
Disabled soft limits during probing; Some cleanup
2017-01-31 11:56:46 -05:00
Rob Giseburt
fb1860dc02
Marlin: Fix G28 to work when either marlin gcode flavor or marlin protocol are active. (For Repetier to home from the console.)
2017-01-26 10:45:43 -06:00
Rob Giseburt
018bc18a09
Marlin: Added M115 (report version) and M110 (ignored)
2017-01-26 10:44:44 -06:00
Alden Hart
f13278e72a
Corrected arc entry condition that was not properly trapped; more feedhold testing
2017-01-25 10:35:23 -05:00
Rob Giseburt
657e68b53a
Refactor tool (startup tool is 1 now), speedup marlin temp display, added str_concat utility.
2017-01-24 17:02:08 -06:00
Rob Giseburt
015e9060d9
Correction on how Marlin M104, M140, M109, M190 are handled.
2017-01-23 17:05:15 -06:00
Rob Giseburt
3556a2cbf3
Another pass at Marlin Compatibility mode. Functional enough to test.
2017-01-20 14:36:21 -06:00
