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

Merge pull request #1890 from thinkyhead/cold_extrude 

Apply CUSTOM_MACHINE_NAME to configs
Scott Lahteine 10 years ago
parent
f1a03c5447 ccbe2c4ea3
commit
79a5b14eb7
16 changed files with 43 additions and 32 deletions
Unified View Show Diff Stats
  1. 3
    2
      Marlin/Configuration.h
  2. 5
    5
      Marlin/Marlin_main.cpp
  3. 3
    2
      Marlin/configurator/config/Configuration.h
  4. 1
    1
      Marlin/configurator/config/language.h
  5. 1
    1
      Marlin/configurator/index.html
  6. 3
    2
      Marlin/example_configurations/Felix/Configuration.h
  7. 3
    2
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  8. 2
    2
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 3
    2
      Marlin/example_configurations/K8200/Configuration.h
  10. 3
    2
      Marlin/example_configurations/SCARA/Configuration.h
  11. 3
    2
      Marlin/example_configurations/WITBOX/Configuration.h
  12. 3
    2
      Marlin/example_configurations/delta/generic/Configuration.h
  13. 3
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  14. 3
    2
      Marlin/example_configurations/makibox/Configuration.h
  15. 3
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  16. 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)

+ 5
- 5
Marlin/Marlin_main.cpp View File

141 
 // 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.
 141 
 // 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.
142 
 // M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
 142 
 // M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
143 
 //        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
 143 
 //        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
144 
-// M200 D<millimeters>- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
144 
+// M200 - set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).:D<millimeters>-
145 
 // M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
 145 
 // M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
146 
 // M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
 146 
 // M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
147 
 // M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec
 147 
 // M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec
152 
 // M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
 152 
 // M208 - Set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
153 
 // 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.
 153 
 // 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.
154 
 // M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
 154 
 // M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
155 
-// M220 S<factor in percent>- set speed factor override percentage
156 
-// M221 S<factor in percent>- set extrude factor override percentage
157 
-// M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required
155 
+// M220 - Set speed factor override percentage: S<factor in percent>
156 
+// M221 - Set extrude factor override percentage: S<factor in percent>
157 
+// M226 - Wait until the specified pin reaches the state required: P<pin number> S<pin state>
158 
 // M240 - Trigger a camera to take a photograph
 158 
 // M240 - Trigger a camera to take a photograph
159 
 // M250 - Set LCD contrast C<contrast value> (value 0..63)
 159 
 // M250 - Set LCD contrast C<contrast value> (value 0..63)
160 
 // M280 - Set servo position absolute. P: servo index, S: angle or microseconds
 160 
 // M280 - Set servo position absolute. P: servo index, S: angle or microseconds
178 
 // M503 - Print the current settings (from memory not from EEPROM). Use S0 to leave off headings.
 178 
 // M503 - Print the current settings (from memory not from EEPROM). Use S0 to leave off headings.
179 
 // M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
 179 
 // M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
180 
 // M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
 180 
 // M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
181 
-// M665 - Set delta configurations
181 
+// M665 - Set delta configurations: L<diagonal rod> R<delta radius> S<segments/s>
182 
 // M666 - Set delta endstop adjustment
 182 
 // M666 - Set delta endstop adjustment
183 
 // M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
 183 
 // M605 - Set dual x-carriage movement mode: S<mode> [ X<duplication x-offset> R<duplication temp offset> ]
184 
 // M907 - Set digital trimpot motor current using axis codes.
 184 
 // M907 - Set digital trimpot motor current using axis codes.

+ 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