Преглед изворни кода

FFCP updates. Update XY soft endstops on tool_change (#14125)

mikeshub пре 6 година
родитељ
комит
a3f034b95e

+ 3
- 0
Marlin/src/feature/leds/leds.cpp Прегледај датотеку

71
   #if ENABLED(NEOPIXEL_LED)
71
   #if ENABLED(NEOPIXEL_LED)
72
     setup_neopixel();
72
     setup_neopixel();
73
   #endif
73
   #endif
74
+  #if ENABLED(PCA9533)
75
+    RGBinit();
76
+  #endif
74
   #if ENABLED(LED_USER_PRESET_STARTUP)
77
   #if ENABLED(LED_USER_PRESET_STARTUP)
75
     set_default();
78
     set_default();
76
   #endif
79
   #endif

+ 11
- 2
Marlin/src/module/tool_change.cpp Прегледај датотеку

750
       const float old_feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : feedrate_mm_s;
750
       const float old_feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : feedrate_mm_s;
751
       feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
751
       feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
752
 
752
 
753
-      #if HAS_SOFTWARE_ENDSTOPS && ENABLED(DUAL_X_CARRIAGE)
754
-        update_software_endstops(X_AXIS, active_extruder, tmp_extruder);
753
+      #if HAS_SOFTWARE_ENDSTOPS
754
+        #if HAS_HOTEND_OFFSET
755
+          #define _EXT_ARGS , active_extruder, tmp_extruder
756
+        #else
757
+          #define _EXT_ARGS
758
+        #endif
759
+        update_software_endstops(X_AXIS _EXT_ARGS);
760
+        #if DISABLED(DUAL_X_CARRIAGE)
761
+          update_software_endstops(Y_AXIS _EXT_ARGS);
762
+          update_software_endstops(Z_AXIS _EXT_ARGS);
763
+        #endif
755
       #endif
764
       #endif
756
 
765
 
757
       set_destination_from_current();
766
       set_destination_from_current();

+ 80
- 111
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h Прегледај датотеку

69
 #endif
69
 #endif
70
 
70
 
71
 //
71
 //
72
+// Filament Runout Pins
73
+//
74
+#ifndef FIL_RUNOUT_PIN
75
+  #define FIL_RUNOUT_PIN   49
76
+#endif
77
+#ifndef FIL_RUNOUT2_PIN
78
+  #define FIL_RUNOUT2_PIN  47
79
+#endif
80
+
81
+//
72
 // Steppers
82
 // Steppers
73
 //
83
 //
74
 #define X_STEP_PIN         55   // F1
84
 #define X_STEP_PIN         55   // F1
187
 #endif
197
 #endif
188
 
198
 
189
 //
199
 //
190
-// Extruder Auto Fan Pins
191
-//
192
-#define ORIG_E0_AUTO_FAN_PIN EX1_FAN_PIN
193
-#define ORIG_E1_AUTO_FAN_PIN EX2_FAN_PIN
194
-
195
-//
196
 // Misc. Functions
200
 // Misc. Functions
197
 //
201
 //
198
 #define LED_PIN            13   // B7
202
 #define LED_PIN            13   // B7
199
 #define CUTOFF_RESET_PIN   16   // H1
203
 #define CUTOFF_RESET_PIN   16   // H1
200
 #define CUTOFF_TEST_PIN    17   // H0
204
 #define CUTOFF_TEST_PIN    17   // H0
201
-#define CASE_LIGHT_PIN     44   // L5   MUST BE HARDWARE PWM
202
 
205
 
203
 //
206
 //
204
 // LCD / Controller
207
 // LCD / Controller
205
 //
208
 //
206
-#ifdef REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
209
+#if ENABLED(ULTRA_LCD)
207
 
210
 
208
-  #define LCD_PINS_RS      33   // C4: LCD-STROBE
209
-  #define LCD_PINS_ENABLE  72   // J2: LEFT
210
-  #define LCD_PINS_D4      35   // C2: LCD-CLK
211
-  #define LCD_PINS_D5      32   // C5: RLED
212
-  #define LCD_PINS_D6      34   // C3: LCD-DATA
213
-  #define LCD_PINS_D7      31   // C6: GLED
211
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
214
 
212
 
215
-  #define BTN_EN2          75   // J4, UP
216
-  #define BTN_EN1          73   // J3, DOWN
217
-  //STOP button connected as KILL_PIN
218
-  #define KILL_PIN         14   // J1, RIGHT
219
-  //KILL - not connected
213
+    #define LCD_PINS_RS    33   // C4: LCD-STROBE
214
+    #define LCD_PINS_ENABLE 72  // J2: LEFT
215
+    #define LCD_PINS_D4    35   // C2: LCD-CLK
216
+    #define LCD_PINS_D5    32   // C5: RLED
217
+    #define LCD_PINS_D6    34   // C3: LCD-DATA
218
+    #define LCD_PINS_D7    31   // C6: GLED
220
 
219
 
221
-  #define BEEPER_PIN        8   // H5, SD_WP
220
+    #define BTN_EN2        75   // J4, UP
221
+    #define BTN_EN1        73   // J3, DOWN
222
+    //STOP button connected as KILL_PIN
223
+    #define KILL_PIN       14   // J1, RIGHT
224
+    //KILL - not connected
222
 
225
 
223
-  #define BTN_CENTER       15   // J0
224
-  #define BTN_ENC          BTN_CENTER
226
+    #define BEEPER_PIN      8   // H5, SD_WP
225
 
227
 
226
-  //on board leds
227
-  #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
228
-  #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
228
+    //on board leds
229
+    #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
230
+    #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
229
 
231
 
230
-#else
231
-  // Replicator uses a 3-wire SR controller with HD44780
232
-  // For now, pretend it's the SAV
233
-  //
234
-  //#define FF_INTERFACEBOARD
235
-
236
-  #define SR_DATA_PIN      34   // C3
237
-  #define SR_CLK_PIN       35   // C2
238
-  #define SR_STROBE_PIN    33   // C4
239
-
240
-  #define BTN_UP           75   // J4
241
-  #define BTN_DWN          73   // J3
242
-  #define BTN_LFT          72   // J2
243
-  #define BTN_RT           14   // J1
244
-  #define BTN_CENTER       15   // J0
245
-  #define BTN_ENC          BTN_CENTER
232
+  #else
233
+    // Replicator uses a 3-wire SR controller with HD44780
234
+    #define SR_DATA_PIN    34   // C3
235
+    #define SR_CLK_PIN     35   // C2
236
+    #define SR_STROBE_PIN  33   // C4
246
 
237
 
247
-  // Disable encoder
248
-  #undef BTN_EN1
249
-  #undef BTN_EN2
238
+    #define BTN_UP         75   // J4
239
+    #define BTN_DWN        73   // J3
240
+    #define BTN_LFT        72   // J2
241
+    #define BTN_RT         14   // J1
250
 
242
 
251
-  #define BEEPER_PIN         4   // G5
243
+    // Disable encoder
244
+    #undef BTN_EN1
245
+    #undef BTN_EN2
252
 
246
 
253
-  #define STAT_LED_RED_PIN  32   // C5
254
-  #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
247
+    #define BEEPER_PIN      4   // G5
255
 
248
 
256
-#endif
249
+    #define STAT_LED_RED_PIN  32   // C5
250
+    #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
251
+
252
+  #endif
253
+
254
+  #define BTN_CENTER       15   // J0
255
+  #define BTN_ENC          BTN_CENTER
256
+
257
+#endif // ULTRA_LCD
257
 
258
 
258
 //
259
 //
259
 // SD Card
260
 // SD Card
260
 //
261
 //
261
 #define SDSS               53   // B0
262
 #define SDSS               53   // B0
262
 #define SD_DETECT_PIN       9   // H6
263
 #define SD_DETECT_PIN       9   // H6
263
-#define MAX_PIN             THERMO_SCK_PIN
264
 
264
 
265
 //
265
 //
266
-// M3/M4/M5 - Spindle/Laser Control
266
+//TMC 2208
267
 //
267
 //
268
-#define SPINDLE_LASER_ENA_PIN    66   // K4   Pin should have a pullup!
269
-#define SPINDLE_LASER_PWM_PIN     8   // H5   MUST BE HARDWARE PWM
270
-#define SPINDLE_DIR_PIN          67   // K5
271
-
272
-
273
-// Check if all pins are defined in mega/pins_arduino.h
274
-//#include <Arduino.h>
275
-static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h"
276
-                                          "to digital_pin_to_port_PGM, digital_pin_to_bit_mask_PGM, digital_pin_to_timer_PGM, NUM_DIGITAL_PINS, see below");
277
-
278
-/* in [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h
279
-change:
280
-#define NUM_DIGITAL_PINS            70
281
-to:
282
-#define NUM_DIGITAL_PINS            80
283
-
284
-to digital_pin_to_port_PGM add at the end:
285
-const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
286
-....
287
-        PG      , // PG 4 ** 70 **
288
-        PG      , // PG 3 ** 71 **
289
-        PJ      , // PJ 2 ** 72 **
290
-        PJ      , // PJ 3 ** 73 **
291
-        PJ      , // PJ 7 ** 74 **
292
-        PJ      , // PJ 4 ** 75 **
293
-        PJ      , // PJ 5 ** 76 **
294
-        PJ      , // PJ 6 ** 77 **
295
-        PE      , // PE 2 ** 78 **
296
-        PE      , // PE 6 ** 79 **
297
-};
298
-
299
-to digital_pin_to_bit_mask_PGM  add at the end:
300
-const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
301
-....
302
-        _BV( 4 )        , // PG 4 ** 70 **
303
-        _BV( 3 )        , // PG 3 ** 71 **
304
-        _BV( 2 )        , // PJ 2 ** 72 **
305
-        _BV( 3 )        , // PJ 3 ** 73 **
306
-        _BV( 7 )        , // PJ 7 ** 74 **
307
-        _BV( 4 )        , // PJ 4 ** 75 **
308
-        _BV( 5 )        , // PJ 5 ** 76 **
309
-        _BV( 6 )        , // PJ 6 ** 77 **
310
-        _BV( 2 )        , // PE 2 ** 78 **
311
-        _BV( 6 )        , // PE 6 ** 79 **
312
-};
313
-
314
-to digital_pin_to_timer_PGM add at the end:
315
-const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
316
-....
317
-        NOT_ON_TIMER    , // PG 4 ** 70 **
318
-        NOT_ON_TIMER    , // PG 3 ** 71 **
319
-        NOT_ON_TIMER    , // PJ 2 ** 72 **
320
-        NOT_ON_TIMER    , // PJ 3 ** 73 **
321
-        NOT_ON_TIMER    , // PJ 7 ** 74 **
322
-        NOT_ON_TIMER    , // PJ 4 ** 75 **
323
-        NOT_ON_TIMER    , // PJ 5 ** 76 **
324
-        NOT_ON_TIMER    , // PJ 6 ** 77 **
325
-        NOT_ON_TIMER    , // PE 2 ** 78 **
326
-        NOT_ON_TIMER    , // PE 6 ** 79 **
327
-};
328
-*/
268
+#if HAS_DRIVER(TMC2208)
269
+  /**
270
+   * TMC2208 stepper drivers
271
+   *
272
+   * Hardware serial communication ports.
273
+   * If undefined software serial is used according to the pins below
274
+   */
275
+  #define X_HARDWARE_SERIAL Serial2
276
+  #define Y_HARDWARE_SERIAL Serial1
277
+
278
+  /**
279
+   * Software serial
280
+   */
281
+
282
+  #define X_SERIAL_TX_PIN  16
283
+  #define X_SERIAL_RX_PIN  17
284
+
285
+  #define Y_SERIAL_TX_PIN  18
286
+  #define Y_SERIAL_RX_PIN  19
287
+
288
+  #define Z_SERIAL_TX_PIN  41
289
+  #define Z_SERIAL_RX_PIN  66
290
+
291
+  #define E0_SERIAL_TX_PIN 40
292
+  #define E0_SERIAL_RX_PIN 67
293
+
294
+  #define E1_SERIAL_TX_PIN 37
295
+  #define E1_SERIAL_RX_PIN 68
296
+
297
+#endif

