Browse Source

initial working laser engraver config

Thomas Buck 2 months ago
parent
commit
41cd87398d

+ 43
- 42
Marlin/Configuration.h View File

@@ -60,7 +60,7 @@
60 60
 // @section info
61 61
 
62 62
 // Author info of this build printed to the host during boot and M115
63
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
63
+#define STRING_CONFIG_H_AUTHOR "(xythobuz, laser-engraver)" // Who made the changes.
64 64
 //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
65 65
 
66 66
 /**
@@ -87,7 +87,7 @@
87 87
 
88 88
 // Choose the name from boards.h that matches your setup
89 89
 #ifndef MOTHERBOARD
90
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
90
+  #define MOTHERBOARD BOARD_GT2560_REV_A
91 91
 #endif
92 92
 
93 93
 /**
@@ -111,7 +111,7 @@
111 111
  *
112 112
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
113 113
  */
114
-#define BAUDRATE 250000
114
+#define BAUDRATE 115200
115 115
 
116 116
 //#define BAUD_RATE_GCODE     // Enable G-code M575 to set the baud rate
117 117
 
@@ -135,7 +135,7 @@
135 135
 //#define BLUETOOTH
136 136
 
137 137
 // Name displayed in the LCD "Ready" message and Info menu
138
-//#define CUSTOM_MACHINE_NAME "3D Printer"
138
+#define CUSTOM_MACHINE_NAME "xyLaser"
139 139
 
140 140
 // Printer's unique ID, used by some programs to differentiate between machines.
141 141
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
@@ -158,9 +158,9 @@
158 158
  *          TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
159 159
  * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
160 160
  */
161
-#define X_DRIVER_TYPE  A4988
162
-#define Y_DRIVER_TYPE  A4988
163
-#define Z_DRIVER_TYPE  A4988
161
+#define X_DRIVER_TYPE  TMC2100
162
+#define Y_DRIVER_TYPE  TMC2100
163
+//#define Z_DRIVER_TYPE  A4988
164 164
 //#define X2_DRIVER_TYPE A4988
165 165
 //#define Y2_DRIVER_TYPE A4988
166 166
 //#define Z2_DRIVER_TYPE A4988
@@ -172,7 +172,7 @@
172 172
 //#define U_DRIVER_TYPE  A4988
173 173
 //#define V_DRIVER_TYPE  A4988
174 174
 //#define W_DRIVER_TYPE  A4988
175
-#define E0_DRIVER_TYPE A4988
175
+//#define E0_DRIVER_TYPE A4988
176 176
 //#define E1_DRIVER_TYPE A4988
177 177
 //#define E2_DRIVER_TYPE A4988
178 178
 //#define E3_DRIVER_TYPE A4988
@@ -227,7 +227,7 @@
227 227
 
228 228
 // This defines the number of extruders
229 229
 // :[0, 1, 2, 3, 4, 5, 6, 7, 8]
230
-#define EXTRUDERS 1
230
+#define EXTRUDERS 0
231 231
 
232 232
 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
233 233
 #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
@@ -536,7 +536,7 @@
536 536
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
537 537
  *
538 538
  */
539
-#define TEMP_SENSOR_0 1
539
+#define TEMP_SENSOR_0 0
540 540
 #define TEMP_SENSOR_1 0
541 541
 #define TEMP_SENSOR_2 0
542 542
 #define TEMP_SENSOR_3 0
@@ -850,10 +850,10 @@
850 850
  * details can be tuned in Configuration_adv.h
851 851
  */
852 852
 
853
-#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
854
-#define THERMAL_PROTECTION_BED     // Enable thermal protection for the heated bed
855
-#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
856
-#define THERMAL_PROTECTION_COOLER  // Enable thermal protection for the laser cooling
853
+//#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
854
+//#define THERMAL_PROTECTION_BED     // Enable thermal protection for the heated bed
855
+//#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
856
+//#define THERMAL_PROTECTION_COOLER  // Enable thermal protection for the laser cooling
857 857
 
