thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Clean up BOARD_NAME in pins

Scott Lahteine 6 years ago
parent
c0e917ea83
commit
cb60001784
38 changed files with 69 additions and 71 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/src/pins/pins_3DRAG.h
  2. 6
    10
      Marlin/src/pins/pins_ARMED.h
  3. 1
    1
      Marlin/src/pins/pins_AZTEEG_X5_GT.h
  4. 1
    1
      Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h
  5. 1
    1
      Marlin/src/pins/pins_BEAST.h
  6. 4
    1
      Marlin/src/pins/pins_BLACK_STM32F407VE.h
  7. 1
    1
      Marlin/src/pins/pins_CHITU3D.h
  8. 1
    1
      Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
  9. 2
    6
      Marlin/src/pins/pins_FORMBOT_RAPTOR.h
  10. 1
    1
      Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
  11. 1
    1
      Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h
  12. 1
    1
      Marlin/src/pins/pins_FORMBOT_TREX3.h
  13. 1
    1
      Marlin/src/pins/pins_FYSETC_CHEETAH.h
  14. 1
    1
      Marlin/src/pins/pins_GTM32_PRO_VB.h
  15. 1
    1
      Marlin/src/pins/pins_K8400.h
  16. 1
    1
      Marlin/src/pins/pins_K8800.h
  17. 3
    10
      Marlin/src/pins/pins_MAKEBOARD_MINI.h
  18. 1
    1
      Marlin/src/pins/pins_MALYAN_M200.h
  19. 1
    1
      Marlin/src/pins/pins_MEGATRONICS_2.h
  20. 2
    2
      Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
  21. 1
    1
      Marlin/src/pins/pins_MKS_SGEN.h
  22. 1
    1
      Marlin/src/pins/pins_MKS_SGEN_L.h
  23. 2
    2
      Marlin/src/pins/pins_REMRAM_V1.h
  24. 3
    1
      Marlin/src/pins/pins_RIGIDBOARD.h
  25. 2
    3
      Marlin/src/pins/pins_RIGIDBOARD_V2.h
  26. 1
    1
      Marlin/src/pins/pins_RL200.h
  27. 3
    3
      Marlin/src/pins/pins_RUMBA.h
  28. 2
    2
      Marlin/src/pins/pins_RUMBA32.h
  29. 1
    1
      Marlin/src/pins/pins_RUMBA_RAISE3D.h
  30. 2
    2
      Marlin/src/pins/pins_SAV_MKI.h
  31. 1
    0
      Marlin/src/pins/pins_STB_11.h
  32. 1
    1
      Marlin/src/pins/pins_STM32F1R.h
  33. 1
    1
      Marlin/src/pins/pins_STM32F4.h
  34. 2
    2
      Marlin/src/pins/pins_STM3R_MINI.h
  35. 2
    2
      Marlin/src/pins/pins_THE_BORG.h
  36. 1
    1
      Marlin/src/pins/pins_ULTIMAIN_2.h
  37. 2
    2
      Marlin/src/pins/pins_ULTIMAKER.h
  38. 9
    1
      Marlin/src/pins/pins_ULTIMAKER_OLD.h

+ 1
- 1
Marlin/src/pins/pins_3DRAG.h View File

30 
 #endif
 30 
 #endif
31
31
32 
 #ifndef DEFAULT_MACHINE_NAME
 32 
 #ifndef DEFAULT_MACHINE_NAME
33 
-  #define DEFAULT_MACHINE_NAME "3Drag"
33 
+  #define DEFAULT_MACHINE_NAME BOARD_NAME
34 
 #endif
 34 
 #endif
35
35
36 
 #ifndef DEFAULT_SOURCE_CODE_URL
 36 
 #ifndef DEFAULT_SOURCE_CODE_URL

+ 6
- 10
Marlin/src/pins/pins_ARMED.h View File

25 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 25 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26 
 #endif
 26 
 #endif
27
27
28 
-#ifndef ARMED_V1_0
29 
-  #define ARMED_V1_1
30 
-#endif
31 
-
32 
-#define DEFAULT_MACHINE_NAME "Arm'ed"
28 
+#define ARMED_V1_1
33
29
34 
-#undef BOARD_NAME
35 
-#define BOARD_NAME "Arm'ed"
30 
+#define BOARD_NAME           "Arm'ed"
31 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
36
32
37 
 #define I2C_EEPROM
 33 
 #define I2C_EEPROM
38
34
90 
 #define E0_DIR_PIN         PB6
 86 
 #define E0_DIR_PIN         PB6
