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

Apply CUSTOM_MACHINE_NAME to configurations 

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

5
Marlin/Configuration.h
View File

@ -68,8 +68,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_RAMPS_13_EFB #define MOTHERBOARD BOARD_RAMPS_13_EFB
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/configurator/config/Configuration.h
View File

@ -68,8 +68,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_RAMPS_13_EFB #define MOTHERBOARD BOARD_RAMPS_13_EFB
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

2
Marlin/configurator/config/language.h
View File

@ -75,7 +75,7 @@
#endif #endif
#ifdef CUSTOM_MENDEL_NAME #ifdef CUSTOM_MENDEL_NAME
#warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
#define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
#endif #endif

2
Marlin/configurator/index.html
View File

@ -46,7 +46,7 @@
<label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select>
<label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" type="text" size="14" maxlength="12" value="" /> <label class="newline">Custom Name:</label><input name="CUSTOM_MACHINE_NAME" type="text" size="14" maxlength="12" value="" />
<label class="newline">Machine UUID:</label><input name="MACHINE_UUID" type="text" size="38" maxlength="36" value="" /> <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" type="text" size="38" maxlength="36" value="" />

5
Marlin/example_configurations/Felix/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_FELIX2 #define MOTHERBOARD BOARD_FELIX2
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Felix"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/Felix/Configuration_DUAL.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_FELIX2 #define MOTHERBOARD BOARD_FELIX2
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Felix Dual"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

4
Marlin/example_configurations/Hephestos/Configuration.h
View File

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

5
Marlin/example_configurations/K8200/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_K8200 #define MOTHERBOARD BOARD_K8200
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -80,8 +80,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_RAMPS_13_EFB #define MOTHERBOARD BOARD_RAMPS_13_EFB
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_WITBOX #define MOTHERBOARD BOARD_WITBOX
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_RAMPS_13_EFB #define MOTHERBOARD BOARD_RAMPS_13_EFB
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Deltabot"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_RAMPS_13_EFB #define MOTHERBOARD BOARD_RAMPS_13_EFB
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
#define CUSTOM_MENDEL_NAME "Mini Kossel" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Mini Kossel"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/makibox/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_5DPRINT #define MOTHERBOARD BOARD_5DPRINT
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

5
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -62,8 +62,9 @@ Here are some standard links for getting your machine calibrated:
#define MOTHERBOARD BOARD_OMCA #define MOTHERBOARD BOARD_OMCA
#endif #endif
// Define this to set a custom name for your generic Mendel, // Optional custom name for your RepStrap or other custom machine
// #define CUSTOM_MENDEL_NAME "This Mendel" // Displayed in the LCD "Ready" message
// #define CUSTOM_MACHINE_NAME "This RepRap"
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

2
Marlin/language.h
View File

@ -75,7 +75,7 @@
#endif #endif
#ifdef CUSTOM_MENDEL_NAME #ifdef CUSTOM_MENDEL_NAME
#warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
#define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
#endif #endif

Write Preview
Loading…
Cancel
Save