diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1e632ba25a1d1a7f5c52524228650356db9fc92b..ce691276d8bdf3ad2b33a00ec9016a4210598c44 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 a4c8d7715da2ecc67a5ea2af7de62b5438cf3ffe..fad838e9346b2ed4ad69bfb97f54906c55b9b80e 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 49502ec3f482adde8ab4b901734e50935a1ef2cb..bd7314b2455833e66822b909feec3ca6b1b186ea 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 e65317fb638652a329d5979beb1e41273a9dbded..bd1e447268c6aedb52011fd2c9cbd8a8cd2e79e1 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 d18a336de67ae1ef15b88edb00e29e664abddad2..3a23b6363402299ab8e5875ebdc6013ed5caec98 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 1e632ba25a1d1a7f5c52524228650356db9fc92b..ce691276d8bdf3ad2b33a00ec9016a4210598c44 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 54353913d2ab7f2cae1a15ac283b9366e122545a..385109c9e1c77c0a50410645c7e760abfddc8daa 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -42,7 +42,7 @@ <label>Baud Rate:</label><select name="BAUDRATE"></select> <label>AT90USB BT IF:</label> - <input name="BTENABLED" type="checkbox" value="1" checked /> + <input name="BLUETOOTH" type="checkbox" value="1" checked /> <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 6b3e557a4b0ec125604bc2e4c591307a045571e2..7d9a347f7261b90d26dbdcd38583e4184a8d6160 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 e082a8826d08bd4f8e642ae075dfc0c53f757222..49e37d9be9881ce9ee8ef908dcbb4189e717454d 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 abf49aa81e4de4f22f53171774fbb079b33cda59..adba4418fbe3e6d2c7b7de654ebbbbb26674c3c3 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 7eb31984e3d407be1baa263eff83f0ec41a13cae..7e2b2c3f976bcc01431746e5bf499a8232c092c1 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 dd624e63e8f36c029b2df24fe05da797188e028f..f82f63d1dbe78a4b27e4c8f7872b106298f11937 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 6c997433ebfb22976e72423be7c64585c50e3cb0..a169e4e77ef3126008bd3867dda59c7d749253e3 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 05cf12ffeeca643a203f3215aa0dbcad4a94ccfe..af8c44b27ae2978442805b8aef7a4c465ccc55d5 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 7b00bb2ffa81d4d6cee20530282f4edfcda79f22..48499320760c5b2e4b167507d516dead720746bd 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 61419ef8608a063ff99ce46207525152b39c3bcd..33ea5becb6f0c20145d957f8e2b511d5e6cbd350 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 c8a9b5052e4548e19bca0ed61474f515436680aa..7821a181d5a7d57cb22aec4f5a772a4dffead7c6 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 c1ce9a016e8d8387f007458ac567ed1f6543208e..434eda08cc94321f96378865f3c7f782964dd716 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 10aa237f9da251c4e7e50f941017b4e452a1ad29..2874b97880abd1e519241d2b78372d90406b19eb 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 1a637e33e186efda72b407a529093a55afb888dc..ea274310e9748912cfc74f3e565fb0a898e02a1e 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 bd75fb5d23ddad8833e82e16cee0d11a7046ff28..15cee371ec1e16714f2126888d8df67fccf10f26 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 ea9215e1f35408285db893da9eeae15633d39d3c..403ba9f486c3a974a15527fd573bc4b147b07a26 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