91 
 #define E0_CS_PIN          PB4
 87 
 #define E0_CS_PIN          PB4
92
88
93 
-#ifdef ARMED_V1_0
94 
-  #define E0_ENABLE_PIN    PB3
95 
-#else
89 
+#ifdef ARMED_V1_1
96 
   #define E0_ENABLE_PIN    PC12
 90 
   #define E0_ENABLE_PIN    PC12
91 
+#else
92 
+  #define E0_ENABLE_PIN    PB3
97 
 #endif
 93 
 #endif
98
94
99 
 #ifdef ARMED_SWAP_X_E1
 95 
 #ifdef ARMED_SWAP_X_E1

+ 1
- 1
Marlin/src/pins/pins_AZTEEG_X5_GT.h View File

30 
 #endif
 30 
 #endif
31
31
32 
 #define BOARD_NAME        "Azteeg X5 GT"
 32 
 #define BOARD_NAME        "Azteeg X5 GT"
33 
-#define BOARD_WEBSITE_URL "https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm"
33 
+#define BOARD_WEBSITE_URL "https://tinyurl.com/yx8tdqa3"
34
34
35 
 //
 35 
 //
36 
 //  Set CPU
 36 
 //  Set CPU

+ 1
- 1
Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h View File

29 
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 29 
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME        "Azteeg X5 MINI WIFI"
32 
+#define BOARD_NAME "Azteeg X5 MINI WIFI"
33
33
34 
 //
 34 
 //
35 
 // DIGIPOT slave addresses
 35 
 // DIGIPOT slave addresses

+ 1
- 1
Marlin/src/pins/pins_BEAST.h View File

29 
  * 21017 Victor Perez Marlin for stm32f1 test
 29 
  * 21017 Victor Perez Marlin for stm32f1 test
30 
  */
 30 
  */
31
31
32 
+#define BOARD_NAME "Beast STM32"
32 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
 33 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
33 
-#define BOARD_NAME "Marlin for STM32"
34
34
35 
 // Enable I2C_EEPROM for testing
 35 
 // Enable I2C_EEPROM for testing
36 
 #define I2C_EEPROM
 36 
 #define I2C_EEPROM

+ 4
- 1
Marlin/src/pins/pins_BLACK_STM32F407VE.h View File

33 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 33 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
34 
 #endif
 34 
 #endif
35
35
36 
+#ifndef BOARD_NAME
37 
+  #define BOARD_NAME "Black STM32F4VET6"
38 
+#endif
39 
+
36 
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
 40 
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
37 
-//#define BOARD_NAME "Black STM32F4VET6"
38
41
39 
 //#define I2C_EEPROM
 42 
 //#define I2C_EEPROM
40 
 //#define E2END 0x1FFF // EEPROM end address (8kB)
 43 
 //#define E2END 0x1FFF // EEPROM end address (8kB)

+ 1
- 1
Marlin/src/pins/pins_CHITU3D.h View File

29 
  * 2017 Victor Perez Marlin for stm32f1 test
 29 
  * 2017 Victor Perez Marlin for stm32f1 test
30 
  */
 30 
  */
31
31
32 
+#define BOARD_NAME           "Chitu3D"
32 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
 33 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
33 
-#define BOARD_NAME "Chitu3d Marlin"
34
34
35 
 // Enable I2C_EEPROM for testing
 35 
 // Enable I2C_EEPROM for testing
36 
 //#define I2C_EEPROM
 36 
 //#define I2C_EEPROM

+ 1
- 1
Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h View File

29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME         "Duplicator i3 Plus"
32 
+#define BOARD_NAME "Duplicator i3 Plus"
33
33
34 
 //
 34 
 //
35 
 // Limit Switches
 35 
 // Limit Switches

+ 2
- 6
Marlin/src/pins/pins_FORMBOT_RAPTOR.h View File

33 
   #error "Formbot supports up to 3 hotends / E-steppers. Comment this line to keep going."
 33 
   #error "Formbot supports up to 3 hotends / E-steppers. Comment this line to keep going."
34 
 #endif
 34 
 #endif
35
35
36 
-#ifndef DEFAULT_MACHINE_NAME
37 
-  #define DEFAULT_MACHINE_NAME "Formbot Raptor"
38 
-#endif
39 
-#ifndef BOARD_NAME
40 
-  #define BOARD_NAME           "Formbot Raptor"
41 
-#endif
36 
+#define BOARD_NAME           "Formbot Raptor"
37 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
42
38
43 
 //
 39 
 //