858 858
 //===========================================================================
859 859
 //============================= Mechanical Settings =========================
@@ -1036,7 +1036,7 @@
1036 1036
 // extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
1037 1037
 #define USE_XMIN_PLUG
1038 1038
 #define USE_YMIN_PLUG
1039
-#define USE_ZMIN_PLUG
1039
+//#define USE_ZMIN_PLUG
1040 1040
 //#define USE_IMIN_PLUG
1041 1041
 //#define USE_JMIN_PLUG
1042 1042
 //#define USE_KMIN_PLUG
@@ -1143,7 +1143,7 @@
1143 1143
 //#define ENDSTOP_NOISE_THRESHOLD 2
1144 1144
 
1145 1145
 // Check for stuck or disconnected endstops during homing moves.
1146
-//#define DETECT_BROKEN_ENDSTOP
1146
+#define DETECT_BROKEN_ENDSTOP
1147 1147
 
1148 1148
 //=============================================================================
1149 1149
 //============================== Movement Settings ============================
@@ -1170,18 +1170,18 @@
1170 1170
  * Override with M92
1171 1171
  *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
1172 1172
  */
1173
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 500 }
1173
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80 }
1174 1174
 
1175 1175
 /**
1176 1176
  * Default Max Feed Rate (linear=mm/s, rotational=°/s)
1177 1177
  * Override with M203
1178 1178
  *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
1179 1179
  */
1180
-#define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
1180
+#define DEFAULT_MAX_FEEDRATE          { 200, 200 }
1181 1181
 
1182
-//#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
1182
+#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
1183 1183
 #if ENABLED(LIMITED_MAX_FR_EDITING)
1184
-  #define MAX_FEEDRATE_EDIT_VALUES    { 600, 600, 10, 50 } // ...or, set your own edit limits
1184
+  #define MAX_FEEDRATE_EDIT_VALUES    { 400, 400 } // ...or, set your own edit limits
1185 1185
 #endif
1186 1186
 
1187 1187
 /**
@@ -1190,11 +1190,11 @@
1190 1190
  * Override with M201
1191 1191
  *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
1192 1192
  */
1193
-#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
1193
+#define DEFAULT_MAX_ACCELERATION      { 1000, 1000 }
1194 1194
 
1195
-//#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
1195
+#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
1196 1196
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
1197
-  #define MAX_ACCEL_EDIT_VALUES       { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
1197
+  #define MAX_ACCEL_EDIT_VALUES       { 2000, 2000 } // ...or, set your own edit limits
1198 1198
 #endif
1199 1199
 
1200 1200
 /**
@@ -1205,9 +1205,9 @@
1205 1205
  *   M204 R    Retract Acceleration
1206 1206
  *   M204 T    Travel Acceleration
1207 1207
  */
1208
-#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration for printing moves
1208
+#define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration for printing moves
1209 1209
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
1210
-#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
1210
+#define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
1211 1211
 
