3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1

Browse source 
Conflicts:
	Marlin/Configuration.h
	README.md
This commit is contained in:
Erik van der Zalm 2013-06-09 23:10:41 +02:00
commit 7ad12be763
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Configuration.h
View file

@ -527,11 +527,8 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
//#define BARICUDA
/*********************************************************************\
*
* R/C SERVO support
*
* Sponsored by TrinityLabs, Reworked by codexmas
*
**********************************************************************/
// Number of servos
@ -541,7 +538,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
// leaving it undefined or defining as 0 will disable the servo subsystem
// If unsure, leave commented / disabled
//
//#define NUM_SERVOS 3 // Servo index starts with 0
//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
// Servo Endstops
//