44 
 // Servos
 40 
 // Servos

+ 1
- 1
Marlin/src/pins/pins_FORMBOT_RAPTOR2.h View File

25 
  * Formbot Raptor 2 pin assignments
 25 
  * Formbot Raptor 2 pin assignments
26 
  */
 26 
  */
27
27
28 
-#define DEFAULT_MACHINE_NAME "Formbot Raptor2"
29 
 #define BOARD_NAME           "Formbot Raptor2"
 28 
 #define BOARD_NAME           "Formbot Raptor2"
29 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
30
30
31 
 #define FAN_PIN             6
 31 
 #define FAN_PIN             6
32
32

+ 1
- 1
Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h View File

33 
   #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
 33 
   #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
34 
 #endif
 34 
 #endif
35
35
36 
-#define DEFAULT_MACHINE_NAME "Formbot"
37 
 #define BOARD_NAME           "Formbot"
 36 
 #define BOARD_NAME           "Formbot"
37 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
38
38
39 
 //
 39 
 //
40 
 // Servos
 40 
 // Servos

+ 1
- 1
Marlin/src/pins/pins_FORMBOT_TREX3.h View File

33 
   #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
 33 
   #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
34 
 #endif
 34 
 #endif
35
35
36 
-#define DEFAULT_MACHINE_NAME "Formbot"
37 
 #define BOARD_NAME           "Formbot"
 36 
 #define BOARD_NAME           "Formbot"
37 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
38
38
39 
 //
 39 
 //
40 
 // Servos
 40 
 // Servos

+ 1
- 1
Marlin/src/pins/pins_FYSETC_CHEETAH.h View File

27
27
28 
 #define DEFAULT_MACHINE_NAME "3D Printer"
 28 
 #define DEFAULT_MACHINE_NAME "3D Printer"
29
29
30 
-#define BOARD_NAME "FYSETC CHEETAH"
30 
+#define BOARD_NAME        "FYSETC Cheetah"
31 
 #define BOARD_WEBSITE_URL "https://fysetc.com"
 31 
 #define BOARD_WEBSITE_URL "https://fysetc.com"
32
32
33 
 // Ignore temp readings during develpment.
 33 
 // Ignore temp readings during develpment.

+ 1
- 1
Marlin/src/pins/pins_GTM32_PRO_VB.h View File

30 
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 30 
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
31 
 #endif
 31 
 #endif
32
32
33 
+#define BOARD_NAME           "GTM32 Pro VB"
33 
 #define DEFAULT_MACHINE_NAME "STM32F103VET6"
 34 
 #define DEFAULT_MACHINE_NAME "STM32F103VET6"
34 
-#define BOARD_NAME "GTM32 Pro VB"
35
35
36 
 //#define DISABLE_DEBUG
 36 
 //#define DISABLE_DEBUG
37
37

+ 1
- 1
Marlin/src/pins/pins_K8400.h View File

32 
  *  - Second heater has moved pin
 32 
  *  - Second heater has moved pin
33 
  */
 33 
  */
34
34
35 
-#define DEFAULT_MACHINE_NAME    "Vertex"
36 
 #define BOARD_NAME              "K8400"
 35 
 #define BOARD_NAME              "K8400"
36 
+#define DEFAULT_MACHINE_NAME    "Vertex"
37
37
38 
 #include "pins_3DRAG.h"
 38 
 #include "pins_3DRAG.h"
39
39

+ 1
- 1
Marlin/src/pins/pins_K8800.h View File

29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30 
 #endif
 30 
 #endif
31
31
32 
-#define DEFAULT_MACHINE_NAME "Vertex Delta"
33 
 #define BOARD_NAME           "K8800"
 32 
 #define BOARD_NAME           "K8800"
33 
+#define DEFAULT_MACHINE_NAME "Vertex Delta"
34
34
35 
 //#define LCD_SCREEN_ROT_180
 35 
 //#define LCD_SCREEN_ROT_180
36
36

+ 3
- 10
Marlin/src/pins/pins_MAKEBOARD_MINI.h View File

21 
  */
 21 
  */
22 
 #pragma once
 22 
 #pragma once
23
23
24 
-#include "pins_RAMPS.h"
25 
-
26 
-#undef BOARD_NAME
27 
-#define BOARD_NAME "MAKEBOARD_MINI"
24 
+#define BOARD_NAME "MAKEboard Mini"
28
25
29 
 //
 26 
 //
