Ver código fonte

Merge pull request #8220 from thinkyhead/bf2_serial_port_-1

[2.0] Add SERIAL_PORT -1 option for configurators
Scott Lahteine 6 anos atrás
pai
commit
d83a9a53e8
Nenhuma conta vinculada ao e-mail do autor do commit
44 arquivos alterados com 1863 adições e 135 exclusões
  1. 3
    3
      Marlin/Configuration.h
  2. 3
    3
      Marlin/src/config/default/Configuration.h
  3. 3
    3
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 3
    3
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 3
    3
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 3
    3
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 4
    4
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  8. 3
    3
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  9. 3
    3
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  10. 3
    3
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  11. 3
    3
      Marlin/src/config/examples/Cartesio/Configuration.h
  12. 3
    3
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  13. 3
    3
      Marlin/src/config/examples/Felix/Configuration.h
  14. 3
    3
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  15. 3
    3
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  16. 3
    3
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  17. 3
    3
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  18. 3
    3
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  19. 3
    3
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  20. 3
    3
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  21. 3
    3
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  22. 3
    4
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  23. 3
    3
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  24. 3
    3
      Marlin/src/config/examples/RigidBot/Configuration.h
  25. 3
    3
      Marlin/src/config/examples/SCARA/Configuration.h
  26. 1731
    0
      Marlin/src/config/examples/STM32F103RET6/Configuration.h
  27. 3
    3
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  28. 3
    3
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  29. 3
    3
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  30. 3
    3
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  31. 3
    3
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  32. 3
    3
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  33. 3
    3
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  34. 3
    3
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  35. 3
    3
      Marlin/src/config/examples/delta/generic/Configuration.h
  36. 3
    3
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  37. 3
    3
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  38. 3
    3
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  39. 3
    3
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  40. 3
    3
      Marlin/src/config/examples/makibox/Configuration.h
  41. 3
    3
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  42. 3
    3
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  43. 3
    3
      Marlin/src/config/examples/wt150/Configuration.h
  44. 5
    7
      Marlin/src/inc/Conditionals_LCD.h

+ 3
- 3
Marlin/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/default/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Anet/A6/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Anet/A8/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 4
- 4
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h Ver arquivo

@@ -94,13 +94,13 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103
-#define SERIAL_PORT -1
103
+#define SERIAL_PORT 0
104 104
 
105 105
 /**
106 106
  * This setting determines the communication speed of the printer.

+ 3
- 3
Marlin/src/config/examples/BQ/Hephestos/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h Ver arquivo

@@ -93,11 +93,11 @@
93 93
 // @section machine
94 94
 
95 95
 /**
96
- * Select which serial port on the board will be used for communication with the host.
96
+ * Select the serial port on the board to use for communication with the host.
97 97
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
98
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
98
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
99 99
  *
100
- * :[0, 1, 2, 3, 4, 5, 6, 7]
100
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
101 101
  */
102 102
 #define SERIAL_PORT 0
103 103
 

+ 3
- 3
Marlin/src/config/examples/BQ/WITBOX/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Cartesio/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Creality/CR-10/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Felix/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Felix/DUAL/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Malyan/M150/Configuration.h Ver arquivo

@@ -99,11 +99,11 @@
99 99
 // @section machine
100 100
 
101 101
 /**
102
- * Select which serial port on the board will be used for communication with the host.
102
+ * Select the serial port on the board to use for communication with the host.
103 103
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
104
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
104
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
105 105
  *
106
- * :[0, 1, 2, 3, 4, 5, 6, 7]
106
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
107 107
  */
108 108
 #define SERIAL_PORT 0
109 109
 

+ 3
- 3
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 4
Marlin/src/config/examples/Mks/Sbase/Configuration.h Ver arquivo

@@ -38,7 +38,6 @@
38 38
 #ifndef CONFIGURATION_H
39 39
 #define CONFIGURATION_H
40 40
 #define CONFIGURATION_H_VERSION 020000
41
-#define USE_AUTOMATIC_VERSIONING
42 41
 
43 42
 //===========================================================================
44 43
 //============================= Getting Started =============================
@@ -96,11 +95,11 @@
96 95
 // @section machine
97 96
 
98 97
 /**
99
- * Select which serial port on the board will be used for communication with the host.
98
+ * Select the serial port on the board to use for communication with the host.
100 99
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
101
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
100
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
102 101
  *
103
- * :[0, 1, 2, 3, 4, 5, 6, 7]
102
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
104 103
  */
