Parcourir la source

Bring MP_SCARA config up to date

Scott Lahteine il y a 4 ans
Parent
révision
bfe4ceedd1

+ 11
- 24
config/examples/SCARA/MP_SCARA/Configuration.h Voir le fichier

@@ -365,9 +365,9 @@
365 365
 //#define PSU_NAME "Power Supply"
366 366
 
367 367
 #if ENABLED(PSU_CONTROL)
368
-  #define PSU_ACTIVE_HIGH false     // Set 'false' for ATX (1), 'true' for X-Box (2)
368
+  #define PSU_ACTIVE_HIGH false     // Set 'false' for ATX, 'true' for X-Box
369 369
 
370
-  //#define PS_DEFAULT_OFF          // Keep power off until enabled directly with M80
370
+  //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
371 371
   //#define PSU_POWERUP_DELAY 100   // (ms) Delay for the PSU to warm up to full power
372 372
 
373 373
   //#define AUTO_POWER_CONTROL      // Enable automatic control of the PS_ON pin
@@ -393,9 +393,10 @@
393 393
  *
394 394
  * Temperature sensors available:
395 395
  *
396
+ *    -5 : PT100 / PT1000 with MAX31865 (only for sensors 0-1)
397
+ *    -3 : thermocouple with MAX31855 (only for sensors 0-1)
398
+ *    -2 : thermocouple with MAX6675 (only for sensors 0-1)
396 399
  *    -4 : thermocouple with AD8495
397
- *    -3 : thermocouple with MAX31855 (only for sensor 0)
398
- *    -2 : thermocouple with MAX6675 (only for sensor 0)
399 400
  *    -1 : thermocouple with AD595
400 401
  *     0 : not used
401 402
  *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
@@ -738,14 +739,14 @@
738 739
 /**
739 740
  * Default Axis Steps Per Unit (steps/mm)
740 741
  * Override with M92
741
- *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
742
+ *                                      X, Y, Z, E0 [, E1[, E2...]]
742 743
  */
743 744
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 28.6738351, 28.6738351, 1600, 93 }
744 745
 
745 746
 /**
746 747
  * Default Max Feed Rate (mm/s)
747 748
  * Override with M203
748
- *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
749
+ *                                      X, Y, Z, E0 [, E1[, E2...]]
749 750
  */
750 751
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 2.5, 25 }
751 752
 
@@ -758,7 +759,7 @@
758 759
  * Default Max Acceleration (change/s) change = mm/s
759 760
  * (Maximum start speed for accelerated moves)
760 761
  * Override with M201
761
- *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
762
+ *                                      X, Y, Z, E0 [, E1[, E2...]]
762 763
  */
763 764
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 10, 20000 }
764 765
 
@@ -779,7 +780,6 @@
779 780
 #define DEFAULT_RETRACT_ACCELERATION  1000    // E acceleration for retracts
780 781
 #define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
781 782
 
782
-
783 783
 /**
784 784
  * Default Jerk limits (mm/s)
785 785
  * Override with M205 X Y Z E
@@ -985,7 +985,7 @@
985 985
  *
986 986
  * Use these settings to specify the distance (mm) to raise the probe (or
987 987
  * lower the bed). The values set here apply over and above any (negative)
988
- * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
988
+ * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
989 989
  * Only integer values >= 1 are valid here.
990 990
  *
991 991
  * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
@@ -1297,19 +1297,6 @@
1297 1297
 #endif // BED_LEVELING
1298 1298
 
1299 1299
 /**
1300
- * Points to probe for all 3-point Leveling procedures.
1301
- * Override if the automatically selected points are inadequate.
1302
- */
1303
-#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
1304
-  //#define PROBE_PT_1_X 15
1305
-  //#define PROBE_PT_1_Y 180
1306
-  //#define PROBE_PT_2_X 15
1307
-  //#define PROBE_PT_2_Y 20
1308
-  //#define PROBE_PT_3_X 170
1309
-  //#define PROBE_PT_3_Y 20
1310
-#endif
1311
-
1312
-/**
1313 1300
  * Add a bed leveling sub-menu for ABL or MBL.
1314 1301
  * Include a guided procedure if manual probing is enabled.
1315 1302
  */
@@ -2078,10 +2065,10 @@
2078 2065
 //#define MALYAN_LCD
2079 2066
 
2080 2067
 //
