zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1890 from thinkyhead/cold_extrude

Browse source 
Apply CUSTOM_MACHINE_NAME to configs
This commit is contained in:
Scott Lahteine 2015-04-11 00:04:46 -07:00
parent f1a03c5447 ccbe2c4ea3
commit 79a5b14eb7
16 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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)

10
Marlin/Marlin_main.cpp
View file

@ -141,7 +141,7 @@
// M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work. // M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
// M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating // M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
// Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling // Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
// M200 D<millimeters>- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). // M200 - set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).:D<millimeters>-
// M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000) // M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
// M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!! // M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
// M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec // M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec
@ -152,9 +152,9 @@
// M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec] // M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
// M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction. // M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.
// M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y> // M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
// M220 S<factor in percent>- set speed factor override percentage // M220 - Set speed factor override percentage: S<factor in percent>
// M221 S<factor in percent>- set extrude factor override percentage // M221 - Set extrude factor override percentage: S<factor in percent>
// M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required // M226 - Wait until the specified pin reaches the state required: P<pin number> S<pin state>
// M240 - Trigger a camera to take a photograph // M240 - Trigger a camera to take a photograph
// M250 - Set LCD contrast C<contrast value> (value 0..63) // M250 - Set LCD contrast C<contrast value> (value 0..63)
// M280 - Set servo position absolute. P: servo index, S: angle or microseconds // M280 - Set servo position absolute. P: servo index, S: angle or microseconds
@ -178,7 +178,7 @@
// M503 - Print the current settings (from memory not from EEPROM). Use S0 to leave off headings. // M503 - Print the current settings (from memory not from EEPROM). Use S0 to leave off headings.
// M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) // M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
// M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] // M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
// M665 - Set delta configurations // M665 - Set delta configurations: L<diagonal rod> R<delta radius> S<segments/s>
// M666 - Set delta endstop adjustment // M666 - Set delta endstop adjustment
// M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ] // M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
// M907 - Set digital trimpot motor current using axis codes. // M907 - Set digital trimpot motor current using axis codes.

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