+ 22
- 22
config/examples/FlashForge/CreatorPro/Configuration.h Прегледај датотеку

124
  *
124
  *
125
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
125
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
126
  */
126
  */
127
-#define BAUDRATE 115200
127
+#define BAUDRATE 250000
128
 
128
 
129
 // Enable the Bluetooth serial interface on AT90USB devices
129
 // Enable the Bluetooth serial interface on AT90USB devices
130
 //#define BLUETOOTH
130
 //#define BLUETOOTH
294
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
294
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
295
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
295
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
296
 // For the other hotends it is their distance from the extruder 0 hotend.
296
 // For the other hotends it is their distance from the extruder 0 hotend.
297
-#define HOTEND_OFFSET_X {0.0, -33.00} // (mm) relative X-offset for each nozzle
298
-//#define HOTEND_OFFSET_Y {0.0, 5.00}  // (mm) relative Y-offset for each nozzle
297
+//#define HOTEND_OFFSET_X {0.0, -34.00} // (mm) relative X-offset for each nozzle
298
+//#define HOTEND_OFFSET_Y {0.0, 0.00}  // (mm) relative Y-offset for each nozzle
299
 //#define HOTEND_OFFSET_Z {0.0, 0.00}  // (mm) relative Z-offset for each nozzle
299
 //#define HOTEND_OFFSET_Z {0.0, 0.00}  // (mm) relative Z-offset for each nozzle
