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

Apply CUSTOM_MACHINE_NAME to configurations 

- Replace “Mendel” with “RepRap”
Scott Lahteine 9 years ago
parent
71adb1ee59
commit
ccbe2c4ea3
15 changed files with 38 additions and 27 deletions
Unified View Show Diff Stats
  1. 3
    2
      Marlin/Configuration.h
  2. 3
    2
      Marlin/configurator/config/Configuration.h
  3. 1
    1
      Marlin/configurator/config/language.h
  4. 1
    1
      Marlin/configurator/index.html
  5. 3
    2
      Marlin/example_configurations/Felix/Configuration.h
  6. 3
    2
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  7. 2
    2
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 3
    2
      Marlin/example_configurations/K8200/Configuration.h
  9. 3
    2
      Marlin/example_configurations/SCARA/Configuration.h
  10. 3
    2
      Marlin/example_configurations/WITBOX/Configuration.h
  11. 3
    2
      Marlin/example_configurations/delta/generic/Configuration.h
  12. 3
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  13. 3
    2
      Marlin/example_configurations/makibox/Configuration.h
  14. 3
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  15. 1
    1
      Marlin/language.h

+ 3
- 2
Marlin/Configuration.h View File

68 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
 68 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
69 
 #endif
 69 
 #endif
70
70
71 
-// Define this to set a custom name for your generic Mendel,
72 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
71 
+// Optional custom name for your RepStrap or other custom machine
72 
+// Displayed in the LCD "Ready" message
73 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
73
74
74 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 75 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
75 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 76 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

68 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
 68 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
69 
 #endif
 69 
 #endif
70
70
71 
-// Define this to set a custom name for your generic Mendel,
72 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
71 
+// Optional custom name for your RepStrap or other custom machine
72 
+// Displayed in the LCD "Ready" message
73 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
73
74
74 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 75 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
75 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 76 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

+ 1
- 1
Marlin/configurator/config/language.h View File

75 
 #endif
 75 
 #endif
76
76
77 
 #ifdef CUSTOM_MENDEL_NAME
 77 
 #ifdef CUSTOM_MENDEL_NAME
78 
-  #warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
78 
+  #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
79 
   #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
 79 
   #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
80 
 #endif
 80 
 #endif
81
81

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

46
46
47 
           <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>
 47 
           <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>
48
48
49 
-          <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" type="text" size="14" maxlength="12" value="" />
49 
+          <label class="newline">Custom Name:</label><input name="CUSTOM_MACHINE_NAME" type="text" size="14" maxlength="12" value="" />
50
50
51 
           <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" type="text" size="38" maxlength="36" value="" />
 51 
           <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" type="text" size="38" maxlength="36" value="" />
52
52

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

62 
   #define MOTHERBOARD BOARD_FELIX2
 62 
   #define MOTHERBOARD BOARD_FELIX2
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+#define CUSTOM_MACHINE_NAME "Felix"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_FELIX2
 62 
   #define MOTHERBOARD BOARD_FELIX2
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+#define CUSTOM_MACHINE_NAME "Felix Dual"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_HEPHESTOS
 62 
   #define MOTHERBOARD BOARD_HEPHESTOS
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67
67
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_K8200
 62 
   #define MOTHERBOARD BOARD_K8200
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

80 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
 80 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
81 
 #endif
 81 
 #endif
82
82
83 
-// Define this to set a custom name for your generic Mendel,
84 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
83 
+// Optional custom name for your RepStrap or other custom machine
84 
+// Displayed in the LCD "Ready" message
85 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
85
86
86 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 87 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
87 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 88 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_WITBOX
 62 
   #define MOTHERBOARD BOARD_WITBOX
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
 62 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+#define CUSTOM_MACHINE_NAME "Deltabot"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
 62 
   #define MOTHERBOARD BOARD_RAMPS_13_EFB
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-#define CUSTOM_MENDEL_NAME "Mini Kossel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+#define CUSTOM_MACHINE_NAME "Mini Kossel"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_5DPRINT
 62 
   #define MOTHERBOARD BOARD_5DPRINT
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

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

62 
   #define MOTHERBOARD BOARD_OMCA
 62 
   #define MOTHERBOARD BOARD_OMCA
63 
 #endif
 63 
 #endif
64
64
65 
-// Define this to set a custom name for your generic Mendel,
66 
-// #define CUSTOM_MENDEL_NAME "This Mendel"
65 
+// Optional custom name for your RepStrap or other custom machine
66 
+// Displayed in the LCD "Ready" message
67 
+// #define CUSTOM_MACHINE_NAME "This RepRap"
67
68
68 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
 69 
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
69 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
 70 
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

+ 1
- 1
Marlin/language.h View File

75 
 #endif
 75 
 #endif
76
76
77 
 #ifdef CUSTOM_MENDEL_NAME
 77 
 #ifdef CUSTOM_MENDEL_NAME
78 
-  #warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
78 
+  #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
79 
   #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
 79 
   #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
80 
 #endif
 80 
 #endif
81
81

Write Preview
Loading…
Cancel
Save