Browse Source

Make MAX_EXTRUDERS always 6

Scott Lahteine 6 years ago
parent
commit
1358bd9319

+ 11
- 1
Marlin/src/module/configuration_store.cpp View File

877
     //
877
     //
878
     // Linear Advance
878
     // Linear Advance
879
     //
879
     //
880
+
880
     _FIELD_TEST(planner_extruder_advance_K);
881
     _FIELD_TEST(planner_extruder_advance_K);
881
 
882
 
882
     #if ENABLED(LIN_ADVANCE)
883
     #if ENABLED(LIN_ADVANCE)
888
 
889
 
889
     _FIELD_TEST(motor_current_setting);
890
     _FIELD_TEST(motor_current_setting);
890
 
891
 
892
+    //
893
+    // Motor Current PWM
894
+    //
895
+
891
     #if HAS_MOTOR_CURRENT_PWM
896
     #if HAS_MOTOR_CURRENT_PWM
892
       for (uint8_t q = XYZ; q--;) EEPROM_WRITE(stepper.motor_current_setting[q]);
897
       for (uint8_t q = XYZ; q--;) EEPROM_WRITE(stepper.motor_current_setting[q]);
893
     #else
898
     #else
1408
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val);
1413
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val);
1409
       #endif
1414
       #endif
1410
 
1415
 
1416
+      _FIELD_TEST(tmc_hybrid_threshold);
1417
+
1411
       #if ENABLED(HYBRID_THRESHOLD)
1418
       #if ENABLED(HYBRID_THRESHOLD)
1412
         #define TMC_SET_PWMTHRS(A,Q) tmc_set_pwmthrs(stepper##Q, tmc_hybrid_threshold.Q, planner.axis_steps_per_mm[_AXIS(A)])
1419
         #define TMC_SET_PWMTHRS(A,Q) tmc_set_pwmthrs(stepper##Q, tmc_hybrid_threshold.Q, planner.axis_steps_per_mm[_AXIS(A)])
1413
         tmc_hybrid_threshold_t tmc_hybrid_threshold;
1420
         tmc_hybrid_threshold_t tmc_hybrid_threshold;
1458
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(thrs_val);
1465
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(thrs_val);
1459
       #endif
1466
       #endif
1460
 
1467
 
1461
-      /*
1468
+      /**
1462
        * TMC StallGuard threshold.
1469
        * TMC StallGuard threshold.
1463
        * X and X2 use the same value
1470
        * X and X2 use the same value
1464
        * Y and Y2 use the same value
1471
        * Y and Y2 use the same value
1465
        * Z, Z2 and Z3 use the same value
1472
        * Z, Z2 and Z3 use the same value
1466
        */
1473
        */
1474
+
1475
+      _FIELD_TEST(tmc_sgt);
1476
+
1467
       tmc_sgt_t tmc_sgt;
1477
       tmc_sgt_t tmc_sgt;
1468
       EEPROM_READ(tmc_sgt);
1478
       EEPROM_READ(tmc_sgt);
1469
       #if USE_SENSORLESS
1479
       #if USE_SENSORLESS

+ 1
- 5
Marlin/src/pins/pins.h View File

35
 #ifndef __PINS_H__
35
 #ifndef __PINS_H__
36
 #define __PINS_H__
36
 #define __PINS_H__
37
 
37
 
38
-#include "../inc/MarlinConfig.h"
38
+#define MAX_EXTRUDERS 6
39
 
39
 
40
 #if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_PLUS_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
40
 #if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_PLUS_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
41
   #define IS_RAMPS_EFB
41
   #define IS_RAMPS_EFB
658
   #define SUICIDE_PIN -1
658
   #define SUICIDE_PIN -1
659
 #endif
659
 #endif
660
 
660
 
661
-#ifndef MAX_EXTRUDERS
662
-  #define MAX_EXTRUDERS 5
663
-#endif
664
-
665
 #ifndef NUM_SERVO_PLUGS
661
 #ifndef NUM_SERVO_PLUGS
666
   #define NUM_SERVO_PLUGS 4
662
   #define NUM_SERVO_PLUGS 4
667
 #endif
663
 #endif

+ 0
- 1
Marlin/src/pins/pins_RADDS.h View File

131
 
131
 
132
     #define RADDS_EXT_MSI_PIN 69
132
     #define RADDS_EXT_MSI_PIN 69
133
 
133
 
134
-    #define MAX_EXTRUDERS 6
135
     #define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
134
     #define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
136
 
135
 
137
   #else
136
   #else

Loading…
Cancel
Save