2081
-// LulzBot Color Touch UI for FTDI EVE (FT800/FT810) displays
2068
+// Touch UI for FTDI EVE (FT800/FT810) displays
2082 2069
 // See Configuration_adv.h for all configuration options.
2083 2070
 //
2084
-//#define LULZBOT_TOUCH_UI
2071
+//#define TOUCH_UI_FTDI_EVE
2085 2072
 
2086 2073
 //
2087 2074
 // Third-party or vendor-customized controller interfaces.

+ 212
- 68
config/examples/SCARA/MP_SCARA/Configuration_adv.h Voir le fichier

@@ -264,7 +264,7 @@
264 264
   #define AUTOTEMP_OLDWEIGHT 0.98
265 265
 #endif
266 266
 
267
-// Show extra position information in M114
267
+// Show extra position information with 'M114 D'
268 268
 //#define M114_DETAIL
269 269
 
270 270
 // Show Temperature ADC value
@@ -429,6 +429,7 @@
429 429
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
430 430
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
431 431
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105   // Set default power-up brightness (0-255, requires PWM pin)
432
+  //#define CASE_LIGHT_MAX_PWM 128            // Limit pwm
432 433
   //#define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
433 434
   //#define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.
434 435
   //#define CASE_LIGHT_USE_NEOPIXEL           // Use Neopixel LED as case light, requires NEOPIXEL_LED.
@@ -652,20 +653,32 @@
652 653
 //#define Z_STEPPER_AUTO_ALIGN
653 654
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
654 655
   // Define probe X and Y positions for Z1, Z2 [, Z3]
655
-  #define Z_STEPPER_ALIGN_X {  10, 150, 290 }
656
-  #define Z_STEPPER_ALIGN_Y { 290,  10, 290 }
656
+  #define Z_STEPPER_ALIGN_XY { {  10, 290 }, { 150,  10 }, { 290, 290 } }
657
+
658
+  // Provide Z stepper positions for more rapid convergence in bed alignment.
659
+  // Currently requires triple stepper drivers.
660
+  //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
661
+  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
662
+    // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
663
+    // the Z screw positions in the bed carriage.
664
+    // Define one position per Z stepper in stepper driver order.
665
+    #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
666
+  #else
667
+    // Amplification factor. Used to scale the correction step up or down.
668
+    // In case the stepper (spindle) position is further out than the test point.
669
+    // Use a value > 1. NOTE: This may cause instability
670
+    #define Z_STEPPER_ALIGN_AMP 1.0
671
+  #endif
672
+
657 673
   // Set number of iterations to align
658 674
   #define Z_STEPPER_ALIGN_ITERATIONS 3
675
+
659 676
   // Enable to restore leveling setup after operation
660 677
   #define RESTORE_LEVELING_AFTER_G34
661 678
 
662 679
   // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
663 680
   #define G34_MAX_GRADE  5  // (%) Maximum incline G34 will handle
664 681
 
665
-  // Use the amplification factor to de-/increase correction step.
666
-  // In case the stepper (spindle) position is further out than the test point
667
-  // Use a value > 1. NOTE: This may cause instability
668
-  #define Z_STEPPER_ALIGN_AMP 1.0
669 682
   // Stop criterion. If the accuracy is better than this stop iterating early
670 683
   #define Z_STEPPER_ALIGN_ACC 0.02
671 684
 #endif
@@ -939,6 +952,18 @@
939 952
 // Add an 'M73' G-code to set the current percentage
940 953
 //#define LCD_SET_PROGRESS_MANUALLY
941 954
 
955
+// Show the E position (filament used) during printing
956
+//#define LCD_SHOW_E_TOTAL
957
+
958
+#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
959
+  //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
960
+  //#define SHOW_REMAINING_TIME          // Display estimated time to completion
961
+  #if ENABLED(SHOW_REMAINING_TIME)
962
+    //#define USE_M73_REMAINING_TIME     // Use remaining time from M73 command instead of estimation
963
+    //#define ROTATE_PROGRESS_DISPLAY    // Display (P)rogress, (E)lapsed, and (R)emaining time
964
+  #endif
965
+#endif
966
+
942 967
 #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
943 968
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
944 969
   #if ENABLED(LCD_PROGRESS_BAR)
@@ -982,6 +1007,8 @@
982 1007
    */
983 1008
   //#define POWER_LOSS_RECOVERY