30 
 // Only 3 Limit Switch plugs on Micromake C1
 27 
 // Only 3 Limit Switch plugs on Micromake C1
31 
 //
 28 
 //
32 
-#undef X_MIN_PIN
33 
-#undef Y_MIN_PIN
34 
-#undef Z_MIN_PIN
35 
-#undef X_MAX_PIN
36 
-#undef Y_MAX_PIN
37 
-#undef Z_MAX_PIN
38 
 #define X_STOP_PIN          2
 29 
 #define X_STOP_PIN          2
39 
 #define Y_STOP_PIN         15
 30 
 #define Y_STOP_PIN         15
40 
 #define Z_STOP_PIN         19
 31 
 #define Z_STOP_PIN         19
32 
+
33 
+#include "pins_RAMPS.h"

+ 1
- 1
Marlin/src/pins/pins_MALYAN_M200.h View File

29 
   #error "Oops! You must be compiling for STM32."
 29 
   #error "Oops! You must be compiling for STM32."
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME "MALYANM200"
32 
+#define BOARD_NAME "Malyan M200"
33
33
34 
 // Enable EEPROM Emulation for this board
 34 
 // Enable EEPROM Emulation for this board
35 
 // This setting should probably be in configuration.h
 35 
 // This setting should probably be in configuration.h

+ 1
- 1
Marlin/src/pins/pins_MEGATRONICS_2.h View File

29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 29 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME         "Megatronics v2.0"
32 
+#define BOARD_NAME "Megatronics v2.0"
33 
 //
 33 
 //
34 
 // Limit Switches
 34 
 // Limit Switches
35 
 //
 35 
 //

+ 2
- 2
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h View File

41 
   #error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
 41 
   #error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
42 
 #endif
 42 
 #endif
43
43
44 
-#define DEFAULT_MACHINE_NAME    "MB Replicator"
45 
-#define BOARD_NAME              "Mightyboard"
44 
+#define BOARD_NAME           "Mightyboard"
45 
+#define DEFAULT_MACHINE_NAME "MB Replicator"
46
46
47 
 //
 47 
 //
48 
 // Servos
 48 
 // Servos

+ 1
- 1
Marlin/src/pins/pins_MKS_SGEN.h View File

29 
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 29 
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME        "MKS SGEN"
32 
+#define BOARD_NAME        "MKS SGen"
33 
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"
 33 
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"
34
34
35 
 #include "pins_MKS_SBASE.h"
 35 
 #include "pins_MKS_SBASE.h"

+ 1
- 1
Marlin/src/pins/pins_MKS_SGEN_L.h View File

29 
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 29 
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
30 
 #endif
 30 
 #endif
31
31
32 
-#define BOARD_NAME        "MKS SGEN-L"
32 
+#define BOARD_NAME        "MKS SGen-L"
33 
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"
 33 
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"
34
34
35 
 //
 35 
 //

+ 2
- 2
Marlin/src/pins/pins_REMRAM_V1.h View File

25 
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
 25 
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
26 
 #endif
 26 
 #endif
27
27
28 
+#define BOARD_NAME           "RemRam v1"
28 
 #define DEFAULT_MACHINE_NAME "RemRam"
 29 
 #define DEFAULT_MACHINE_NAME "RemRam"
29 
-#define BOARD_NAME "RemRam v1"
30
30
31 
-#define EEPROM_EMULATED_WITH_SRAM // Emulate the EEPROM using Backup SRAM
31 
+#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
32
32
33 
 #if HOTENDS > 1 || E_STEPPERS > 1
 33 
 #if HOTENDS > 1 || E_STEPPERS > 1
34 
   #error "RemRam supports only one hotend / E-stepper."
 34 
   #error "RemRam supports only one hotend / E-stepper."

+ 3
- 1
Marlin/src/pins/pins_RIGIDBOARD.h View File

25 
  * RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
 25 
  * RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
26 
  */
 26 
  */
27
27
28 
-#define BOARD_NAME "RigidBoard"
28 
+#ifndef BOARD_NAME
29 
+  #define BOARD_NAME "RigidBoard"
30 
+#endif
29
31
30 
 //
 32 
 //
31 
 // Z Probe (when not Z_MIN_PIN)
 33 
 // Z Probe (when not Z_MIN_PIN)

+ 2
- 3
Marlin/src/pins/pins_RIGIDBOARD_V2.h View File

25 
  * RIGIDBOARD V2 Arduino Mega with RAMPS v1.4 pin assignments
 25 
  * RIGIDBOARD V2 Arduino Mega with RAMPS v1.4 pin assignments