300
 
300
 
301
 // @section machine
301
 // @section machine
405
 //#define TEMP_SENSOR_1_AS_REDUNDANT
405
 //#define TEMP_SENSOR_1_AS_REDUNDANT
406
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
406
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
407
 
407
 
408
-#define TEMP_RESIDENCY_TIME     10  // (seconds) Time to wait for hotend to "settle" in M109
408
+#define TEMP_RESIDENCY_TIME      0  // (seconds) Time to wait for hotend to "settle" in M109
409
 #define TEMP_WINDOW              1  // (°C) Temperature proximity for the "temperature reached" timer
409
 #define TEMP_WINDOW              1  // (°C) Temperature proximity for the "temperature reached" timer
410
 #define TEMP_HYSTERESIS          3  // (°C) Temperature proximity considered "close enough" to the target
410
 #define TEMP_HYSTERESIS          3  // (°C) Temperature proximity considered "close enough" to the target
411
 
411
 
412
-#define TEMP_BED_RESIDENCY_TIME 10  // (seconds) Time to wait for bed to "settle" in M190
412
+#define TEMP_BED_RESIDENCY_TIME  0  // (seconds) Time to wait for bed to "settle" in M190
413
 #define TEMP_BED_WINDOW          1  // (°C) Temperature proximity for the "temperature reached" timer
