andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename BTENABLED to BLUETOOTH 

- For some reason it’s easy to forget what BT stands for, but it
doesn’t need an abbreviation.
pull/1/head
Scott Lahteine 10 years ago
committed by Richard Wackerbarth
parent
68055a5959
commit
1e2deff4fd
22 changed files with 43 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/Configuration.h
  2. 4
      Marlin/Marlin.h
  3. 2
      Marlin/MarlinSerial.cpp
  4. 2
      Marlin/MarlinSerial.h
  5. 4
      Marlin/SanityCheck.h
  6. 4
      Marlin/configurator/config/Configuration.h
  7. 2
      Marlin/configurator/index.html
  8. 4
      Marlin/example_configurations/Felix/Configuration.h
  9. 4
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  10. 4
      Marlin/example_configurations/Hephestos/Configuration.h
  11. 4
      Marlin/example_configurations/K8200/Configuration.h
  12. 4
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 4
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 4
      Marlin/example_configurations/SCARA/Configuration.h
  15. 4
      Marlin/example_configurations/WITBOX/Configuration.h
  16. 4
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  17. 4
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  18. 4
      Marlin/example_configurations/delta/generic/Configuration.h
  19. 4
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  20. 4
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  21. 4
      Marlin/example_configurations/makibox/Configuration.h
  22. 4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

4
Marlin/Configuration.h
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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