1212 1212
 /**
1213 1213
  * Default Jerk limits (mm/s)
@@ -1233,7 +1233,7 @@
1233 1233
 
1234 1234
   //#define LIMITED_JERK_EDITING        // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
1235 1235
   #if ENABLED(LIMITED_JERK_EDITING)
1236
-    #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
1236
+    #define MAX_JERK_EDIT_VALUES { 20, 20 } // ...or, set your own edit limits
1237 1237
   #endif
1238 1238
 #endif
1239 1239
 
@@ -1642,9 +1642,9 @@
1642 1642
 // @section motion
1643 1643
 
1644 1644
 // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
1645
-#define INVERT_X_DIR false
1645
+#define INVERT_X_DIR true
1646 1646
 #define INVERT_Y_DIR true
1647
-#define INVERT_Z_DIR false
1647
+//#define INVERT_Z_DIR false
1648 1648
 //#define INVERT_I_DIR false
1649 1649
 //#define INVERT_J_DIR false
1650 1650
 //#define INVERT_K_DIR false
@@ -1696,16 +1696,17 @@
1696 1696
 // @section geometry
1697 1697
 
1698 1698
 // The size of the printable area
1699
-#define X_BED_SIZE 200
1700
-#define Y_BED_SIZE 200
1699
+#define X_BED_SIZE 208
1700
+#define Y_BED_SIZE 287
1701 1701
 
1702 1702
 // Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions.
1703 1703
 #define X_MIN_POS 0
1704 1704
 #define Y_MIN_POS 0
1705
-#define Z_MIN_POS 0
1706 1705
 #define X_MAX_POS X_BED_SIZE
1707 1706
 #define Y_MAX_POS Y_BED_SIZE
1708
-#define Z_MAX_POS 200
1707
+
1708
+//#define Z_MIN_POS 0
1709
+//#define Z_MAX_POS 200
1709 1710
 //#define I_MIN_POS 0
1710 1711
 //#define I_MAX_POS 50
1711 1712
 //#define J_MIN_POS 0
@@ -1757,7 +1758,7 @@
1757 1758
 #endif
1758 1759
 
1759 1760
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
1760
-  //#define SOFT_ENDSTOPS_MENU_ITEM  // Enable/Disable software endstops from the LCD
1761
+  #define SOFT_ENDSTOPS_MENU_ITEM  // Enable/Disable software endstops from the LCD
1761 1762
 #endif
1762 1763
 
1763 1764
 /**
@@ -2096,7 +2097,7 @@
2096 2097
 #endif
2097 2098
 
2098 2099
 // Homing speeds (linear=mm/min, rotational=°/min)
2099
-#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) }
2100
+#define HOMING_FEEDRATE_MM_M { (50*60), (50*60) }
2100 2101
 
2101 2102
 // Validate that endstops are triggered on homing moves
2102 2103
 #define VALIDATE_HOMING_ENDSTOPS
@@ -2174,7 +2175,7 @@
2174 2175
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
2175 2176
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
2176 2177
  */
2177
-//#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
2178
+#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
2178 2179
 //#define DISABLE_M503        // Saves ~2700 bytes of flash. Disable for release!
2179 2180
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
2180 2181
 #define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
@@ -2366,9 +2367,9 @@
2366 2367
  *
2367 2368
  * View the current statistics with M78.
2368 2369
  */
2369
-//#define PRINTCOUNTER
2370
+#define PRINTCOUNTER
2370 2371
 #if ENABLED(PRINTCOUNTER)
2371
-  #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print.
2372
+  #define PRINTCOUNTER_SAVE_INTERVAL 0 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print.
2372 2373
 #endif
2373 2374
 
2374 2375
 // @section security
@@ -2459,7 +2460,7 @@
2459 2460
  * SD Card support is disabled by default. If your controller has an SD slot,
2460 2461
  * you must uncomment the following option or it won't work.
2461 2462
  */
2462
-//#define SDSUPPORT
2463
+#define SDSUPPORT
2463 2464
 
2464 2465
 /**
2465 2466
  * SD CARD: ENABLE CRC
@@ -2483,13 +2484,13 @@
2483 2484
 // This option overrides the default number of encoder pulses needed to
2484 2485
 // produce one step. Should be increased for high-resolution encoders.
2485 2486
 //
2486
-//#define ENCODER_PULSES_PER_STEP 4
2487
+#define ENCODER_PULSES_PER_STEP 4
2487 2488
 
2488 2489
 //
2489 2490
 // Use this option to override the number of step signals required to
2490 2491
 // move between next/prev menu items.
2491 2492
 //
2492
-//#define ENCODER_STEPS_PER_MENU_ITEM 1
2493
+#define ENCODER_STEPS_PER_MENU_ITEM 1
2493 2494
 
2494 2495
 /**
2495 2496
  * Encoder Direction Options
@@ -2506,7 +2507,7 @@
2506 2507
 //
2507 2508
 //  Set this option if CLOCKWISE causes values to DECREASE
2508 2509
 //
2509
-//#define REVERSE_ENCODER_DIRECTION
2510
+#define REVERSE_ENCODER_DIRECTION
2510 2511
 
2511 2512
 //
2512 2513
 // This option reverses the encoder direction for navigating LCD menus.
@@ -2591,7 +2592,7 @@
2591 2592
 //
2592 2593
 // ULTIMAKER Controller.
2593 2594
 //
2594
-//#define ULTIMAKERCONTROLLER
2595
+#define ULTIMAKERCONTROLLER
2595 2596
 
2596 2597
 //
2597 2598
 // ULTIPANEL as seen on Thingiverse.

+ 30
- 30
Marlin/Configuration_adv.h View File

@@ -447,7 +447,7 @@
447 447
  * Enable Autotemp Mode with M104/M109 F<factor> S<mintemp> B<maxtemp>.
448 448
  * Disable by sending M104/M109 with no F parameter (or F0 with AUTOTEMP_PROPORTIONAL).
449 449
  */