413
 #define TEMP_BED_WINDOW          1  // (°C) Temperature proximity for the "temperature reached" timer
414
 #define TEMP_BED_HYSTERESIS      3  // (°C) Temperature proximity considered "close enough" to the target
414
 #define TEMP_BED_HYSTERESIS      3  // (°C) Temperature proximity considered "close enough" to the target
415
 
415
 
452
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
452
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
453
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
453
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
454
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
454
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
455
-  #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
455
+  #define PID_FUNCTIONAL_RANGE 15 // If the temperature difference between the target temperature and the actual temperature
456
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
456
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
457
 
457
 
458
   // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
458
   // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
699
  * Override with M203
699
  * Override with M203
700
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
700
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
701
  */
701
  */
702
-#define DEFAULT_MAX_FEEDRATE          { 500, 500, 20, 25 }
702
+#define DEFAULT_MAX_FEEDRATE          { 250, 250, 20, 100 }
703
 
703
 
704
 /**
704
 /**
705
  * Default Max Acceleration (change/s) change = mm/s
705
  * Default Max Acceleration (change/s) change = mm/s
707
  * Override with M201
707
  * Override with M201
708
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
708
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
709
  */
709
  */
710
-#define DEFAULT_MAX_ACCELERATION      { 5000, 5000, 100, 80000 }
710
+#define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 100, 5000 }
711
 
711
 
712
 /**
712
 /**
713
  * Default Acceleration (change/s) change = mm/s
713
  * Default Acceleration (change/s) change = mm/s
717
  *   M204 R    Retract Acceleration
717
  *   M204 R    Retract Acceleration
718
  *   M204 T    Travel Acceleration
718
  *   M204 T    Travel Acceleration
719
  */
719
  */
720
-#define DEFAULT_ACCELERATION          1750    // X, Y, Z and E max acceleration for printing moves
720
+#define DEFAULT_ACCELERATION          250    // X, Y, Z and E max acceleration for printing moves
721
 #define DEFAULT_RETRACT_ACCELERATION  5000    // E acceleration for retracts
721
 #define DEFAULT_RETRACT_ACCELERATION  5000    // E acceleration for retracts
