Browse Source

MAX_EXTRUDERS replaces mysterious "4"

Scott Lahteine 9 years ago
parent
commit
787f394676
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      Marlin/configuration_store.cpp

+ 6
- 5
Marlin/configuration_store.cpp View File

40
 
40
 
41
 // Change EEPROM version if these are changed:
41
 // Change EEPROM version if these are changed:
42
 #define EEPROM_OFFSET 100
42
 #define EEPROM_OFFSET 100
43
+#define MAX_EXTRUDERS 4
43
 
44
 
44
 /**
45
 /**
45
  * V24 EEPROM Layout:
46
  * V24 EEPROM Layout:
270
   EEPROM_WRITE_VAR(i, absPreheatHPBTemp);
271
   EEPROM_WRITE_VAR(i, absPreheatHPBTemp);
271
   EEPROM_WRITE_VAR(i, absPreheatFanSpeed);
272
   EEPROM_WRITE_VAR(i, absPreheatFanSpeed);
272
 
273
 
273
-  for (uint8_t e = 0; e < 4; e++) {
274
+  for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
274
 
275
 
275
     #if ENABLED(PIDTEMP)
276
     #if ENABLED(PIDTEMP)
276
       if (e < HOTENDS) {
277
       if (e < HOTENDS) {
345
   EEPROM_WRITE_VAR(i, volumetric_enabled);
346
   EEPROM_WRITE_VAR(i, volumetric_enabled);
346
 
347
 
347
   // Save filament sizes
348
   // Save filament sizes
348
-  for (uint8_t q = 0; q < 4; q++) {
349
+  for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
349
     if (q < EXTRUDERS) dummy = filament_size[q];
350
     if (q < EXTRUDERS) dummy = filament_size[q];
350
     EEPROM_WRITE_VAR(i, dummy);
351
     EEPROM_WRITE_VAR(i, dummy);
351
   }
352
   }
452
     EEPROM_READ_VAR(i, absPreheatFanSpeed);
453
     EEPROM_READ_VAR(i, absPreheatFanSpeed);
453
 
454
 
454
     #if ENABLED(PIDTEMP)
455
     #if ENABLED(PIDTEMP)
455
-      for (uint8_t e = 0; e < 4; e++) { // 4 = max extruders currently supported by Marlin
456
+      for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
456
         EEPROM_READ_VAR(i, dummy); // Kp
457
         EEPROM_READ_VAR(i, dummy); // Kp
457
         if (e < HOTENDS && dummy != DUMMY_PID_VALUE) {
458
         if (e < HOTENDS && dummy != DUMMY_PID_VALUE) {
458
           // do not need to scale PID values as the values in EEPROM are already scaled
459
           // do not need to scale PID values as the values in EEPROM are already scaled
471
       }
472
       }
472
     #else // !PIDTEMP
473
     #else // !PIDTEMP
473
       // 4 x 4 = 16 slots for PID parameters
474
       // 4 x 4 = 16 slots for PID parameters
474
-      for (uint8_t q=16; q--;) EEPROM_READ_VAR(i, dummy);  // 4x Kp, Ki, Kd, Kc
475
+      for (uint8_t q = MAX_EXTRUDERS * 4; q--;) EEPROM_READ_VAR(i, dummy);  // Kp, Ki, Kd, Kc
475
     #endif // !PIDTEMP
476
     #endif // !PIDTEMP
476
 
477
 
477
     #if DISABLED(PID_ADD_EXTRUSION_RATE)
478
     #if DISABLED(PID_ADD_EXTRUSION_RATE)
522
 
523
 
523
     EEPROM_READ_VAR(i, volumetric_enabled);
524
     EEPROM_READ_VAR(i, volumetric_enabled);
524
 
525
 
525
-    for (uint8_t q = 0; q < 4; q++) {
526
+    for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
526
       EEPROM_READ_VAR(i, dummy);
527
       EEPROM_READ_VAR(i, dummy);
527
       if (q < EXTRUDERS) filament_size[q] = dummy;
528
       if (q < EXTRUDERS) filament_size[q] = dummy;
528
     }
529
     }

Loading…
Cancel
Save