450
-#define AUTOTEMP
450
+//#define AUTOTEMP
451 451
 #if ENABLED(AUTOTEMP)
452 452
   #define AUTOTEMP_OLDWEIGHT    0.98  // Factor used to weight previous readings (0.0 < value < 1.0)
453 453
   // Turn on AUTOTEMP on M104/M109 by default using proportions set here
@@ -876,13 +876,13 @@
876 876
 
877 877
 //#define SENSORLESS_BACKOFF_MM  { 2, 2, 0 }  // (linear=mm, rotational=°) Backoff from endstops before sensorless homing
878 878
 
879
-#define HOMING_BUMP_MM      { 5, 5, 2 }       // (linear=mm, rotational=°) Backoff from endstops after first bump
880
-#define HOMING_BUMP_DIVISOR { 2, 2, 4 }       // Re-Bump Speed Divisor (Divides the Homing Feedrate)
879
+#define HOMING_BUMP_MM      { 5, 5 }       // (linear=mm, rotational=°) Backoff from endstops after first bump
880
+#define HOMING_BUMP_DIVISOR { 2, 2 }       // Re-Bump Speed Divisor (Divides the Homing Feedrate)
881 881
 
882 882
 //#define HOMING_BACKOFF_POST_MM { 2, 2, 2 }  // (linear=mm, rotational=°) Backoff from endstops after homing
883 883
 //#define XY_COUNTERPART_BACKOFF_MM 0         // (mm) Backoff X after homing Y, and vice-versa
884 884
 
885
-//#define QUICK_HOME                          // If G28 contains XY do a diagonal move first
885
+#define QUICK_HOME                          // If G28 contains XY do a diagonal move first
886 886
 //#define HOME_Y_BEFORE_X                     // If G28 contains XY home Y before X
887 887
 //#define HOME_Z_FIRST                        // Home Z first. Requires a Z-MIN endstop (not a probe).
888 888
 //#define CODEPENDENT_XY_HOMING               // If X/Y can't home without homing Y/X first
@@ -1086,7 +1086,7 @@
1086 1086
   //#define SHAPING_MENU        // Add a menu to the LCD to set shaping parameters.
1087 1087
 #endif
1088 1088
 
1089
-#define AXIS_RELATIVE_MODES { false, false, false, false }
1089
+#define AXIS_RELATIVE_MODES { false, false }
1090 1090
 
1091 1091
 // Add a Duplicate option for well-separated conjoined nozzles
1092 1092
 //#define MULTI_NOZZLE_DUPLICATION
@@ -1336,7 +1336,7 @@
1336 1336
 // @section lcd
1337 1337
 
1338 1338
 #if HAS_MANUAL_MOVE_MENU
1339
-  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
1339
+  #define MANUAL_FEEDRATE { 50*60, 50*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
1340 1340
   #define FINE_MANUAL_MOVE 0.025    // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
1341 1341
   #if IS_ULTIPANEL
1342 1342
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
@@ -1430,7 +1430,7 @@
1430 1430
   #endif
