Tmp copy before merge
This commit is contained in:
parent
b98fb17fe9
commit
e48dfcc2b3
1839
Marlin/Marlin.pde
1839
Marlin/Marlin.pde
File diff suppressed because it is too large
Load Diff
36
Marlin/Marlin.pde.tmp.pde
Normal file
36
Marlin/Marlin.pde.tmp.pde
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/* -*- c++ -*- */
|
||||||
|
|
||||||
|
/*
|
||||||
|
Reprap firmware based on Sprinter and grbl.
|
||||||
|
Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
This firmware is a mashup between Sprinter and grbl.
|
||||||
|
(https://github.com/kliment/Sprinter)
|
||||||
|
(https://github.com/simen/grbl/tree)
|
||||||
|
|
||||||
|
It has preliminary support for Matthew Roberts advance algorithm
|
||||||
|
http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
|
||||||
|
/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
|
||||||
|
|
||||||
|
#include "Configuration.h"
|
||||||
|
#ifdef ULTRA_LCD
|
||||||
|
#include <LiquidCrystal.h>
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user