Commit graph

3882 commits

Author SHA1 Message Date
AnHardt
23c8c5348f Z-height fix V2b (PR#2351)
here the other two occurences of `Z_PROBE_OFFSET_FROM_EXTRUDER` are
replaced with `zprobe_zoffset`.
2015-07-02 20:30:40 -05:00
Todd Swindoll
a111fbbd0a z-probe offset fix (PR#2361)
verified via 1.0.2 tag that compiles by multiple people,
credit for the fix goes to paulusjacobus for the initial find and
sniffle for the correction so M851 works.
2015-07-02 20:28:07 -05:00
AnHardt
dae4eb36ad Add MagoKimbra to the list of contributors (PR#2356)
in Development
2015-06-30 08:23:38 -05:00
AnHardt
2c1414f81f Reactivate tests for more extruders in Travis (PR#2348)
BOARD_ULTIMAKER was not the default any more
- sed failed to change the board
- RAMPS_EFB has no second extruder
- ...
- Added test for bed

Rebased.
2015-06-29 09:30:33 -05:00
Richard Wackerbarth
316469e76a Clean up comments and spacing 2015-06-28 08:22:29 -05:00
Scott Lahteine
42465ee444 Cleanup of comments & spacing 2015-06-28 08:20:28 -05:00
Scott Lahteine
9682ed455e Fix comment on M83, add comment to prepare_move 2015-06-28 08:20:19 -05:00
Richard Wackerbarth
8c760f1c31 Modify Travis build to use IDE 1.6.4 2015-06-27 16:51:42 -05:00
Richard Wackerbarth
cfb416fda9 Merge branch 'PrepareForIDE1.6' (PR#2306) 2015-06-27 15:49:12 -05:00
Richard Wackerbarth
9643e6c744 Make the platform.local a bit more generic 2015-06-27 15:45:25 -05:00
Richard Wackerbarth
4683645036 Vendor (Marlin) files 2015-06-27 15:45:25 -05:00
Richard Wackerbarth
efd5658e32 library - SPI 2015-06-27 15:45:25 -05:00
Richard Wackerbarth
9b13e60e38 core - AT90USB… 2015-06-27 15:45:25 -05:00
Richard Wackerbarth
907032616e core - arduino 2015-06-27 15:45:25 -05:00
Richard Wackerbarth
e2f2458928 library - Liquid Crystal 2015-06-27 15:45:24 -05:00
Richard Wackerbarth
d8785ffc6f library - TMC26x Stepper 2015-06-27 15:45:24 -05:00
Richard Wackerbarth
ae9de515b8 library - L6470 2015-06-27 15:45:24 -05:00
Richard Wackerbarth
363d7c505f library - Wire 2015-06-27 15:45:24 -05:00
Richard Wackerbarth
7592bb1f2f library - U8glib upgrade to v1.17 2015-06-27 15:45:24 -05:00
Richard Wackerbarth
deea00dde3 library - U8glib 2015-06-27 15:45:23 -05:00
Richard Wackerbarth
1fd335b702 Bootloaders 2015-06-27 15:45:22 -05:00
Richard Wackerbarth
bf629cf7b1 Have Travis Get additional information from the git repository
Travis builds from a detached head.
We need to use the current branch so that versioning works properly
2015-06-27 15:45:22 -05:00
Scott Lahteine
bb44fe17cf Fix typo in buzzer.h endif (PR#2337) 2015-06-27 06:10:19 -05:00
AnHardt
36746143a1 Correct output of M48 (PR#2336)
n_samples is an uint8_t .
Got printouts like:
50 of 2  ...
2015-06-27 06:08:40 -05:00
Richard Wackerbarth
47b78ed1af Merge Implement M110 (PR#2327) 2015-06-26 18:15:09 -05:00
Scott Lahteine
f6ca5a8da8 Allow "M110 N123" without a checksum 2015-06-26 18:13:54 -05:00
Scott Lahteine
aaad65ff5d Include a comment documenting M110 2015-06-26 18:13:54 -05:00
Scott Lahteine
862c72b030 Put the mandatory test of gcode_N first 2015-06-26 18:13:54 -05:00
Scott Lahteine
30976f9773 Allow M110 to handle a second N argument 2015-06-26 18:13:53 -05:00
Scott Lahteine
d135b15bb8 Init all endstop bits to 0 (PR#2332) 2015-06-26 07:10:22 -05:00
Richard Wackerbarth
e09abb1b31 Merge Fix M600 (PR#2301) 2015-06-25 20:45:55 -05:00
Scott Lahteine
5ccb1c9e7d Use millis for M600 audio feedback interval 2015-06-25 20:45:03 -05:00
Scott Lahteine
fb16a83b8a Cleanup M600 documentation comments 2015-06-25 20:45:03 -05:00
Scott Lahteine
97ec224d72 Replace target with destination in M600 2015-06-25 20:45:03 -05:00
Scott Lahteine
4ce9ddbb74 Check the temperature before filament change 2015-06-25 20:45:03 -05:00
Richard Wackerbarth
a1e8714d5f Merge 'Ultimaker' (PR#2331) 2015-06-25 09:13:50 -05:00
Jaime van Kessel
b8b5762e55 Update Ultimaker URL 2015-06-25 09:12:44 -05:00
Jaime van Kessel
d5bfbf5a59 Added correct dutch translation for calibrate. 2015-06-25 09:12:44 -05:00
Scott Lahteine
149c474e55 Updated Russian language (PR#2325)
Gleaned from
https://github.com/MarlinFirmware/Marlin/commit/4ac14a7e5fa8e6e395436664
8976eafd1ae220ae
2015-06-22 23:07:19 -04:00
AnHardt
722829b058 Move buzzing code to buzzr.h & buzzer.cpp (PR#2307)
at least the lcd independent part from Marlin_main.cpp.
2015-06-22 22:31:48 -04:00
AnHardt
c461975140 Rename and repair MELZI_1284 (PR#2301)
to MELZI_MAKR3D.

Fix for #2288
As the normal MELZI also can have a 1284.
2015-06-22 22:30:07 -04:00
schlotzz
1e9cf905c7 Enable ZigZag AutoBedLeveling on Deltas (PR#2273)
ZigZag has been disabled by fault due to do_topography_map
2015-06-15 20:26:25 -05:00
Scott Lahteine
ec93383ec8 Add SanityCheck for bed probe position settings (PR#2282) 2015-06-15 20:22:44 -05:00
Richard Wackerbarth
c2cef42f8e Merge (PR#2285) 2015-06-15 20:21:01 -05:00
Scott Lahteine
dc40a5f6e0 Patch up more outdated config lines 2015-06-15 20:20:32 -05:00
Scott Lahteine
98c9111a7d Update delta configs with latest settings 2015-06-15 20:20:32 -05:00
Scott Lahteine
e6baf8afd9 Fix up allen key settings in delta configs 2015-06-15 20:20:31 -05:00
Scott Lahteine
3b293fc5d1 Move Delta settings lower in delta files 2015-06-15 20:20:31 -05:00
Scott Lahteine
df21857583 Move extruder offset settings next to extruders setting 2015-06-15 20:20:31 -05:00
Scott Lahteine
2dd1859247 Cleanup spaces and comments in configs and conditionals 2015-06-15 20:20:31 -05:00