984 1009
   #if ENABLED(POWER_LOSS_RECOVERY)
1010
+    //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
1011
+    //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
985 1012
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss
986 1013
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
987 1014
     //#define POWER_LOSS_PULL           // Set pullup / pulldown as appropriate
@@ -1214,9 +1241,47 @@
1214 1241
 #endif // HAS_GRAPHICAL_LCD
1215 1242
 
1216 1243
 //
1217
-// Lulzbot Touch UI
1244
+// Additional options for DGUS / DWIN displays
1218 1245
 //
1219
-#if ENABLED(LULZBOT_TOUCH_UI)
1246
+#if HAS_DGUS_LCD
1247
+  #define DGUS_SERIAL_PORT 2
1248
+  #define DGUS_BAUDRATE 115200
1249
+
1250
+  #define DGUS_RX_BUFFER_SIZE 128
1251
+  #define DGUS_TX_BUFFER_SIZE 48
1252
+  //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
1253
+
1254
+  #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
1255
+  #define BOOTSCREEN_TIMEOUT      3000    // (ms) Duration to display the boot screen
1256
+
1257
+  #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
1258
+    #define DGUS_PRINT_FILENAME           // Display the filename during printing
1259
+    #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
1260
+
1261
+    #if ENABLED(DGUS_LCD_UI_FYSETC)
1262
+      //#define DUGS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
1263
+    #else
1264
+      #define DUGS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
1265
+    #endif
1266
+
1267
+    #define DGUS_FILAMENT_LOADUNLOAD
1268
+    #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
1269
+      #define DGUS_FILAMENT_PURGE_LENGTH 10
1270
+      #define DGUS_FILAMENT_LOAD_LENGTH_PER_TIME 0.5 // (mm) Adjust in proportion to DGUS_UPDATE_INTERVAL_MS
1271
+    #endif
1272
+
1273
+    #define DGUS_UI_WAITING               // Show a "waiting" screen between some screens
1274
+    #if ENABLED(DGUS_UI_WAITING)
1275
+      #define DGUS_UI_WAITING_STATUS 10
1276
+      #define DGUS_UI_WAITING_STATUS_PERIOD 8 // Increase to slower waiting status looping
1277
+    #endif
1278
+  #endif
1279
+#endif // HAS_DGUS_LCD
1280
+
1281
+//
1282
+// Touch UI for the FTDI Embedded Video Engine (EVE)
1283
+//
1284
+#if ENABLED(TOUCH_UI_FTDI_EVE)
1220 1285
   // Display board used
1221 1286
   //#define LCD_FTDI_VM800B35A        // FTDI 3.5" with FT800 (320x240)
1222 1287
   //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
@@ -1255,21 +1320,48 @@
1255 1320
   //#define TOUCH_UI_PORTRAIT
1256 1321
   //#define TOUCH_UI_MIRRORED
1257 1322
 
1258
-  // Enable UTF8 rendering capabilities.
1323
+  // UTF8 processing and rendering.
1324
+  // Unsupported characters are shown as '?'.
1259 1325
   //#define TOUCH_UI_USE_UTF8
1260 1326
   #if ENABLED(TOUCH_UI_USE_UTF8)
1327
+    // Western accents support. These accented characters use
1328
+    // combined bitmaps and require relatively little storage.
1261 1329
     #define TOUCH_UI_UTF8_WESTERN_CHARSET
1330
+    #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
1331
+      // Additional character groups. These characters require
1332
+      // full bitmaps and take up considerable storage:
1333
+      //#define TOUCH_UI_UTF8_SUPERSCRIPTS  // ¹ ² ³
1334
+      //#define TOUCH_UI_UTF8_COPYRIGHT     // © ®
1335
+      //#define TOUCH_UI_UTF8_GERMANIC      // ß
1336
+      //#define TOUCH_UI_UTF8_SCANDINAVIAN  // Æ Ð Ø Þ æ ð ø þ
1337
+      //#define TOUCH_UI_UTF8_PUNCTUATION   // « » ¿ ¡
1338
+      //#define TOUCH_UI_UTF8_CURRENCY      // ¢ £ ¤ ¥
1339
+      //#define TOUCH_UI_UTF8_ORDINALS      // º ª
1340
+      //#define TOUCH_UI_UTF8_MATHEMATICS   // ± × ÷
1341
+      //#define TOUCH_UI_UTF8_FRACTIONS     // ¼ ½ ¾
1342
+      //#define TOUCH_UI_UTF8_SYMBOLS       // µ ¶ ¦ § ¬
1343
+    #endif
1262 1344
   #endif