26 
  */
 26 
  */
27
27
28 
-#include "pins_RIGIDBOARD.h"
29 
-
30 
-#undef BOARD_NAME
31 
 #define BOARD_NAME "RigidBoard V2"
 28 
 #define BOARD_NAME "RigidBoard V2"
32
29
30 
+#include "pins_RIGIDBOARD.h"
31 
+
33 
 //
 32 
 //
34 
 // Steppers
 33 
 // Steppers
35 
 //
 34 
 //

+ 1
- 1
Marlin/src/pins/pins_RL200.h View File

26 
  * extruder motors due to dual Z motors. Pinout therefore based on pins_RUMBA.h.
 26 
  * extruder motors due to dual Z motors. Pinout therefore based on pins_RUMBA.h.
27 
  */
 27 
  */
28
28
29 
-#define DEFAULT_MACHINE_NAME "Rapide Lite 200"
30 
 #define BOARD_NAME "RL200"
 29 
 #define BOARD_NAME "RL200"
30 
+#define DEFAULT_MACHINE_NAME "Rapide Lite 200"
31
31
32 
 #if HOTENDS > 2 || E_STEPPERS > 2
 32 
 #if HOTENDS > 2 || E_STEPPERS > 2
33 
   #error "RL200v1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
 33 
   #error "RL200v1 supports up to 2 hotends / E-steppers. Comment out this line to continue."

+ 3
- 3
Marlin/src/pins/pins_RUMBA.h View File

33 
   #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
 33 
   #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
34 
 #endif
 34 
 #endif
35
35
36 
-#ifndef DEFAULT_MACHINE_NAME
37 
-  #define DEFAULT_MACHINE_NAME "Rumba"
38 
-#endif
39 
 #ifndef BOARD_NAME
 36 
 #ifndef BOARD_NAME
40 
   #define BOARD_NAME "Rumba"
 37 
   #define BOARD_NAME "Rumba"
41 
 #endif
 38 
 #endif
39 
+#ifndef DEFAULT_MACHINE_NAME
40 
+  #define DEFAULT_MACHINE_NAME BOARD_NAME
41 
+#endif
42
42
43 
 //
 43 
 //
44 
 // Servos
 44 
 // Servos

+ 2
- 2
Marlin/src/pins/pins_RUMBA32.h View File

26 
 #endif
 26 
 #endif
27
27
28 
 #define RUMBA32_V1_0
 28 
 #define RUMBA32_V1_0
29 
-#define DEFAULT_MACHINE_NAME "RUMBA32"
30 
-#define BOARD_NAME "RUMBA32"
29 
+#define BOARD_NAME           "RUMBA32"
30 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
31
31
32 
 //#define I2C_EEPROM
 32 
 //#define I2C_EEPROM
33
33

+ 1
- 1
Marlin/src/pins/pins_RUMBA_RAISE3D.h View File

21 
  */
 21 
  */
22 
 #pragma once
 22 
 #pragma once
23
23
24 
-#define DEFAULT_MACHINE_NAME "Raise3D N Series"
25 
 #define BOARD_NAME           "Raise3D Rumba"
 24 
 #define BOARD_NAME           "Raise3D Rumba"
25 
+#define DEFAULT_MACHINE_NAME "Raise3D N Series"
26
26
27 
 // Raise3D uses thermocouples on the standard input pins
 27 
 // Raise3D uses thermocouples on the standard input pins
28 
 #define TEMP_0_PIN         15   // Analog Input
 28 
 #define TEMP_0_PIN         15   // Analog Input

+ 2
- 2
Marlin/src/pins/pins_SAV_MKI.h View File

66 
   #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'"
 66 
   #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'"
67 
 #endif
 67 
 #endif
68
68
69 
-#define DEFAULT_MACHINE_NAME    "SAV MkI"
70 
-#define DEFAULT_SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
71 
 #define BOARD_NAME              "SAV MkI"
 69 
 #define BOARD_NAME              "SAV MkI"
70 
+#define DEFAULT_MACHINE_NAME    BOARD_NAME
71 
+#define DEFAULT_SOURCE_CODE_URL "https://tinyurl.com/onru38b"
72
72
73 
 //
 73 
 //
74 
 // Servos
 74 
 // Servos

+ 1
- 0
Marlin/src/pins/pins_STB_11.h View File

26 
  */
 26 
  */
27
27
28 
 #define BOARD_NAME "STB V1.1"
 28 
 #define BOARD_NAME "STB V1.1"
