Browse Source

Bring configs and drivers.h up to date

Scott Lahteine 5 years ago
parent
commit
86c18ea6e0
3 changed files with 73 additions and 11 deletions
  1. 11
    6
      Marlin/Configuration.h
  2. 60
    5
      Marlin/Configuration_adv.h
  3. 2
    0
      Marlin/src/core/drivers.h

+ 11
- 6
Marlin/Configuration.h View File

143
 // @section extruder
143
 // @section extruder
144
 
144
 
145
 // This defines the number of extruders
145
 // This defines the number of extruders
146
-// :[1, 2, 3, 4, 5, 6]
146
+// :[1, 2, 3, 4, 5, 6, 7, 8]
147
 #define EXTRUDERS 1
147
 #define EXTRUDERS 1
148
 
148
 
149
 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
149
 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
412
 #define TEMP_SENSOR_3 0
412
 #define TEMP_SENSOR_3 0
413
 #define TEMP_SENSOR_4 0
413
 #define TEMP_SENSOR_4 0
414
 #define TEMP_SENSOR_5 0
414
 #define TEMP_SENSOR_5 0
415
+#define TEMP_SENSOR_6 0
416
+#define TEMP_SENSOR_7 0
415
 #define TEMP_SENSOR_BED 0
417
 #define TEMP_SENSOR_BED 0
416
 #define TEMP_SENSOR_PROBE 0
418
 #define TEMP_SENSOR_PROBE 0
417
 #define TEMP_SENSOR_CHAMBER 0
419
 #define TEMP_SENSOR_CHAMBER 0
441
 #define HEATER_3_MINTEMP   5
443
 #define HEATER_3_MINTEMP   5
442
 #define HEATER_4_MINTEMP   5
444
 #define HEATER_4_MINTEMP   5
443
 #define HEATER_5_MINTEMP   5
445
 #define HEATER_5_MINTEMP   5
446
+#define HEATER_6_MINTEMP   5
447
+#define HEATER_7_MINTEMP   5
444
 #define BED_MINTEMP        5
448
 #define BED_MINTEMP        5
445
 
449
 
446
 // Above this temperature the heater will be switched off.
450
 // Above this temperature the heater will be switched off.
452
 #define HEATER_3_MAXTEMP 275
456
 #define HEATER_3_MAXTEMP 275
453
 #define HEATER_4_MAXTEMP 275
457
 #define HEATER_4_MAXTEMP 275
454
 #define HEATER_5_MAXTEMP 275
458
 #define HEATER_5_MAXTEMP 275
459
+#define HEATER_6_MAXTEMP 275
460
+#define HEATER_7_MAXTEMP 275
455
 #define BED_MAXTEMP      150
461
 #define BED_MAXTEMP      150
456
 
462
 
457
 //===========================================================================
463
 //===========================================================================
678
 //#define E3_DRIVER_TYPE A4988
684
 //#define E3_DRIVER_TYPE A4988
679
 //#define E4_DRIVER_TYPE A4988
685
 //#define E4_DRIVER_TYPE A4988
680
 //#define E5_DRIVER_TYPE A4988
686
 //#define E5_DRIVER_TYPE A4988
687
+//#define E6_DRIVER_TYPE A4988
688
+//#define E7_DRIVER_TYPE A4988
681
 
689
 
682
 // Enable this feature if all enabled endstop pins are interrupt-capable.
690
 // Enable this feature if all enabled endstop pins are interrupt-capable.
683
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
691
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
1044
 #define INVERT_E3_DIR false
1052
 #define INVERT_E3_DIR false
1045
 #define INVERT_E4_DIR false
1053
 #define INVERT_E4_DIR false
1046
 #define INVERT_E5_DIR false
1054
 #define INVERT_E5_DIR false
1055
+#define INVERT_E6_DIR false
1056
+#define INVERT_E7_DIR false
1047
 
1057
 
1048
 // @section homing
1058
 // @section homing
1049
 
1059
 
1430
 #define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
1440
 #define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
1431
 
1441
 
1432
 //
1442
 //
1433
-// M100 Free Memory Watcher
1434
-//
1435
-//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1436
-
1437
-//
1438
 // G20/G21 Inch mode support
1443
 // G20/G21 Inch mode support
