thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Additional fixes to temperature.cpp and found another missing line 

Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
Natealus 10 years ago
parent
38a500d05c
commit
f4b0a40abb
9 changed files with 25 additions and 14 deletions
Unified View Show Diff Stats
  1. 3
    2
      Marlin/Configuration.h
  2. 2
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  3. 3
    2
      Marlin/example_configurations/K8200/Configuration.h
  4. 2
    1
      Marlin/example_configurations/SCARA/Configuration.h
  5. 3
    2
      Marlin/example_configurations/WITBOX/Configuration.h
  6. 2
    1
      Marlin/example_configurations/delta/Configuration.h
  7. 3
    2
      Marlin/example_configurations/makibox/Configuration.h
  8. 4
    3
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  9. 3
    0
      Marlin/temperature.cpp

+ 3
- 2
Marlin/Configuration.h View File

344 
 #define DISABLE_E false // For all extruders
 344 
 #define DISABLE_E false // For all extruders
345 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 345 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
346
346
347 
-#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
347 
+#define INVERT_X_DIR true     // for Mendel set to false, for Orca set to true
348 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 348 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
349 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 349 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
350 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 350 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
351 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
351 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
352 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 352 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
353 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
353
354
354 
 // ENDSTOP SETTINGS:
 355 
 // ENDSTOP SETTINGS:
355 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 356 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 2
- 1
Marlin/example_configurations/Hephestos/Configuration.h View File

354 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 354 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
355 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 355 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
356 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 356 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
357 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
357 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
358 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 358 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
359 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
359
360
360 
 // ENDSTOP SETTINGS:
 361 
 // ENDSTOP SETTINGS:
361 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 362 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 3
- 2
Marlin/example_configurations/K8200/Configuration.h View File

360
360
361 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
 361 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
362 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 362 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
363 
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
363 
+#define INVERT_Z_DIR false    // for Mendel set to false, for Orca set to true
364 
 #define INVERT_E0_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
 364 
 #define INVERT_E0_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
365 
-#define INVERT_E1_DIR true    // for direct drive extruder v9 set to true, for geared extruder set to false
365 
+#define INVERT_E1_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
366 
 #define INVERT_E2_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
 366 
 #define INVERT_E2_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
367 
+#define INVERT_E3_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
367
368
368 
 // ENDSTOP SETTINGS:
 369 
 // ENDSTOP SETTINGS:
369 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 370 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 2
- 1
Marlin/example_configurations/SCARA/Configuration.h View File

383 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 383 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
384 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 384 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
385 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 385 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
386 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
386 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
387 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 387 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
388 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
388
389
389 
 // ENDSTOP SETTINGS:
 390 
 // ENDSTOP SETTINGS:
390 
 // Sets direction of endstop	s when homing; 1=MAX, -1=MIN
 391 
 // Sets direction of endstop	s when homing; 1=MAX, -1=MIN

+ 3
- 2
Marlin/example_configurations/WITBOX/Configuration.h View File

354 
 #define DISABLE_E false // For all extruders
 354 
 #define DISABLE_E false // For all extruders
355 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 355 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
356
356
357 
-#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
357 
+#define INVERT_X_DIR true     // for Mendel set to false, for Orca set to true
358 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 358 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
359 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 359 
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
360 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 360 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
361 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
361 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
362 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 362 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
363 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
363
364
364 
 // ENDSTOP SETTINGS:
 365 
 // ENDSTOP SETTINGS:
365 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 366 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 2
- 1
Marlin/example_configurations/delta/Configuration.h View File

371 
 #define INVERT_Z_DIR false
 371 
 #define INVERT_Z_DIR false
372
372
373 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 373 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
374 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
374 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
375 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 375 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
376 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
376
377
377 
 // ENDSTOP SETTINGS:
 378 
 // ENDSTOP SETTINGS:
378 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 379 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 3
- 2
Marlin/example_configurations/makibox/Configuration.h View File

355 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
 355 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
356 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 356 
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
357 
 #define INVERT_Z_DIR false    // for Mendel set to false, for Orca set to true
 357 
 #define INVERT_Z_DIR false    // for Mendel set to false, for Orca set to true
358 
-#define INVERT_E0_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
359 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
358 
+#define INVERT_E0_DIR true    // for direct drive extruder v9 set to true, for geared extruder set to false
359 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
360 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 360 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
361 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
361
362
362 
 // ENDSTOP SETTINGS:
 363 
 // ENDSTOP SETTINGS:
363 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 364 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 4
- 3
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

356 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 356 
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
357
357
358 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
 358 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
359 
-#define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
360 
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
359 
+#define INVERT_Y_DIR true     // for Mendel set to true, for Orca set to false
360 
+#define INVERT_Z_DIR false    // for Mendel set to false, for Orca set to true
361 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 361 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
362 
-#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
362 
+#define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
363 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 363 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
364 
+#define INVERT_E3_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
364
365
365 
 // ENDSTOP SETTINGS:
 366 
 // ENDSTOP SETTINGS:
366 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
 367 
 // Sets direction of endstops when homing; 1=MAX, -1=MIN

+ 3
- 0
Marlin/temperature.cpp View File

460 
   #endif
460 
   #endif
461 
   #if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
 461 
   #if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
462 
     if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
462 
     if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
463 
+        && EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
463 
         && EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
 464 
         && EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
464 
       setExtruderAutoFanState(EXTRUDER_2_AUTO_FAN_PIN, (fanState & 4) != 0);
 465 
       setExtruderAutoFanState(EXTRUDER_2_AUTO_FAN_PIN, (fanState & 4) != 0);
465 
   #endif
 466 
   #endif
466 
   #if defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1
 467 
   #if defined(EXTRUDER_3_AUTO_FAN_PIN) && EXTRUDER_3_AUTO_FAN_PIN > -1
467 
     if (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
468 
     if (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
469 
+        && EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
470 
+        && EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
468 
         && EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_2_AUTO_FAN_PIN)
 471 
         && EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_2_AUTO_FAN_PIN)
469 
       setExtruderAutoFanState(EXTRUDER_3_AUTO_FAN_PIN, (fanState & 8) != 0);
 472 
       setExtruderAutoFanState(EXTRUDER_3_AUTO_FAN_PIN, (fanState & 8) != 0);
470 
   #endif
 473 
   #endif

Write Preview
Loading…
Cancel
Save