Merge commit '539f' into mendelmax

markfinn · Jan 4, 2013 · dc0c2f5 · dc0c2f5
2 parents 6d88a3b + 539f3b3
commit dc0c2f5
Show file tree

Hide file tree

Showing 11 changed files with 1,116 additions and 47 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -11,6 +11,11 @@
 #define STRING_VERSION_CONFIG_H "2012-05-02" //Personal revision number for changes to THIS file.
 #define STRING_CONFIG_H_AUTHOR "erik" //Who made the changes.
 
+// SERIAL_PORT selects which serial port should be used for communication with the host.
+// This allows the connection of wireless adapters (for instance) to non-default port pins.
+// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
+#define SERIAL_PORT 0
+
 // This determines the communication speed of the printer
 //#define BAUDRATE 250000
 #define BAUDRATE 115200
@@ -30,6 +35,7 @@
 // Ultimaker = 7
 // Teensylu = 8
 // Gen3+ =9
+// Megatronics =70
 
 #ifndef MOTHERBOARD
 #define MOTHERBOARD 33