1263 1345
 
1264
-  // When labels do not fit buttons, use smaller font
1346
+  // Use a smaller font when labels don't fit buttons
1265 1347
   #define TOUCH_UI_FIT_TEXT
1266 1348
 
1267
-  // Runtime language selection (otherwise LCD_LANGUAGE)
1268
-  //#define TOUCH_UI_LANGUAGE_MENU
1349
+  // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
1350
+  //#define LCD_LANGUAGE_1 en
1351
+  //#define LCD_LANGUAGE_2 fr
1352
+  //#define LCD_LANGUAGE_3 de
1353
+  //#define LCD_LANGUAGE_4 es
1354
+  //#define LCD_LANGUAGE_5 it
1269 1355
 
1270 1356
   // Use a numeric passcode for "Screen lock" keypad.
1271 1357
   // (recommended for smaller displays)
1272 1358
   //#define TOUCH_UI_PASSCODE
1359
+
1360
+  // Output extra debug info for Touch UI events
1361
+  //#define TOUCH_UI_DEBUG
1362
+
1363
+  // Developer menu (accessed by touching "About Printer" copyright text)
1364
+  //#define TOUCH_UI_DEVELOPER_MENU
1273 1365
 #endif
1274 1366
 
1275 1367
 //
@@ -1314,7 +1406,8 @@
1314 1406
   //#define BABYSTEP_WITHOUT_HOMING
1315 1407
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1316 1408
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
1317
-  #define BABYSTEP_MULTIPLICATOR  1         // Babysteps are very small. Increase for faster motion.
1409
+  #define BABYSTEP_MULTIPLICATOR_Z  1       // Babysteps are very small. Increase for faster motion.
1410
+  #define BABYSTEP_MULTIPLICATOR_XY 1
1318 1411
 
1319 1412
   //#define DOUBLECLICK_FOR_Z_BABYSTEPPING  // Double-click on the Status Screen for Z Babystepping.
1320 1413
   #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
@@ -1363,6 +1456,43 @@
1363 1456
 
1364 1457
 // @section leveling
1365 1458
 
1459
+/**
1460
+ * Points to probe for all 3-point Leveling procedures.
1461
+ * Override if the automatically selected points are inadequate.
1462
+ */
1463
+#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
1464
+  //#define PROBE_PT_1_X 15
1465
+  //#define PROBE_PT_1_Y 180
1466
+  //#define PROBE_PT_2_X 15
1467
+  //#define PROBE_PT_2_Y 20
1468
+  //#define PROBE_PT_3_X 170
1469
+  //#define PROBE_PT_3_Y 20
1470
+#endif
1471
+
1472
+/**
1473
+ * Override MIN_PROBE_EDGE for each side of the build plate
1474
+ * Useful to get probe points to exact positions on targets or
1475
+ * to allow leveling to avoid plate clamps on only specific
1476
+ * sides of the bed. With NOZZLE_AS_PROBE negative values are
1477
+ * allowed, to permit probing outside the bed.
1478
+ *
1479
+ * If you are replacing the prior *_PROBE_BED_POSITION options,
1480
+ * LEFT and FRONT values in most cases will map directly over
1481
+ * RIGHT and REAR would be the inverse such as
1482
+ * (X/Y_BED_SIZE - RIGHT/BACK_PROBE_BED_POSITION)
1483
+ *
1484
+ * This will allow all positions to match at compilation, however
1485
+ * should the probe position be modified with M851XY then the
1486
+ * probe points will follow. This prevents any change from causing
1487
+ * the probe to be unable to reach any points.
1488
+ */
1489
+#if PROBE_SELECTED && !IS_KINEMATIC
1490
+  //#define MIN_PROBE_EDGE_LEFT MIN_PROBE_EDGE
1491
+  //#define MIN_PROBE_EDGE_RIGHT MIN_PROBE_EDGE
1492
+  //#define MIN_PROBE_EDGE_FRONT MIN_PROBE_EDGE
1493
+  //#define MIN_PROBE_EDGE_BACK MIN_PROBE_EDGE
1494
+#endif
1495
+
1366 1496
 #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
