forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename BTENABLED to BLUETOOTH

Browse Source 
- For some reason it’s easy to forget what BT stands for, but it
doesn’t need an abbreviation.
master
Scott Lahteine 9 years ago committed by Richard Wackerbarth
parent 68055a5959
commit 1e2deff4fd
22 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
Marlin/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/Marlin.h
Unescape View File

@ -51,11 +51,11 @@ typedef unsigned long millis_t;
#include "WString.h" #include "WString.h"
#ifdef USBCON #ifdef USBCON
#if ENABLED(BTENABLED) #if ENABLED(BLUETOOTH)
#define MYSERIAL bt #define MYSERIAL bt
#else #else
#define MYSERIAL Serial #define MYSERIAL Serial
#endif // BTENABLED #endif // BLUETOOTH
#else #else
#define MYSERIAL MSerial #define MYSERIAL MSerial
#endif #endif

2
Marlin/MarlinSerial.cpp
Unescape View File

@ -287,6 +287,6 @@ MarlinSerial MSerial;
#endif // !USBCON #endif // !USBCON
// For AT90USB targets use the UART for BT interfacing // For AT90USB targets use the UART for BT interfacing
#if defined(USBCON) && ENABLED(BTENABLED) #if defined(USBCON) && ENABLED(BLUETOOTH)
HardwareSerial bt; HardwareSerial bt;
#endif #endif

2
Marlin/MarlinSerial.h
Unescape View File

@ -153,7 +153,7 @@ extern MarlinSerial MSerial;
#endif // !USBCON #endif // !USBCON
// Use the UART for BT in AT90USB configurations // Use the UART for BT in AT90USB configurations
#if defined(USBCON) && ENABLED(BTENABLED) #if defined(USBCON) && ENABLED(BLUETOOTH)
extern HardwareSerial bt; extern HardwareSerial bt;
#endif #endif

4
Marlin/SanityCheck.h
Unescape View File

@ -374,4 +374,8 @@
#error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration. #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration.
#endif #endif
#ifdef BTENABLED
#error BTENABLED has been replaced with BLUETOOTH. Please update your configuration.
#endif
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

4
Marlin/configurator/config/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

2
Marlin/configurator/index.html
Unescape View File

@ -42,7 +42,7 @@
<label>Baud Rate:</label><select name="BAUDRATE"></select> <label>Baud Rate:</label><select name="BAUDRATE"></select>
<label>AT90USB BT IF:</label> <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> <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>

4
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/Felix/Configuration_DUAL.h
Unescape View File

@ -62,8 +62,8 @@ Here are some standard links for getting your machine calibrated:
// This determines the communication speed of the printer // This determines the communication speed of the printer
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 115200 #define BAUDRATE 115200
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -68,8 +68,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 115200 #define BAUDRATE 115200
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -88,8 +88,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 115200 #define BAUDRATE 115200
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -67,8 +67,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -63,8 +63,8 @@ Here are some standard links for getting your machine calibrated:
// :[2400,9600,19200,38400,57600,115200,250000] // :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000 #define BAUDRATE 250000
// This enables the serial port associated to the Bluetooth interface // Enable the Bluetooth serial interface on AT90USB devices
//#define BTENABLED // Enable BT interface on AT90USB devices //#define BLUETOOTH
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup

Write Preview
Loading…
Cancel
Save