722
-#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
722
+#define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
723
 
723
 
724
 //
724
 //
725
 // Use Junction Deviation instead of traditional Jerk Limiting
725
 // Use Junction Deviation instead of traditional Jerk Limiting
743
 #define DEFAULT_ZJERK                  0.4
743
 #define DEFAULT_ZJERK                  0.4
744
 #endif
744
 #endif
745
 
745
 
746
-#define DEFAULT_EJERK    5.0  // May be used by Linear Advance
746
+#define DEFAULT_EJERK    2.0  // May be used by Linear Advance
747
 
747
 
748
 /**
748
 /**
749
  * S-Curve Acceleration
749
  * S-Curve Acceleration
970
 
970
 
971
 //#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
971
 //#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
972
 
972
 
973
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
973
+#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
974
 
974
 
975
 //#define Z_HOMING_HEIGHT 4  // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
975
 //#define Z_HOMING_HEIGHT 4  // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
976
                              // Be sure you have this distance over your Z_MAX_POS in case.
976
                              // Be sure you have this distance over your Z_MAX_POS in case.
989
 #define Y_BED_SIZE 148
989
 #define Y_BED_SIZE 148
990
 
990
 
991
 // Travel limits (mm) after homing, corresponding to endstop positions.
991
 // Travel limits (mm) after homing, corresponding to endstop positions.
992
-#define X_MIN_POS -120
992
+#define X_MIN_POS -115
993
 #define Y_MIN_POS -84
993
 #define Y_MIN_POS -84
994
 #define Z_MIN_POS 0
994
 #define Z_MIN_POS 0
995
 #define X_MAX_POS 152
995
 #define X_MAX_POS 152
1351
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
1351
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
1352
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
1352
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
1353
  */
1353
  */
1354
-//#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
1354
+#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
1355
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
1355
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
1356
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
1356
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
1357
 #if ENABLED(EEPROM_SETTINGS)
1357
 #if ENABLED(EEPROM_SETTINGS)
1358
-  //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
1358
+  #define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
1359
 #endif
1359
 #endif
1360
 
1360
 
1361
 //
1361
 //
1387
 
1387
 
1388
 // Preheat Constants
1388
 // Preheat Constants
1389
 #define PREHEAT_1_LABEL       "PLA"
1389
 #define PREHEAT_1_LABEL       "PLA"
1390
-#define PREHEAT_1_TEMP_HOTEND 180
1391
-#define PREHEAT_1_TEMP_BED     70
1390
+#define PREHEAT_1_TEMP_HOTEND 200
1391
+#define PREHEAT_1_TEMP_BED     50
1392
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1392
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1393
 
1393
 
1394
 #define PREHEAT_2_LABEL       "ABS"
1394
 #define PREHEAT_2_LABEL       "ABS"
1395
-#define PREHEAT_2_TEMP_HOTEND 240
1396
-#define PREHEAT_2_TEMP_BED    110
1395
+#define PREHEAT_2_TEMP_HOTEND 220
1396
+#define PREHEAT_2_TEMP_BED    100
1397
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
1397
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
1398
 
1398
 
1399
 /**
1399
 /**
1507
  *
1507
  *
1508
  * View the current statistics with M78.
1508
  * View the current statistics with M78.
1509
  */
1509
  */
1510
-//#define PRINTCOUNTER
1510
+#define PRINTCOUNTER
1511
 
1511
 
1512
 //=============================================================================
1512
 //=============================================================================
1513
 //============================= LCD and SD support ============================
1513
 //============================= LCD and SD support ============================
1582
  *
1582
  *
1583
  * Use CRC checks and retries on the SD communication.
1583
  * Use CRC checks and retries on the SD communication.
1584
  */
1584
  */
1585
-//#define SD_CHECK_AND_RETRY
1585
+#define SD_CHECK_AND_RETRY
1586
 
1586
 