1431 1431
 
1432 1432
   // Scroll a longer status message into view
1433
-  //#define STATUS_MESSAGE_SCROLLING
1433
+  #define STATUS_MESSAGE_SCROLLING
1434 1434
 
1435 1435
   // Apply a timeout to low-priority status messages
1436 1436
   //#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds)
@@ -1815,11 +1815,11 @@
1815 1815
    */
1816 1816
   //#define STATUS_COMBINE_HEATERS    // Use combined heater images instead of separate ones
1817 1817
   //#define STATUS_HOTEND_NUMBERLESS  // Use plain hotend icons instead of numbered ones (with 2+ hotends)
1818
-  #define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
1819
-  #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
1820
-  #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
1821
-  #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
1822
-  //#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
1818
+  //#define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
1819
+  //#define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
1820
+  //#define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
1821
+  //#define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
1822
+  #define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
1823 1823
   //#define STATUS_COOLER_ANIM        // Use a second bitmap to indicate laser cooling
1824 1824
   //#define STATUS_FLOWMETER_ANIM     // Use multiple bitmaps to indicate coolant flow
1825 1825
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
@@ -2429,7 +2429,7 @@
2429 2429
  * Currently handles M108, M112, M410, M876
2430 2430
  * NOTE: Not yet implemented for all platforms.
2431 2431
  */
2432
-//#define EMERGENCY_PARSER
2432
+#define EMERGENCY_PARSER
2433 2433
 
2434 2434
 /**
2435 2435
  * Realtime Reporting (requires EMERGENCY_PARSER)
@@ -2446,9 +2446,9 @@
2446 2446
  * - During Hold all Emergency Parser commands are available, as usual.
2447 2447
  * - Enable NANODLP_Z_SYNC and NANODLP_ALL_AXIS for move command end-state reports.
2448 2448
  */
2449
-//#define REALTIME_REPORTING_COMMANDS
2449
+#define REALTIME_REPORTING_COMMANDS
2450 2450
 #if ENABLED(REALTIME_REPORTING_COMMANDS)
2451
-  //#define FULL_REPORT_TO_HOST_FEATURE   // Auto-report the machine status like Grbl CNC
2451
+  #define FULL_REPORT_TO_HOST_FEATURE   // Auto-report the machine status like Grbl CNC
2452 2452
 #endif
2453 2453
 
2454 2454
 // Bad Serial-connections can miss a received command by sending an 'ok'
@@ -3439,14 +3439,14 @@
3439 3439
  * See https://marlinfw.org/docs/configuration/2.0.9/laser_spindle.html for more config details.
3440 3440
  */
3441 3441
 //#define SPINDLE_FEATURE
3442
-//#define LASER_FEATURE
3442
+#define LASER_FEATURE
3443 3443
 #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
3444
-  #define SPINDLE_LASER_ACTIVE_STATE    LOW    // Set to "HIGH" if SPINDLE_LASER_ENA_PIN is active HIGH
3444
+  #define SPINDLE_LASER_ACTIVE_STATE    HIGH    // Set to "HIGH" if SPINDLE_LASER_ENA_PIN is active HIGH
3445 3445
 
3446 3446
   #define SPINDLE_LASER_USE_PWM                // Enable if your controller supports setting the speed/power
3447 3447
   #if ENABLED(SPINDLE_LASER_USE_PWM)
3448 3448
     #define SPINDLE_LASER_PWM_INVERT    false  // Set to "true" if the speed/power goes up when you want it to go slower
3449
-    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32, and LPC)
3449
+    #define SPINDLE_LASER_FREQUENCY     10000  // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32, and LPC)
3450 3450
                                                // ESP32: If SPINDLE_LASER_PWM_PIN is onboard then <=78125Hz. For I2S expander
3451 3451
                                                //  the frequency determines the PWM resolution. 2500Hz = 0-100, 977Hz = 0-255, ...
3452 3452
                                                //  (250000 / SPINDLE_LASER_FREQUENCY) = max value.
