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

Conflicts:
	Marlin/Configuration.h
	README.md

Marlin/Configuration.h

@@ -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
 // 

README.md

@@ -43,6 +43,7 @@ Features:
 *   CoreXY kinematics (www.corexy.com/theory.html)
 *   Configurable serial port to support connection of wireless adaptors.
 *   Automatic operation of extruder/cold-end cooling fans based on nozzle temperature
+*   RC Servo Support, specify angle or duration for continuous rotation servos.
 
 The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments.
 
@@ -198,7 +199,7 @@ Custom M Codes
 *  M220 S<factor in percent>- set speed factor override percentage
 *  M221 S<factor in percent>- set extrude factor override percentage
 *  M240 - Trigger a camera to take a photograph
-*  M280 - set servo position absolute. P: servo index, S: angle or microseconds
+*  M280 - Position an RC Servo P<index> S<angle/microseconds>, ommit S to report back current angle
 *  M300 - Play beepsound S<frequency Hz> P<duration ms>
 *  M301 - Set PID parameters P I and D
 *  M302 - Allow cold extrudes