1367 1497
   // Override the mesh area if the automatic (max) area is too large
1368 1498
   //#define MESH_MIN_X MESH_INSET
@@ -1788,94 +1918,101 @@
1788 1918
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
1789 1919
 
1790 1920
   #if AXIS_IS_TMC(X)
1791
-    #define X_CURRENT     800  // (mA) RMS current. Multiply by 1.414 for peak current.
1792
-    #define X_MICROSTEPS   16  // 0..256
1793
-    #define X_RSENSE     0.11
1794
-    #define X_CHAIN_POS     0  // 0 - Not chained, 1 - MCU MOSI connected, 2 - next in chain, ...
1921
+    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
1922
+    #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
1923
+    #define X_MICROSTEPS     16    // 0..256
1924
+    #define X_RSENSE          0.11
1925
+    #define X_CHAIN_POS      -1    // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
1795 1926
   #endif
1796 1927
 
1797 1928
   #if AXIS_IS_TMC(X2)
1798
-    #define X2_CURRENT    800
1799
-    #define X2_MICROSTEPS  16
1800
-    #define X2_RSENSE    0.11
1801
-    #define X2_CHAIN_POS    0
1929
+    #define X2_CURRENT      800
1930
+    #define X2_CURRENT_HOME X2_CURRENT
1931
+    #define X2_MICROSTEPS    16
1932
+    #define X2_RSENSE         0.11
1933
+    #define X2_CHAIN_POS     -1
1802 1934
   #endif
1803 1935
 
1804 1936
   #if AXIS_IS_TMC(Y)
1805
-    #define Y_CURRENT     800
1806
-    #define Y_MICROSTEPS   16
1807
-    #define Y_RSENSE     0.11
1808
-    #define Y_CHAIN_POS     0
1937
+    #define Y_CURRENT       800
1938
+    #define Y_CURRENT_HOME  Y_CURRENT
1939
+    #define Y_MICROSTEPS     16
1940
+    #define Y_RSENSE          0.11
1941
+    #define Y_CHAIN_POS      -1
1809 1942
   #endif
1810 1943
 
1811 1944
   #if AXIS_IS_TMC(Y2)
1812
-    #define Y2_CURRENT    800
1813
-    #define Y2_MICROSTEPS  16
1814
-    #define Y2_RSENSE    0.11
1815
-    #define Y2_CHAIN_POS    0
1945
+    #define Y2_CURRENT      800
1946
+    #define Y2_CURRENT_HOME Y2_CURRENT
1947
+    #define Y2_MICROSTEPS    16
1948
+    #define Y2_RSENSE         0.11
1949
+    #define Y2_CHAIN_POS     -1
1816 1950
   #endif
1817 1951
 
1818 1952
   #if AXIS_IS_TMC(Z)
1819
-    #define Z_CURRENT     800
1820
-    #define Z_MICROSTEPS   16
1821
-    #define Z_RSENSE     0.11
1822
-    #define Z_CHAIN_POS     0
1953
+    #define Z_CURRENT       800
1954
+    #define Z_CURRENT_HOME  Z_CURRENT
1955
+    #define Z_MICROSTEPS     16
1956
+    #define Z_RSENSE          0.11
1957
+    #define Z_CHAIN_POS      -1
1823 1958
   #endif
1824 1959
 
1825 1960
   #if AXIS_IS_TMC(Z2)
1826
-    #define Z2_CURRENT    800
1827
-    #define Z2_MICROSTEPS  16
1828
-    #define Z2_RSENSE    0.11
1829
-    #define Z2_CHAIN_POS    0
1961
+    #define Z2_CURRENT      800
1962
+    #define Z2_CURRENT_HOME Z2_CURRENT
1963
+    #define Z2_MICROSTEPS    16
1964
+    #define Z2_RSENSE         0.11
1965
+    #define Z2_CHAIN_POS     -1
1830 1966
   #endif
1831 1967
 
1832 1968
   #if AXIS_IS_TMC(Z3)
1833
-    #define Z3_CURRENT    800
1834
-    #define Z3_MICROSTEPS  16
1835
-    #define Z3_RSENSE    0.11
1836
-    #define Z3_CHAIN_POS    0
1969
+    #define Z3_CURRENT      800
1970
+    #define Z3_CURRENT_HOME Z3_CURRENT
1971
+    #define Z3_MICROSTEPS    16
1972
+    #define Z3_RSENSE         0.11
1973
+    #define Z3_CHAIN_POS     -1
1837 1974
   #endif