@@ -3526,8 +3526,8 @@
3526 3526
     #define LASER_TEST_PULSE_MIN           1   // (ms) Used with Laser Control Menu
3527 3527
     #define LASER_TEST_PULSE_MAX         999   // (ms) Caution: Menu may not show more than 3 characters
3528 3528
 
3529
-    #define SPINDLE_LASER_POWERUP_DELAY   50   // (ms) Delay to allow the spindle/laser to come up to speed/power
3530
-    #define SPINDLE_LASER_POWERDOWN_DELAY 50   // (ms) Delay to allow the spindle to stop
3529
+    #define SPINDLE_LASER_POWERUP_DELAY   5    // (ms) Delay to allow the spindle/laser to come up to speed/power
3530
+    #define SPINDLE_LASER_POWERDOWN_DELAY 5    // (ms) Delay to allow the spindle to stop
3531 3531
 
3532 3532
    /**
3533 3533
     * Laser Safety Timeout
@@ -3537,7 +3537,7 @@
3537 3537
     * value. Too low and it could turn off during a very slow move; too high and
3538 3538
     * the material could ignite.
3539 3539
     */
3540
-    #define LASER_SAFETY_TIMEOUT_MS     1000   // (ms)
3540
+    #define LASER_SAFETY_TIMEOUT_MS     5000   // (ms)
3541 3541
 
3542 3542
     /**
3543 3543
      * Any M3 or G1/2/3/5 command with the 'I' parameter enables continuous inline power mode.
@@ -3562,7 +3562,7 @@
3562 3562
      * CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be commited without waiting
3563 3563
      * for a planner syncronization
3564 3564
      */
3565
-    //#define LASER_POWER_SYNC
3565
+    #define LASER_POWER_SYNC
3566 3566
 
3567 3567
     /**
3568 3568
      * Scale the laser's power in proportion to the movement rate.
@@ -3705,7 +3705,7 @@
3705 3705
  * Enables G53 and G54-G59.3 commands to select coordinate systems
3706 3706
  * and G92.1 to reset the workspace to native machine space.
3707 3707
  */
3708
-//#define CNC_COORDINATE_SYSTEMS
3708
+#define CNC_COORDINATE_SYSTEMS
3709 3709
 
3710 3710
 // @section reporting
3711 3711
 
@@ -3718,7 +3718,7 @@
3718 3718
 /**
3719 3719
  * Auto-report temperatures with M155 S<seconds>
3720 3720
  */
3721
-#define AUTO_REPORT_TEMPERATURES
3721
+//#define AUTO_REPORT_TEMPERATURES
3722 3722
 #if ENABLED(AUTO_REPORT_TEMPERATURES) && TEMP_SENSOR_REDUNDANT
3723 3723
   //#define AUTO_REPORT_REDUNDANT // Include the "R" sensor in the auto-report
3724 3724
 #endif
@@ -3726,7 +3726,7 @@
3726 3726
 /**
3727 3727
  * Auto-report position with M154 S<seconds>
3728 3728
  */
3729
-//#define AUTO_REPORT_POSITION
3729
+#define AUTO_REPORT_POSITION
3730 3730
 
3731 3731
 /**
3732 3732
  * Include capabilities in M115 output
@@ -3750,7 +3750,7 @@
3750 3750
 /**
3751 3751
  * Disable all Volumetric extrusion options
3752 3752
  */
3753
-//#define NO_VOLUMETRICS
3753
+#define NO_VOLUMETRICS
3754 3754
 
3755 3755
 #if DISABLED(NO_VOLUMETRICS)
3756 3756
   /**
@@ -3818,13 +3818,13 @@
3818 3818
  * Note that G0 feedrates should be used with care for 3D printing (if used at all).
3819 3819
  * High feedrates may cause ringing and harm print quality.
3820 3820
  */
3821
-//#define PAREN_COMMENTS      // Support for parentheses-delimited comments
3822
-//#define GCODE_MOTION_MODES  // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
3821
+#define PAREN_COMMENTS      // Support for parentheses-delimited comments
3822
+#define GCODE_MOTION_MODES  // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
3823 3823
 
