Rob Giseburt
39c398668d
100.23 // Merged dev-227-marlin-compat - see #227 and #244
2017-03-21 22:33:14 -05:00
Rob Giseburt
735b9dcad7
Fix marlin compatibility bed controls not working.
2017-03-21 22:23:57 -05:00
Alden Hart
ef84834781
Resolved merge conflict with edge fb100.22
2017-03-12 13:56:00 -04:00
Alden Hart
55fc20414d
Updated build number to 100.22
2017-03-12 13:42:23 -04:00
Alden Hart
31f617f7c6
Removed bcr from status report initialization strings (Note: spell check changed bcr to bur in previous commit. Sorry about that)
2017-03-12 13:31:13 -04:00
Alden Hart
afa8342b30
Removed bur from status report initialization string
2017-03-12 13:29:33 -04:00
Alden Hart
f923f4766a
Changed device back to SAM3X8E (Due chip)
2017-03-12 13:20:39 -04:00
Alden Hart
4a92e5a974
Corrected Issue #249 - G2/G3 radius mode resulting in Arc specification error - missing offset(s)
2017-03-12 13:17:15 -04:00
Alden Hart
40a326a15c
Fixed regression for JSON wrapped code where ’n’ is reported (was failing on read-only)
2017-03-12 09:24:16 -04:00
Alden Hart
2675557b9b
Fixed text mode compile; fixed zero length move ends in cycle regression
2017-03-12 08:57:32 -04:00
Rob Giseburt
d770cb81d4
Fix non-Marlin compatibility compile
2017-03-07 11:20:38 -06:00
Rob Giseburt
27c59c04e9
Fix for PrintrBot Simple1608 probing with the new probing code.
2017-03-07 11:03:25 -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
b9aa5ef493
Merge branch 'refs/heads/edge' into dev-227-marlin-compat
2017-02-23 15:36:23 -05:00
Rob Giseburt
8df3aeada6
100.21 // Merged dev-209b-random-pauses to compelte USB changes (only fix travis-ci from 100.20)
2017-02-23 10:50:11 -06:00
Alden Hart
a42c6a3759
resolved merge conflicts
2017-02-23 11:11:03 -05:00
Alden Hart
4be0c0b7c7
Minor changes to settings
2017-02-23 11:01:10 -05:00
Rob Giseburt
94f055283f
Fix typo: DEBUG=0 (or no DEBUG mentioned) should work right now.
2017-02-23 09:51:46 -06:00
Rob Giseburt
d1ef58022b
Merge branch 'edge' into dev-227-marlin-compat
...
Conflicts:
g2core/g2core.cppproj
g2core/gcode_parser.cpp
g2core/xio.cpp
g2core/xio.h
2017-02-23 09:45:50 -06:00
Rob Giseburt
9668422085
Update Makefile to get rid of “missing IN_DEBUGGER” warnings.
2017-02-23 09:27:00 -06:00
Rob Giseburt
f0217205cc
Fix for MOTOR_POWERED_IN_CYCLE motors disabling during long M101 waits
2017-02-23 09:20:38 -06:00
Alden Hart
09532eef61
Added marlin_compatibility files to AS7 project
2017-02-23 09:48:15 -05:00
Alden Hart
6c5359a3a2
Some changes to AS7 project file. Device now set for Arduino Due
2017-02-23 09:07:59 -05:00
Alden Hart
6549d21e6d
resolved merge conflict with edge 110.20
2017-02-23 09:01:47 -05:00
Alden Hart
aa0adaa8ff
Updated firmware build number to 110.20
2017-02-23 08:38:13 -05:00
Alden Hart
373c338be4
Changed tool offset token from tl to tof;
2017-02-22 05:25:39 -05:00
Rob Giseburt
838166d1e9
Minor adjustments to exec and stepper to handle a rare stall condition.
2017-02-14 15:10:10 -06:00
Rob Giseburt
e65ef956e4
Added DEBUG=3 to enable Semihosting, while DEBUG=2 does not
2017-02-14 15:09:56 -06:00
Rob Giseburt
2a2cdc769c
Minor adjustments to exec and stepper to handle a rare stall condition.
2017-02-14 15:04:45 -06:00
Rob Giseburt
51b7d071b7
Added DEBUG=3 to enable Semihosting, while DEBUG=2 does not
2017-02-14 10:34:08 -06:00
Rob Giseburt
1b7575647f
Adjust meet_iteration debug variable to not be unsigned (so -1 is valid)
2017-02-08 13:54:26 -06: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
Rob Giseburt
850d8b9fcf
Marlin: corrected double-gcode parsing in some cases.
2017-02-08 13:51:59 -06:00
Rob Giseburt
f16ad16c2c
Marlin: XIO now recognizes ’N’ as a non-stk500v2 lines, and exits fake-bootloader mode.
2017-02-08 13:51:18 -06:00
Rob Giseburt
53e0eb85eb
Adjusted Exec interrupt priority to High, and Fwd Plan to Medium.
2017-02-08 13:50:18 -06: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
f76dec86d2
Marlin: Better handling of startup, correction to last commit
2017-02-06 16:52:38 -06:00
Rob Giseburt
f65b89425d
Fix shapeoko375_Dual settings not compiling.
2017-02-06 15:22:23 -06:00
Rob Giseburt
786439f5fb
Marlin: disable SR and QR, and suppress initial R until 2 seconds after connection.
...
For non-Marlin, it will suppress it for 10ms.
2017-02-06 15:21:52 -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
Alden Hart
3e1aca04b8
Added conditional probe report at end of probe. Defaults to ON for compatibility with Chilipeppr autoleveling
2017-02-02 09:33:36 -05:00
Rob Giseburt
2a092bf03f
Minor adjustments to temperature controls (and a typo fix).
2017-02-01 20:58:29 -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
Rob Giseburt
Alden Hart