From 1e2deff4fd5183b6a2d4d6dff0d33c775a2234be Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 31 Jul 2015 16:55:47 -0700 Subject: [PATCH] Rename BTENABLED to BLUETOOTH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - For some reason it’s easy to forget what BT stands for, but it doesn’t need an abbreviation. --- Marlin/Configuration.h | 4 ++-- Marlin/Marlin.h | 4 ++-- Marlin/MarlinSerial.cpp | 2 +- Marlin/MarlinSerial.h | 2 +- Marlin/SanityCheck.h | 4 ++++ Marlin/configurator/config/Configuration.h | 4 ++-- Marlin/configurator/index.html | 2 +- Marlin/example_configurations/Felix/Configuration.h | 4 ++-- Marlin/example_configurations/Felix/Configuration_DUAL.h | 4 ++-- Marlin/example_configurations/Hephestos/Configuration.h | 4 ++-- Marlin/example_configurations/K8200/Configuration.h | 4 ++-- .../RepRapWorld/Megatronics/Configuration.h | 4 ++-- Marlin/example_configurations/RigidBot/Configuration.h | 4 ++-- Marlin/example_configurations/SCARA/Configuration.h | 4 ++-- Marlin/example_configurations/WITBOX/Configuration.h | 4 ++-- Marlin/example_configurations/adafruit/ST7565/Configuration.h | 4 ++-- Marlin/example_configurations/delta/biv2.5/Configuration.h | 4 ++-- Marlin/example_configurations/delta/generic/Configuration.h | 4 ++-- .../example_configurations/delta/kossel_mini/Configuration.h | 4 ++-- .../example_configurations/delta/kossel_pro/Configuration.h | 4 ++-- Marlin/example_configurations/makibox/Configuration.h | 4 ++-- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 4 ++-- 22 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1e632ba25..ce691276d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index a4c8d7715..fad838e93 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -51,11 +51,11 @@ typedef unsigned long millis_t; #include "WString.h" #ifdef USBCON - #if ENABLED(BTENABLED) + #if ENABLED(BLUETOOTH) #define MYSERIAL bt #else #define MYSERIAL Serial - #endif // BTENABLED + #endif // BLUETOOTH #else #define MYSERIAL MSerial #endif diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp index 49502ec3f..bd7314b24 100644 --- a/Marlin/MarlinSerial.cpp +++ b/Marlin/MarlinSerial.cpp @@ -287,6 +287,6 @@ MarlinSerial MSerial; #endif // !USBCON // For AT90USB targets use the UART for BT interfacing -#if defined(USBCON) && ENABLED(BTENABLED) +#if defined(USBCON) && ENABLED(BLUETOOTH) HardwareSerial bt; #endif diff --git a/Marlin/MarlinSerial.h b/Marlin/MarlinSerial.h index e65317fb6..bd1e44726 100644 --- a/Marlin/MarlinSerial.h +++ b/Marlin/MarlinSerial.h @@ -153,7 +153,7 @@ extern MarlinSerial MSerial; #endif // !USBCON // Use the UART for BT in AT90USB configurations -#if defined(USBCON) && ENABLED(BTENABLED) +#if defined(USBCON) && ENABLED(BLUETOOTH) extern HardwareSerial bt; #endif diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index d18a336de..3a23b6363 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -374,4 +374,8 @@ #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration. #endif + #ifdef BTENABLED + #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration. + #endif + #endif //SANITYCHECK_H diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 1e632ba25..ce691276d 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 54353913d..385109c9e 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -42,7 +42,7 @@ - + diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 6b3e557a4..7d9a347f7 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index e082a8826..49e37d9be 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -62,8 +62,8 @@ Here are some standard links for getting your machine calibrated: // This determines the communication speed of the printer #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index abf49aa81..adba4418f 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 115200 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 7eb31984e..7e2b2c3f9 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -68,8 +68,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index dd624e63e..f82f63d1d 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 6c997433e..a169e4e77 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 115200 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 05cf12ffe..af8c44b27 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -88,8 +88,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 7b00bb2ff..484993207 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 115200 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 61419ef86..33ea5becb 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index c8a9b5052..7821a181d 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index c1ce9a016..434eda08c 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 10aa237f9..2874b9788 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 1a637e33e..ea274310e 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -67,8 +67,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index bd75fb5d2..15cee371e 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index ea9215e1f..403ba9f48 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated: // :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 -// This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface on AT90USB devices +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup