906 Commits (98d0d4819107fe05dde5561efd652d56f676e688)
 

Author SHA1 Message Date
xifle 98d0d48191 fixed merge 12 years ago
xifle bbe67fca5a soft tab correction 12 years ago
xifle 9eeb711c96 Merged from Upstream Master 12 years ago
ErikZalm b2eeebd9c3 Merge pull request #409 from buildrob202/Marlin_v1 12 years ago
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Erik van der Zalm 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp 12 years ago
ErikZalm 1a18a487f9 Merge pull request #407 from buildrob101/Marlin_v1 12 years ago
xifle 03141a5ef4 LCD: Added Deadzone at 100% Feedrate 12 years ago
Robert F-C 4121311b9d Change to LCD status indicators 12 years ago
Robert F-C dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
ErikZalm 64360164ad Merge pull request #482 from codexmas/Marlin_v1 12 years ago
ErikZalm 86405cdd11 Merge pull request #479 from MStohn/thermocouple 12 years ago
Erik van der Zalm 6c45c3f4e7 BariCUDA changes 12 years ago
Gord Christmas 96624f0f31 Forgot to include reference to Servo in makefile 12 years ago
Gord Christmas dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 12 years ago
Gord Christmas b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 12 years ago
MaikStohn 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 12 years ago
MaikStohn 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input 12 years ago
MaikStohn 61a48cc662 Add support for RUMBA thermocouple add on 12 years ago
MaikStohn 9cc15876be Add support for RUMBA thermocouple add on 12 years ago
ErikZalm c9cf2174dd Merge pull request #474 from xifle/Marlin_v1 12 years ago
Erik van der Zalm bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 12 years ago
Jordan Miller 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 12 years ago
Jordan Miller fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 12 years ago
xifle 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp 12 years ago
Robert F-C 015d0594b0 Optimize menu selection for Viki rotary encoder. 12 years ago
ErikZalm 90664d20a4 Merge pull request #472 from gregor2005/Marlin_v1 12 years ago
gregor 2739c26c4f changes: 12 years ago
gregor 6fb9573157 added support for the reprapworld keypad 12 years ago
ErikZalm 2c0fa34c9e Merge pull request #466 from midopple/Marlin_v1 12 years ago
midopple a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time 12 years ago
midopple db2f157a22 Replace the <= to < in the Command M907, M350 and M351. 12 years ago
daid e3bc420daa Merge pull request #464 from arnoudja/Marlin_v1 12 years ago
Arnoud fc4ab05157 Solved minor bug in controllerFan() 12 years ago
daid 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error 12 years ago
Martin Renold 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 12 years ago
Robert F-C 289c02eda4 Remove unnecessary pin initialization in stepper.cpp 12 years ago
Robert F-C d5ad7a0814 Rework change to incorporate CONTROLLERFAN 12 years ago
Robert F-C c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
Robert F-C 1c127217df Make DOGLCD merge neater. 12 years ago
Robert F-C 7f57f28ccc Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer. 12 years ago
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 12 years ago
ErikZalm 4f96ad5621 Merge pull request #456 from Stefanowicz/Marlin_v1 12 years ago
Lukasz Stefanowicz d71f1e9bf6 Add (as an option) slower SD transfer mode 12 years ago
ErikZalm db5bb8546d Merge pull request #452 from MStohn/Marlin_v1 12 years ago
daid 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 12 years ago
Bracken Dawson d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 12 years ago
MaikStohn 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 12 years ago
MaikStohn 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 12 years ago
MaikStohn 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 12 years ago