 Scott Lahteine
|
9552e59306
|
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
|
2015-01-24 04:06:42 -08:00 |
|
|
Scott Lahteine
|
23fcd1ecb2
|
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
|
2015-01-23 21:33:43 -08:00 |
|
|
Scott Lahteine
|
5c1814383a
|
Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
|
2015-01-23 20:08:23 -08:00 |
|
|
Scott Lahteine
|
a244bcb953
|
Merge pull request #1403 from thinkyhead/issue_1356
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
|
2015-01-23 10:51:39 -08:00 |
|
|
Scott Lahteine
|
54d5b52a2e
|
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
Code wont compile with extruder but without bed runaway protection defined.
|
2015-01-23 08:36:25 -08:00 |
|
|
Scott Lahteine
|
9040446780
|
Merge pull request #1395 from AnHardt/iss1394
removed function step_wait() from stepper.cpp
|
2015-01-23 06:58:10 -08:00 |
|
|
Scott Lahteine
|
25f79c5010
|
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
|
2015-01-23 06:08:38 -08:00 |
|
|
Scott Lahteine
|
9ce75ab7de
|
Merge pull request #1386 from roglio/Development
Fixing a build error for melzi and gfx display
|
2015-01-23 06:00:24 -08:00 |
|
|
Scott Lahteine
|
99e6ce901b
|
Merge pull request #1393 from thinkyhead/issue_1385_timing
Add proper delay in stepper.cpp
|
2015-01-23 03:33:39 -08:00 |
|
|
Scott Lahteine
|
4f35de991a
|
Merge pull request #1383 from CONSULitAS/Development
Update Boards.h for Vellemann K8200 - comment only
|
2015-01-19 15:59:38 -08:00 |
|
|
Scott Lahteine
|
91f7cc2e6d
|
Merge pull request #1380 from chertykov/Development
Remove hardcoded programmer option (-cwiring).
|
2015-01-19 15:43:14 -08:00 |
|