3824 3824
 // Enable and set a (default) feedrate for all G0 moves
3825
-//#define G0_FEEDRATE 3000 // (mm/min)
3825
+#define G0_FEEDRATE (100*60) // (mm/min)
3826 3826
 #ifdef G0_FEEDRATE
3827
-  //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
3827
+  #define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
3828 3828
 #endif
3829 3829
 
3830 3830
 // @section gcode

+ 8
- 0
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp View File

@@ -517,7 +517,11 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
517 517
   else if (axis_should_home(axis))
518 518
     while (const char c = *value++) lcd_put_lchar(c <= '.' ? c : '?');
519 519
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
520
+#ifdef Z_AXIS
520 521
     lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
522
+#else
523
+    lcd_put_u8str(F("    "));
524
+#endif
521 525
   else
522 526
     lcd_put_u8str(value);
523 527
 }
@@ -930,8 +934,10 @@ void MarlinUI::draw_status_screen() {
930 934
 
931 935
       #endif // LCD_WIDTH >= 20
932 936
 
937
+#ifdef Z_AXIS
933 938
       lcd_moveto(LCD_WIDTH - 8, 1);
934 939
       _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position.z)), blink);
940
+#endif
935 941
 
936 942
       #if HAS_LEVELING && !HAS_HEATED_BED
937 943
         lcd_put_lchar(planner.leveling_active || blink ? '_' : ' ');
@@ -996,8 +1002,10 @@ void MarlinUI::draw_status_screen() {
996 1002
     //
997 1003
     // Z Coordinate
998 1004
     //
1005
+#ifdef Z_AXIS
999 1006
     lcd_moveto(LCD_WIDTH - 9, 0);
1000 1007
     _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position.z)), blink);
1008
+#endif
1001 1009
 
1002 1010
     #if HAS_LEVELING && (HAS_MULTI_HOTEND || !HAS_HEATED_BED)
1003 1011
       lcd_put_lchar(LCD_WIDTH - 1, 0, planner.leveling_active || blink ? '_' : ' ');

+ 13
- 10
Marlin/src/pins/mega/pins_GT2560_REV_A.h View File

@@ -72,7 +72,7 @@
72 72
 #define Z_ENABLE_PIN                          35
73 73
 
74 74
 #define E0_STEP_PIN                           43
75
-#define E0_DIR_PIN                            45
75
+//#define E0_DIR_PIN                            45
76 76
 #define E0_ENABLE_PIN                         41
77 77
 
78 78
 #define E1_STEP_PIN                           49
@@ -82,19 +82,22 @@
82 82
 //
83 83
 // Temperature Sensors
84 84
 //
85
-#define TEMP_0_PIN                             8
86
-#define TEMP_1_PIN                             9
87
-#define TEMP_BED_PIN                          10
85
+//#define TEMP_0_PIN                             8
86
+//#define TEMP_1_PIN                             9
87
+//#define TEMP_BED_PIN                          10
88 88
 
89 89
 //
90 90
 // Heaters / Fans
91 91
 //
92
-#define HEATER_0_PIN                           2
93
-#define HEATER_1_PIN                           3
94
-#define HEATER_BED_PIN                         4
95
-#ifndef FAN_PIN
96
-  #define FAN_PIN                              7
97
-#endif
92
+//#define HEATER_0_PIN                           2
93
+//#define HEATER_1_PIN                           3
94
+//#define HEATER_BED_PIN                         4
95
+//#ifndef FAN_PIN
96
+//  #define FAN_PIN                              7
97
+//#endif
98
+
99
+#define SPINDLE_LASER_PWM_PIN 45 // Extruder0 dir pin for laser PWM
100
+#define SPINDLE_LASER_ENA_PIN 2 // Heater0 to power laser with 12V
98 101
 
99 102
 //
100 103
 // Misc. Functions

Loading…
Cancel
Save