From 4718c09c480ed0e9c6f4275747727a3d7e639b4b Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Sun, 23 Jul 2017 16:38:40 -0700 Subject: [PATCH] Remove extraneous USBCON defines for AT90USB boards USBCON is definied by serial.h pullikng in MarlinConfig.h which in turn pulls in Arduino.h. Defining in later includes has shown to cause compile issues so removing all extraneous calls for and potentially easier future linker troubleshooting. more USBCON unification --- Marlin/pins_5DPRINT.h | 1 - Marlin/pins_BRAINWAVE.h | 2 -- Marlin/pins_BRAINWAVE_PRO.h | 1 - Marlin/pins_PRINTRBOARD.h | 1 - Marlin/pins_SAV_MKI.h | 1 - Marlin/pins_TEENSY2.h | 1 - Marlin/pins_TEENSYLU.h | 1 - 7 files changed, 8 deletions(-) diff --git a/Marlin/pins_5DPRINT.h b/Marlin/pins_5DPRINT.h index f56ec0b67..e99047f66 100755 --- a/Marlin/pins_5DPRINT.h +++ b/Marlin/pins_5DPRINT.h @@ -74,7 +74,6 @@ #define DEFAULT_MACHINE_NAME "Makibox" #define BOARD_NAME "5DPrint D8" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true // diff --git a/Marlin/pins_BRAINWAVE.h b/Marlin/pins_BRAINWAVE.h index 2776c5006..932619769 100755 --- a/Marlin/pins_BRAINWAVE.h +++ b/Marlin/pins_BRAINWAVE.h @@ -73,8 +73,6 @@ #define BOARD_NAME "Brainwave" -#define USBCON 646 // Disable MarlinSerial etc. - // // Limit Switches // diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h index ef780d579..acf8642e0 100755 --- a/Marlin/pins_BRAINWAVE_PRO.h +++ b/Marlin/pins_BRAINWAVE_PRO.h @@ -80,7 +80,6 @@ #define BOARD_NAME "Brainwave Pro" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true // diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index 7dec695d5..9681e0959 100755 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -67,7 +67,6 @@ #define BOARD_NAME "Printrboard" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true // Disable JTAG pins so they can be used for the Extrudrboard diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h index 84646cc4c..aecd58afd 100755 --- a/Marlin/pins_SAV_MKI.h +++ b/Marlin/pins_SAV_MKI.h @@ -69,7 +69,6 @@ #define DEFAULT_SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #define BOARD_NAME "SAV MkI" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true // diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h index fa4280fc1..d5eb893ae 100755 --- a/Marlin/pins_TEENSY2.h +++ b/Marlin/pins_TEENSY2.h @@ -112,7 +112,6 @@ #define BOARD_NAME "Teensy++2.0" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true // diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/pins_TEENSYLU.h index 3fb7f5c3e..0c2ded63e 100755 --- a/Marlin/pins_TEENSYLU.h +++ b/Marlin/pins_TEENSYLU.h @@ -79,7 +79,6 @@ #define BOARD_NAME "Teensylu" -#define USBCON 1286 // Disable MarlinSerial etc. #define LARGE_FLASH true