29 
+
29 
 #include "pins_SANGUINOLOLU_12.h"
 30 
 #include "pins_SANGUINOLOLU_12.h"

+ 1
- 1
Marlin/src/pins/pins_STM32F1R.h View File

29 
  * 21017 Victor Perez Marlin for stm32f1 test
 29 
  * 21017 Victor Perez Marlin for stm32f1 test
30 
  */
 30 
  */
31
31
32 
+#define BOARD_NAME           "Misc. STM32F1R"
32 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
 33 
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
33 
-#define BOARD_NAME "Marlin for STM32"
34
34
35 
 // Ignore temp readings during develpment.
 35 
 // Ignore temp readings during develpment.
36 
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
 36 
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE

+ 1
- 1
Marlin/src/pins/pins_STM32F4.h View File

25 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 25 
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26 
 #endif
 26 
 #endif
27
27
28 
+#define BOARD_NAME           "Misc. STM32F4"
28 
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
 29 
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
29 
-#define BOARD_NAME "STM32F4 Board"
30
30
31 
 //#define I2C_EEPROM
 31 
 //#define I2C_EEPROM
32
32

+ 2
- 2
Marlin/src/pins/pins_STM3R_MINI.h View File

29 
  * 21017 Victor Perez Marlin for stm32f1 test
 29 
  * 21017 Victor Perez Marlin for stm32f1 test
30 
  */
 30 
  */
31
31
32 
-#define DEFAULT_MACHINE_NAME "STM3R Mini"
33 
-#define BOARD_NAME "Marlin for STM32"
32 
+#define BOARD_NAME           "STM3R Mini"
33 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
34
34
35 
 // Enable I2C_EEPROM for testing
 35 
 // Enable I2C_EEPROM for testing
36 
 #define I2C_EEPROM
 36 
 #define I2C_EEPROM

+ 2
- 2
Marlin/src/pins/pins_THE_BORG.h View File

25 
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
 25 
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
26 
 #endif
 26 
 #endif
27
27
28 
-#define DEFAULT_MACHINE_NAME "The-Borge"
29 
-#define BOARD_NAME "The-Borge"
28 
+#define BOARD_NAME           "The-Borge"
29 
+#define DEFAULT_MACHINE_NAME BOARD_NAME
30
30
31 
 #define E2END 0xFFF   // EEPROM end address
 31 
 #define E2END 0xFFF   // EEPROM end address
32
32

+ 1
- 1
Marlin/src/pins/pins_ULTIMAIN_2.h View File

37 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 37 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
38 
 #endif
 38 
 #endif
39
39
40 
+#define BOARD_NAME              "Ultimaker 2.x"
40 
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
 41 
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
41 
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
 42 
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
42 
-#define BOARD_NAME              "Ultimaker 2.x"
43
43
44 
 //
 44 
 //
45 
 // Limit Switches
 45 
 // Limit Switches

+ 2
- 2
Marlin/src/pins/pins_ULTIMAKER.h View File

37 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 37 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
38 
 #endif
 38 
 #endif
39
39
40 
-#define DEFAULT_MACHINE_NAME    "Ultimaker"
41 
-#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
42 
 #define BOARD_NAME              "Ultimaker"
 40 
 #define BOARD_NAME              "Ultimaker"
41 
+#define DEFAULT_MACHINE_NAME    BOARD_NAME
42 
+#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
43
43
44 
 //
 44 
 //
45 
 // Servos
 45 
 // Servos

+ 9
- 1
Marlin/src/pins/pins_ULTIMAKER_OLD.h View File

64 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 64 
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
65 
 #endif
 65 
 #endif
66
66
67 
+#ifdef BOARD_REV_1_1_TO_1_3
68 
+  #define BOARD_NAME            "Ultimaker 1.1-1.3"
69 
+#elif defined(BOARD_REV_1_0)
70 
+  #define BOARD_NAME            "Ultimaker 1.0"
71 
+#elif defined(BOARD_REV_1_5)
72 
+  #define BOARD_NAME            "Ultimaker 1.5"
73 
+#else
74 
+  #define BOARD_NAME            "Ultimaker 1.5.4+"
75 
+#endif
67 
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
 76 
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
68 
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
 77 
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
69 
-#define BOARD_NAME              "Ultimaker <1.5.4"
70
78
71 
 //
 79 
 //
72 
 // Limit Switches
 80 
 // Limit Switches

Write Preview
Loading…
Cancel
Save