1587
 /**
1587
 /**
1588
  * LCD Menu Items
1588
  * LCD Menu Items
1637
 //
1637
 //
1638
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1638
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1639
 //
1639
 //
1640
-//#define INDIVIDUAL_AXIS_HOMING_MENU
1640
+#define INDIVIDUAL_AXIS_HOMING_MENU
1641
 
1641
 
1642
 //
1642
 //
1643
 // SPEAKER/BUZZER
1643
 // SPEAKER/BUZZER

+ 11
- 11
config/examples/FlashForge/CreatorPro/Configuration_adv.h Прегледај датотеку

215
 #endif
215
 #endif
216
 
216
 
217
 // Show extra position information in M114
217
 // Show extra position information in M114
218
-#define M114_DETAIL
218
+//#define M114_DETAIL
219
 
219
 
220
 // Show Temperature ADC value
220
 // Show Temperature ADC value
221
 // Enable for M105 to include ADC values read from temperature sensors.
221
 // Enable for M105 to include ADC values read from temperature sensors.
631
 #define DEFAULT_STEPPER_DEACTIVE_TIME 120
631
 #define DEFAULT_STEPPER_DEACTIVE_TIME 120
632
 #define DISABLE_INACTIVE_X true
632
 #define DISABLE_INACTIVE_X true
633
 #define DISABLE_INACTIVE_Y true
633
 #define DISABLE_INACTIVE_Y true
634
-#define DISABLE_INACTIVE_Z true  // set to false if the nozzle will fall down on your printed part when print has finished.
634
+#define DISABLE_INACTIVE_Z false  // set to false if the nozzle will fall down on your printed part when print has finished.
635
 #define DISABLE_INACTIVE_E true
635
 #define DISABLE_INACTIVE_E true
636
 
636
 
637
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
637
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
820
 #define DIGIPOT_MCP4018          // Requires library from https://github.com/stawel/SlowSoftI2CMaster
820
 #define DIGIPOT_MCP4018          // Requires library from https://github.com/stawel/SlowSoftI2CMaster
821
 #define DIGIPOT_I2C_NUM_CHANNELS 5 // 5DPRINT: 4     AZTEEG_X3_PRO: 8
821
 #define DIGIPOT_I2C_NUM_CHANNELS 5 // 5DPRINT: 4     AZTEEG_X3_PRO: 8
822
 // Actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS
822
 // Actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS
823
-#define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }  //  AZTEEG_X3_PRO
823
+#define DIGIPOT_I2C_MOTOR_CURRENTS { 0.84, 0.84, 0.4, 1.0, 1.0 }  //  AZTEEG_X3_PRO
824
 
824
 
825
 //===========================================================================
825
 //===========================================================================
826
 //=============================Additional Features===========================
826
 //=============================Additional Features===========================
872
  * LED Control Menu
872
  * LED Control Menu
873
  * Enable this feature to add LED Control to the LCD menu
873
  * Enable this feature to add LED Control to the LCD menu
874
  */
874
  */
875
-//#define LED_CONTROL_MENU
875
+#define LED_CONTROL_MENU
876
 #if ENABLED(LED_CONTROL_MENU)
876
 #if ENABLED(LED_CONTROL_MENU)
877
   #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
877
   #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
878
   #if ENABLED(LED_COLOR_PRESETS)
878
   #if ENABLED(LED_COLOR_PRESETS)
879
     #define LED_USER_PRESET_RED        255  // User defined RED value
879
     #define LED_USER_PRESET_RED        255  // User defined RED value
880
-    #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
881
-    #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
880
+    #define LED_USER_PRESET_GREEN      255  // User defined GREEN value
881
+    #define LED_USER_PRESET_BLUE       255  // User defined BLUE value
882
     #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
882
     #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
883
     #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
883
     #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
884
-    //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
884
+    #define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
885
   #endif
885
   #endif
886
 #endif // LED_CONTROL_MENU
886
 #endif // LED_CONTROL_MENU
887
 
887
 
1466
                                                   // This short retract is done immediately, before parking the nozzle.
1466
                                                   // This short retract is done immediately, before parking the nozzle.
1467
   #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     10  // (mm/s) Unload filament feedrate. This can be pretty fast.
1467
   #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     10  // (mm/s) Unload filament feedrate. This can be pretty fast.
1468
   #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
1468
   #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
1469
-  #define FILAMENT_CHANGE_UNLOAD_LENGTH      100  // (mm) The length of filament for a complete unload.
1469
+  #define FILAMENT_CHANGE_UNLOAD_LENGTH       80  // (mm) The length of filament for a complete unload.
1470
                                                   //   For Bowden, the full length of the tube and nozzle.
1470
                                                   //   For Bowden, the full length of the tube and nozzle.
1471
                                                   //   For direct drive, the full length of the nozzle.