1838 1975
 
1839 1976
   #if AXIS_IS_TMC(E0)
1840
-    #define E0_CURRENT    800
1841
-    #define E0_MICROSTEPS  16
1842
-    #define E0_RSENSE    0.11
1843
-    #define E0_CHAIN_POS    0
1977
+    #define E0_CURRENT      800
1978
+    #define E0_MICROSTEPS    16
1979
+    #define E0_RSENSE         0.11
1980
+    #define E0_CHAIN_POS     -1
1844 1981
   #endif
1845 1982
 
1846 1983
   #if AXIS_IS_TMC(E1)
1847
-    #define E1_CURRENT    800
1848
-    #define E1_MICROSTEPS  16
1849
-    #define E1_RSENSE    0.11
1850
-    #define E1_CHAIN_POS    0
1984
+    #define E1_CURRENT      800
1985
+    #define E1_MICROSTEPS    16
1986
+    #define E1_RSENSE         0.11
1987
+    #define E1_CHAIN_POS     -1
1851 1988
   #endif
1852 1989
 
1853 1990
   #if AXIS_IS_TMC(E2)
1854
-    #define E2_CURRENT    800
1855
-    #define E2_MICROSTEPS  16
1856
-    #define E2_RSENSE    0.11
1857
-    #define E2_CHAIN_POS    0
1991
+    #define E2_CURRENT      800
1992
+    #define E2_MICROSTEPS    16
1993
+    #define E2_RSENSE         0.11
1994
+    #define E2_CHAIN_POS     -1
1858 1995
   #endif
1859 1996
 
1860 1997
   #if AXIS_IS_TMC(E3)
1861
-    #define E3_CURRENT    800
1862
-    #define E3_MICROSTEPS  16
1863
-    #define E3_RSENSE    0.11
1864
-    #define E3_CHAIN_POS    0
1998
+    #define E3_CURRENT      800
1999
+    #define E3_MICROSTEPS    16
2000
+    #define E3_RSENSE         0.11
2001
+    #define E3_CHAIN_POS     -1
1865 2002
   #endif
1866 2003
 
1867 2004
   #if AXIS_IS_TMC(E4)
1868
-    #define E4_CURRENT    800
1869
-    #define E4_MICROSTEPS  16
1870
-    #define E4_RSENSE    0.11
1871
-    #define E4_CHAIN_POS    0
2005
+    #define E4_CURRENT      800
2006
+    #define E4_MICROSTEPS    16
2007
+    #define E4_RSENSE         0.11
2008
+    #define E4_CHAIN_POS     -1
1872 2009
   #endif
1873 2010
 
1874 2011
   #if AXIS_IS_TMC(E5)
1875
-    #define E5_CURRENT    800
1876
-    #define E5_MICROSTEPS  16
1877
-    #define E5_RSENSE    0.11
1878
-    #define E5_CHAIN_POS    0
2012
+    #define E5_CURRENT      800
2013
+    #define E5_MICROSTEPS    16
2014
+    #define E5_RSENSE         0.11
2015
+    #define E5_CHAIN_POS     -1
1879 2016
   #endif
1880 2017
 
1881 2018
   /**
@@ -2069,8 +2206,8 @@
2069 2206
    *
2070 2207
    * Example:
2071 2208
    * #define TMC_ADV() { \
2072
-   *   stepperX.diag0_temp_prewarn(1); \
2073
-   *   stepperY.interpolate(0); \
2209
+   *   stepperX.diag0_otpw(1); \
2210
+   *   stepperY.intpol(0); \
2074 2211
    * }
2075 2212
    */
2076 2213
   #define TMC_ADV() {  }
@@ -2547,6 +2684,13 @@
2547 2684
 #endif
2548 2685
 
2549 2686
 /**
2687
+ * Cancel Objects
2688
+ *
2689
+ * Implement M486 to allow Marlin to skip objects
2690
+ */
2691
+//#define CANCEL_OBJECTS
2692
+
2693
+/**
2550 2694
  * I2C position encoders for closed loop control.
2551 2695
  * Developed by Chris Barr at Aus3D.
2552 2696
  *

Chargement…
Annuler
Enregistrer