thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 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.
Scott Lahteine 9 years ago
parent
68055a5959
commit
1e2deff4fd
22 changed files with 43 additions and 39 deletions
Unified View Show Diff Stats
  1. 2
    2
      Marlin/Configuration.h
  2. 2
    2
      Marlin/Marlin.h
  3. 1
    1
      Marlin/MarlinSerial.cpp
  4. 1
    1
      Marlin/MarlinSerial.h
  5. 4
    0
      Marlin/SanityCheck.h
  6. 2
    2
      Marlin/configurator/config/Configuration.h
  7. 1
    1
      Marlin/configurator/index.html
  8. 2
    2
      Marlin/example_configurations/Felix/Configuration.h
  9. 2
    2
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  10. 2
    2
      Marlin/example_configurations/Hephestos/Configuration.h
  11. 2
    2
      Marlin/example_configurations/K8200/Configuration.h
  12. 2
    2
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 2
    2
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 2
    2
      Marlin/example_configurations/SCARA/Configuration.h
  15. 2
    2
      Marlin/example_configurations/WITBOX/Configuration.h
  16. 2
    2
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  17. 2
    2
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  18. 2
    2
      Marlin/example_configurations/delta/generic/Configuration.h
  19. 2
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  20. 2
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  21. 2
    2
      Marlin/example_configurations/makibox/Configuration.h
  22. 2
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 2
- 2
Marlin/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/Marlin.h View File

51 
 #include "WString.h"
 51 
 #include "WString.h"
52
52
53 
 #ifdef USBCON
 53 
 #ifdef USBCON
54 
-  #if ENABLED(BTENABLED)
54 
+  #if ENABLED(BLUETOOTH)
55 
     #define MYSERIAL bt
 55 
     #define MYSERIAL bt
56 
   #else
 56 
   #else
57 
     #define MYSERIAL Serial
 57 
     #define MYSERIAL Serial
58 
-  #endif // BTENABLED
58 
+  #endif // BLUETOOTH
59 
 #else
 59 
 #else
60 
   #define MYSERIAL MSerial
 60 
   #define MYSERIAL MSerial
61 
 #endif
 61 
 #endif

+ 1
- 1
Marlin/MarlinSerial.cpp View File

287 
 #endif // !USBCON
 287 
 #endif // !USBCON
288
288
289 
 // For AT90USB targets use the UART for BT interfacing
 289 
 // For AT90USB targets use the UART for BT interfacing
290 
-#if defined(USBCON) && ENABLED(BTENABLED)
290 
+#if defined(USBCON) && ENABLED(BLUETOOTH)
291 
   HardwareSerial bt;
 291 
   HardwareSerial bt;
292 
 #endif
 292 
 #endif

+ 1
- 1
Marlin/MarlinSerial.h View File

153 
 #endif // !USBCON
 153 
 #endif // !USBCON
154
154
155 
 // Use the UART for BT in AT90USB configurations
 155 
 // Use the UART for BT in AT90USB configurations
156 
-#if defined(USBCON) && ENABLED(BTENABLED)
156 
+#if defined(USBCON) && ENABLED(BLUETOOTH)
157 
   extern HardwareSerial bt;
 157 
   extern HardwareSerial bt;
158 
 #endif
 158 
 #endif
159
159

+ 4
- 0
Marlin/SanityCheck.h View File

374 
     #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration.
 374 
     #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration.
375 
   #endif
 375 
   #endif
376
376
377 
+  #ifdef BTENABLED
378 
+    #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration.
379 
+  #endif
380 
+
377 
 #endif //SANITYCHECK_H
 381 
 #endif //SANITYCHECK_H

+ 2
- 2
Marlin/configurator/config/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 1
- 1
Marlin/configurator/index.html View File

42 
           <label>Baud Rate:</label><select name="BAUDRATE"></select>
 42 
           <label>Baud Rate:</label><select name="BAUDRATE"></select>
43
43
44 
           <label>AT90USB BT IF:</label>
 44 
           <label>AT90USB BT IF:</label>
45 
-            <input name="BTENABLED" type="checkbox" value="1" checked />
45 
+            <input name="BLUETOOTH" type="checkbox" value="1" checked />
46
46
47 
           <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>
 47 
           <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>
48
48

+ 2
- 2
Marlin/example_configurations/Felix/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

62 
 // This determines the communication speed of the printer
 62 
 // This determines the communication speed of the printer
63 
 #define BAUDRATE 250000
 63 
 #define BAUDRATE 250000
64
64
65 
-// This enables the serial port associated to the Bluetooth interface
66 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
65 
+// Enable the Bluetooth serial interface on AT90USB devices
66 
+//#define BLUETOOTH
67
67
68 
 // The following define selects which electronics board you have.
 68 
 // The following define selects which electronics board you have.
69 
 // Please choose the name from boards.h that matches your setup
 69 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 115200
 64 
 #define BAUDRATE 115200
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/K8200/Configuration.h View File

68 
 // :[2400,9600,19200,38400,57600,115200,250000]
 68 
 // :[2400,9600,19200,38400,57600,115200,250000]
69 
 #define BAUDRATE 250000
 69 
 #define BAUDRATE 250000
70
70
71 
-// This enables the serial port associated to the Bluetooth interface
72 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
71 
+// Enable the Bluetooth serial interface on AT90USB devices
72 
+//#define BLUETOOTH
73
73
74 
 // The following define selects which electronics board you have.
 74 
 // The following define selects which electronics board you have.
75 
 // Please choose the name from boards.h that matches your setup
 75 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 115200
 64 
 #define BAUDRATE 115200
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration.h View File

88 
 // :[2400,9600,19200,38400,57600,115200,250000]
 88 
 // :[2400,9600,19200,38400,57600,115200,250000]
89 
 #define BAUDRATE 250000
 89 
 #define BAUDRATE 250000
90
90
91 
-// This enables the serial port associated to the Bluetooth interface
92 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
91 
+// Enable the Bluetooth serial interface on AT90USB devices
92 
+//#define BLUETOOTH
93
93
94 
 // The following define selects which electronics board you have.
 94 
 // The following define selects which electronics board you have.
95 
 // Please choose the name from boards.h that matches your setup
 95 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 115200
 64 
 #define BAUDRATE 115200
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

67 
 // :[2400,9600,19200,38400,57600,115200,250000]
 67 
 // :[2400,9600,19200,38400,57600,115200,250000]
68 
 #define BAUDRATE 250000
 68 
 #define BAUDRATE 250000
69
69
70 
-// This enables the serial port associated to the Bluetooth interface
71 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
70 
+// Enable the Bluetooth serial interface on AT90USB devices
71 
+//#define BLUETOOTH
72
72
73 
 // The following define selects which electronics board you have.
 73 
 // The following define selects which electronics board you have.
74 
 // Please choose the name from boards.h that matches your setup
 74 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/makibox/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

63 
 // :[2400,9600,19200,38400,57600,115200,250000]
 63 
 // :[2400,9600,19200,38400,57600,115200,250000]
64 
 #define BAUDRATE 250000
 64 
 #define BAUDRATE 250000
65
65
66 
-// This enables the serial port associated to the Bluetooth interface
67 
-//#define BTENABLED              // Enable BT interface on AT90USB devices
66 
+// Enable the Bluetooth serial interface on AT90USB devices
67 
+//#define BLUETOOTH
68
68
69 
 // The following define selects which electronics board you have.
 69 
 // The following define selects which electronics board you have.
70 
 // Please choose the name from boards.h that matches your setup
 70 
 // Please choose the name from boards.h that matches your setup

Write Preview
Loading…
Cancel
Save