1439
 //
1444
 //
1440
 //#define INCH_MODE_SUPPORT
1445
 //#define INCH_MODE_SUPPORT

+ 60
- 5
Marlin/Configuration_adv.h View File

78
   #define HOTEND5_BETA                 3950    // Beta value
78
   #define HOTEND5_BETA                 3950    // Beta value
79
 #endif
79
 #endif
80
 
80
 
81
+#if TEMP_SENSOR_6 == 1000
82
+  #define HOTEND6_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
83
+  #define HOTEND6_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
84
+  #define HOTEND6_BETA                 3950    // Beta value
85
+#endif
86
+
87
+#if TEMP_SENSOR_7 == 1000
88
+  #define HOTEND7_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
89
+  #define HOTEND7_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
90
+  #define HOTEND7_BETA                 3950    // Beta value
91
+#endif
92
+
81
 #if TEMP_SENSOR_BED == 1000
93
 #if TEMP_SENSOR_BED == 1000
82
   #define BED_PULLUP_RESISTOR_OHMS     4700    // Pullup resistor
94
   #define BED_PULLUP_RESISTOR_OHMS     4700    // Pullup resistor
83
   #define BED_RESISTANCE_25C_OHMS      100000  // Resistance at 25C
95
   #define BED_RESISTANCE_25C_OHMS      100000  // Resistance at 25C
185
   /**
197
   /**
186
    * Heated chamber watch settings (M141/M191).
198
    * Heated chamber watch settings (M141/M191).
187
    */
199
    */
188
-  #define WATCH_CHAMBER_TEMP_PERIOD 60            // Seconds
189
-  #define WATCH_CHAMBER_TEMP_INCREASE 2           // Degrees Celsius
200
+  #define WATCH_CHAMBER_TEMP_PERIOD            60 // Seconds
201
+  #define WATCH_CHAMBER_TEMP_INCREASE           2 // Degrees Celsius
190
 #endif
202
 #endif
191
 
203
 
192
 #if ENABLED(PIDTEMP)
204
 #if ENABLED(PIDTEMP)
2076
     #define E5_CHAIN_POS     -1
2088
     #define E5_CHAIN_POS     -1
2077
   #endif
2089
   #endif
2078
 
2090
 