1471
                                                   //   For direct drive, the full length of the nozzle.
1472
                                                   //   Set to 0 for manual unloading.
1472
                                                   //   Set to 0 for manual unloading.
1473
   #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
1473
   #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
1474
-  #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
1474
+  #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH    80  // (mm) Slow length, to allow time to insert material.
1475
                                                   // 0 to disable start loading and skip to fast load only
1475
                                                   // 0 to disable start loading and skip to fast load only
1476
   #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE   6  // (mm/s) Load filament feedrate. This can be pretty fast.
1476
   #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE   6  // (mm/s) Load filament feedrate. This can be pretty fast.
1477
   #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
1477
   #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
1496
   #define FILAMENT_CHANGE_ALERT_BEEPS         10  // Number of alert beeps to play when a response is needed.
1496
   #define FILAMENT_CHANGE_ALERT_BEEPS         10  // Number of alert beeps to play when a response is needed.
1497
   #define PAUSE_PARK_NO_STEPPER_TIMEOUT           // Enable for XYZ steppers to stay powered on during filament change.
1497
   #define PAUSE_PARK_NO_STEPPER_TIMEOUT           // Enable for XYZ steppers to stay powered on during filament change.
1498
 
1498
 
1499
-  //#define PARK_HEAD_ON_PAUSE                    // Park the nozzle during pause and filament change.
1499
+  #define PARK_HEAD_ON_PAUSE                      // Park the nozzle during pause and filament change.
1500
   //#define HOME_BEFORE_FILAMENT_CHANGE           // Ensure homing has been completed prior to parking for filament change
1500
   //#define HOME_BEFORE_FILAMENT_CHANGE           // Ensure homing has been completed prior to parking for filament change
1501
 
1501
 
1502
-  #define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
1502
+  #define FILAMENT_LOAD_UNLOAD_GCODES             // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
1503
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
1503
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
1504
 #endif
1504
 #endif
1505
 
1505
 

+ 157
- 0
config/examples/FlashForge/CreatorPro/CuraSettings.txt Прегледај датотеку