105 104
 #define SERIAL_PORT 0
106 105
 

+ 3
- 3
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/RigidBot/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/SCARA/Configuration.h Ver arquivo

@@ -124,11 +124,11 @@
124 124
 // @section machine
125 125
 
126 126
 /**
127
- * Select which serial port on the board will be used for communication with the host.
127
+ * Select the serial port on the board to use for communication with the host.
128 128
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
129
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
129
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
130 130
  *
131
- * :[0, 1, 2, 3, 4, 5, 6, 7]
131
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
132 132
  */
133 133
 #define SERIAL_PORT 0
134 134
 

+ 1731
- 0
Marlin/src/config/examples/STM32F103RET6/Configuration.h
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 3
- 3
Marlin/src/config/examples/Sanguinololu/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/TinyBoy2/Configuration.h Ver arquivo

@@ -110,11 +110,11 @@
110 110
 // @section machine
111 111
 
112 112
 /**
113
- * Select which serial port on the board will be used for communication with the host.
113
+ * Select the serial port on the board to use for communication with the host.
114 114
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
115
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
115
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
116 116
  *
117
- * :[0, 1, 2, 3, 4, 5, 6, 7]
117
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
118 118
  */
119 119
 #define SERIAL_PORT 0
120 120
 

+ 3
- 3
Marlin/src/config/examples/Velleman/K8200/Configuration.h Ver arquivo

@@ -110,11 +110,11 @@
110 110
 // @section machine
111 111
 
112 112
 /**
113
- * Select which serial port on the board will be used for communication with the host.
113
+ * Select the serial port on the board to use for communication with the host.
114 114
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
115
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
115
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
116 116
  *
117
- * :[0, 1, 2, 3, 4, 5, 6, 7]
117
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
118 118
  */
119 119
 #define SERIAL_PORT 0
120 120
 

+ 3
- 3
Marlin/src/config/examples/Velleman/K8400/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/adafruit/ST7565/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/delta/generic/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/delta/kossel_mini/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/delta/kossel_pro/Configuration.h Ver arquivo

@@ -98,11 +98,11 @@
98 98
 // @section machine
99 99
 
100 100
 /**
101
- * Select which serial port on the board will be used for communication with the host.
101
+ * Select the serial port on the board to use for communication with the host.
102 102
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
103
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
103
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
104 104
  *
105
- * :[0, 1, 2, 3, 4, 5, 6, 7]
105
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
106 106
  */
107 107
 #define SERIAL_PORT 0
108 108
 

+ 3
- 3
Marlin/src/config/examples/delta/kossel_xl/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/makibox/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/stm32f103ret6/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/tvrrug/Round2/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 3
- 3
Marlin/src/config/examples/wt150/Configuration.h Ver arquivo

@@ -94,11 +94,11 @@
94 94
 // @section machine
95 95
 
96 96
 /**
97
- * Select which serial port on the board will be used for communication with the host.
97
+ * Select the serial port on the board to use for communication with the host.
98 98
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
99
- * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
99
+ * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
100 100
  *
101
- * :[0, 1, 2, 3, 4, 5, 6, 7]
101
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
102 102
  */
103 103
 #define SERIAL_PORT 0
104 104
 

+ 5
- 7
Marlin/src/inc/Conditionals_LCD.h Ver arquivo

@@ -491,12 +491,10 @@
491 491
 #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
492 492
 #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED))
493 493
 
494
-  // For Re-ARM boards, always use the USB Emulated Serial Port unless RE_ARM_FORCE_SERIAL_PORT is defined
495
-  #if MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_14_RE_ARM_SF)
496
-    #ifndef RE_ARM_FORCE_SERIAL_PORT
497
-      #undef SERIAL_PORT
498
-      #define SERIAL_PORT -1
499
-    #endif
500
-  #endif
494
+// For Re-ARM boards, always use the USB Emulated Serial Port unless RE_ARM_FORCE_SERIAL_PORT is defined
495
+#if !defined(RE_ARM_FORCE_SERIAL_PORT) && (MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_14_RE_ARM_SF))
496
+  #undef SERIAL_PORT
497
+  #define SERIAL_PORT -1
498
+#endif
501 499
 
502 500
 #endif // CONDITIONALS_LCD_H

Carregando…
Cancelar
Salvar