2091
+  #if AXIS_IS_TMC(E6)
2092
+    #define E6_CURRENT      800
2093
+    #define E6_MICROSTEPS    16
2094
+    #define E6_RSENSE         0.11
2095
+    #define E6_CHAIN_POS     -1
2096
+  #endif
2097
+
2098
+  #if AXIS_IS_TMC(E7)
2099
+    #define E7_CURRENT      800
2100
+    #define E7_MICROSTEPS    16
2101
+    #define E7_RSENSE         0.11
2102
+    #define E7_CHAIN_POS     -1
2103
+  #endif
2104
+
2079
   /**
2105
   /**
2080
    * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
2106
    * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
2081
    * The default pins can be found in your board's pins file.
2107
    * The default pins can be found in your board's pins file.
2093
   //#define E3_CS_PIN         -1
2119
   //#define E3_CS_PIN         -1
2094
   //#define E4_CS_PIN         -1
2120
   //#define E4_CS_PIN         -1
2095
   //#define E5_CS_PIN         -1
2121
   //#define E5_CS_PIN         -1
2122
+  //#define E6_CS_PIN         -1
2123
+  //#define E7_CS_PIN         -1
2096
 
2124
 
2097
   /**
2125
   /**
2098
    * Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160).
2126
    * Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160).
2130
   #define E3_SLAVE_ADDRESS 0
2158
   #define E3_SLAVE_ADDRESS 0
2131
   #define E4_SLAVE_ADDRESS 0
2159
   #define E4_SLAVE_ADDRESS 0
2132
   #define E5_SLAVE_ADDRESS 0
2160
   #define E5_SLAVE_ADDRESS 0
2161
+  #define E6_SLAVE_ADDRESS 0
2162
+  #define E7_SLAVE_ADDRESS 0
2133
 
2163
 
2134
   /**
2164
   /**
2135
    * Software enable
2165
    * Software enable
2206
   #define E3_HYBRID_THRESHOLD     30
2236
   #define E3_HYBRID_THRESHOLD     30
2207
   #define E4_HYBRID_THRESHOLD     30
2237
   #define E4_HYBRID_THRESHOLD     30
2208
   #define E5_HYBRID_THRESHOLD     30
2238
   #define E5_HYBRID_THRESHOLD     30
2239
+  #define E6_HYBRID_THRESHOLD     30
2240
+  #define E7_HYBRID_THRESHOLD     30
2209
 
2241
 
2210
   /**
2242
   /**
2211
    * Use StallGuard2 to home / probe X, Y, Z.
2243
    * Use StallGuard2 to home / probe X, Y, Z.
2428
     #define E5_SLEW_RATE         1
2460
     #define E5_SLEW_RATE         1
2429
   #endif
2461
   #endif
2430
 
2462
 
2463
+  #if AXIS_IS_L64XX(E6)
2464
+    #define E6_MICROSTEPS      128
2465
+    #define E6_OVERCURRENT    2000
2466
+    #define E6_STALLCURRENT   1500
2467
+    #define E6_MAX_VOLTAGE     127
2468
+    #define E6_CHAIN_POS        -1
2469
+    #define E6_SLEW_RATE         1
2470
+  #endif
2471
+
2472
+  #if AXIS_IS_L64XX(E7)
2473
+    #define E7_MICROSTEPS      128
2474
+    #define E7_OVERCURRENT    2000
2475
+    #define E7_STALLCURRENT   1500
2476
+    #define E7_MAX_VOLTAGE     127
2477
+    #define E7_CHAIN_POS        -1
2478
+    #define E7_SLEW_RATE         1
2479
+  #endif
2480
+
2431
   /**
2481
   /**
2432
    * Monitor L6470 drivers for error conditions like over temperature and over current.
2482
    * Monitor L6470 drivers for error conditions like over temperature and over current.
2433
    * In the case of over temperature Marlin can decrease the drive until the error condition clears.
2483
    * In the case of over temperature Marlin can decrease the drive until the error condition clears.
3013
 
3063
 
3014
 // @section develop
3064
 // @section develop
3015
 
3065
 
3016
-/**
3017
- * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
3018
- */
3066
+//
3067
+// M100 Free Memory Watcher to debug memory usage
3068
+//
3069
+//#define M100_FREE_MEMORY_WATCHER
3070
+
3071
+//
3072
+// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
3073
+//
3019
 //#define PINS_DEBUGGING
3074
 //#define PINS_DEBUGGING
3020
 
3075
 
3021
 // Enable Marlin dev mode which adds some special commands
3076
 // Enable Marlin dev mode which adds some special commands

+ 2
- 0
Marlin/src/core/drivers.h View File

72
 #define AXIS_DRIVER_TYPE_E3(T) (E_STEPPERS > 3 && _AXIS_DRIVER_TYPE(E3,T))
72
 #define AXIS_DRIVER_TYPE_E3(T) (E_STEPPERS > 3 && _AXIS_DRIVER_TYPE(E3,T))
73
 #define AXIS_DRIVER_TYPE_E4(T) (E_STEPPERS > 4 && _AXIS_DRIVER_TYPE(E4,T))
73
 #define AXIS_DRIVER_TYPE_E4(T) (E_STEPPERS > 4 && _AXIS_DRIVER_TYPE(E4,T))
74
 #define AXIS_DRIVER_TYPE_E5(T) (E_STEPPERS > 5 && _AXIS_DRIVER_TYPE(E5,T))
74
 #define AXIS_DRIVER_TYPE_E5(T) (E_STEPPERS > 5 && _AXIS_DRIVER_TYPE(E5,T))
75
+#define AXIS_DRIVER_TYPE_E6(T) (E_STEPPERS > 6 && _AXIS_DRIVER_TYPE(E6,T))
76
+#define AXIS_DRIVER_TYPE_E7(T) (E_STEPPERS > 7 && _AXIS_DRIVER_TYPE(E7,T))
75
 
77
 
76
 #define AXIS_DRIVER_TYPE(A,T) AXIS_DRIVER_TYPE_##A(T)
78
 #define AXIS_DRIVER_TYPE(A,T) AXIS_DRIVER_TYPE_##A(T)
77
 
79
 

Loading…
Cancel
Save