1
+NOTE ON FLASHING THE FIRMWARE:
2
+
3
+The firmware for the Atmel chip used for USB on the Mighty Board is the same as the Arduino Mega's, but it doesn't do an automatic reset. If you want the printer to reset on DTR you will need to flash it with the firmware for the Arduino Mega.
4
+
5
+### Use with all nozzle settings
6
+
7
+Build plate shape: Rectangular
8
+  [X] Origin at center
9
+  [X] Heated bed
10
+G-code flavor: Marlin
11
+
12
+### Right Nozzle
13
+
14
+Number of Extruders: 1
15
+
16
+X (Width) 227
17
+Y (Depth) 148
18
+Z (Heigth) 150
19
+
20
+Extruder 1 - 
21
+    Nozzle size: 0.4
22
+    Compatible material diameter: 1.75
23
+    Nozzle offset X: 0
24
+    Nozzle offset Y: 0
25
+    Cooling Fan Number:0
26
+
27
+;START G-CODE;
28
+M104 T0 S{material_print_temperature}
29
+M140 S{material_bed_temperature}
30
+G28
31
+T0
32
+G1 X150 Y-70 Z30 F4800 ; move to wait position left hand side of the table
33
+M190 S{material_bed_temperature}
34
+M109 T0 S{material_print_temperature}
35
+G92 E0
36
+G1 Z0.4 F1800
37
+G1 X110 Y-70 E20 F300 ; purge nozzle
38
+G1 X120 Y-70 Z0.15 F1200 ; slow wipe
39
+G1 X110 Y-70 Z0.5 F1200 ; lift
40
+G92 E0
41
+;START G-CODE;
42
+
43
+;END G-CODE;
44
+G1 X150 Y75 Z150 F1000 ; send Z axis to bottom of machine
45
+M140 S0; cool down HBP
46
+M104 T0 S0 ; cool down right extruder
47
+M104 T1 S0 ; cool down left extruder
48
+M127 ; stop blower fan
49
+M18 ; disable stepper
50
+;END G-CODE;
51
+
52
+***Left Nozzle***
53
+Number of Extruders: 1
54
+X (Width) 227
55
+Y (Depth) 148
56
+Z (Heigth) 150
57
+
58
+Extruder 1 - 
59
+    Nozzle size: 0.4
60
+    Compatible material diameter: 1.75
61
+    Nozzle offset X: -34
62
+    Nozzle offset Y: 0
63
+    Cooling Fan Number:0
64
+
65
+;START G-CODE;
66
+M104 S{material_print_temperature}
67
+M140 S{material_bed_temperature}
68
+G28
69
+T1
70
+G1 X-110 Y-70 Z30 F4800 ; move to wait position left hand side of the table
71
+M104 S{material_print_temperature}
72
+M190 S{material_bed_temperature}
73
+M109 S{material_print_temperature}
74
+G92 E0
75
+G1 Z0.4 F1800
76
+G1 E10 F300 ; purge nozzle
77
+G1 X-67 Y-70 E25 F300 ; purge nozzle
78
+G1 X-77 Y-70 Z0.15 F1200 ; slow wipe
79
+G1 X-67 Y-70 Z0.5 F1200 ; lift
80
+G92 E0
81
+;START G-CODE;
82
+
83
+;END G-CODE;
84
+G1 X150 Y75 Z150 F1000 ; send Z axis to bottom of machine
85
+M140 S0; cool down HBP
86
+M104 T0 S0 ; cool down right extruder
87
+M104 T1 S0 ; cool down left extruder
88
+M127 ; stop blower fan
89
+M18 ; disable stepper
90
+;END G-CODE;
91
+
92
+***Both Nozzles***
93
+Number of Extruders: 2
94
+X (Width) 295 <---- bed width + 2 x nozzle offset
95
+Y (Depth) 148
96
+Z (Heigth) 150
97
+
98
+Extruder 1 - 
99
+    Nozzle size: 0.4
100
+    Compatible material diameter: 1.75
101
+    Nozzle offset X: 0
102
+    Nozzle offset Y: 0
103
+    Cooling Fan Number:0
104
+    ;Extruder End G-code;
105
+    G1 X150 Y70 F9000;move away from print in case extrusion cool down speed modifier too low
106
+    ;Extruder End G-code;
107
+
108
+Extruder 2 - 
109
+    Nozzle size: 0.4
110
+    Compatible material diameter: 1.75
111
+    Nozzle offset X: -34
112
+    Nozzle offset Y: 0
113
+    Cooling Fan Number:0
114
+    ;Extruder End G-code;
115
+    G1 X150 Y70 F9000;move away from print in case extrusion cool down speed modifier too low
116
+    ;Extruder End G-code;
117
+
118
+;START G-CODE;
119
+M104 T0 S{material_print_temperature, 0}
120
+M104 T1 S{material_print_temperature , 1}
121
+M140 S{material_bed_temperature}
122
+G28
123
+;purge right
124
+T0
125
+G1 X155 Y-70 Z30 F4800
126
+M190 S{material_bed_temperature}
127
+M109 T0 S{material_print_temperature, 0}
128
+M104 T0 S{material_standby_temperature, 0}
129
+G92 E0
130
+G1 Z0.4 F1800
131
+G1 X110 Y-70 E20 F300 ; purge nozzle
132
+G1 X120 Y-70 Z0.15 F1200 ; slow wipe
133
+G1 E17 F2400
134
+G1 X110 Y-70 Z0.5 F1200 ; lift
135
+G92 E0
136
+;purge left
137
+T1
138
+;M104 T0 S{material_standby_temperature, 0}
139
+M104 T1 S{material_print_temperature ,1}
140
+G1 X-110 Y-70 Z30 F4800
141
+M109 T1 S{material_print_temperature , 1}
142
+G92 E0
143
+G1 Z0.4 F1800
144
+G1 X-67 Y-70 E25 F300 ; purge nozzle
145
+G1 X-77 Y-70 Z0.15 F1200 ; slow wipe
146
+G1 E22 F3600
147
+G1 X-67 Y-70 Z0.5 F1200 ; lift
148
+G92 E0
149
+;START G-CODE;
150
+;END G-CODE;
151
+G1 X150 Y75 Z150 F1000 ; send Z axis to bottom of machine
152
+M140 S0; cool down HBP
153
+M104 T0 S0 ; cool down right extruder
154
+M104 T1 S0 ; cool down left extruder
155
+M127 ; stop blower fan
156
+M18 ; disable stepper
157
+;END G-CODE;

Loading…
Откажи
Сачувај