Browse Source

Account for MAX31855 in conditionals

Scott Lahteine 9 years ago
parent
commit
877fb1f588
1 changed files with 17 additions and 9 deletions
  1. 17
    9
      Marlin/Conditionals.h

+ 17
- 9
Marlin/Conditionals.h View File

@@ -440,7 +440,9 @@
440 440
     #define HEATER_0_USES_THERMISTOR
441 441
   #endif
442 442
 
443
-  #if TEMP_SENSOR_1 == -1
443
+  #if TEMP_SENSOR_1 <= -2
444
+    #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_1
445
+  #elif TEMP_SENSOR_1 == -1
444 446
     #define HEATER_1_USES_AD595
445 447
   #elif TEMP_SENSOR_1 == 0
446 448
     #undef HEATER_1_MINTEMP
@@ -450,7 +452,9 @@
450 452
     #define HEATER_1_USES_THERMISTOR
451 453
   #endif
452 454
 
453
-  #if TEMP_SENSOR_2 == -1
455
+  #if TEMP_SENSOR_2 <= -2
456
+    #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_2
457
+  #elif TEMP_SENSOR_2 == -1
454 458
     #define HEATER_2_USES_AD595
455 459
   #elif TEMP_SENSOR_2 == 0
456 460
     #undef HEATER_2_MINTEMP
@@ -460,7 +464,9 @@
460 464
     #define HEATER_2_USES_THERMISTOR
461 465
   #endif
462 466
 
463
-  #if TEMP_SENSOR_3 == -1
467
+  #if TEMP_SENSOR_3 <= -2
468
+    #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_3
469
+  #elif TEMP_SENSOR_3 == -1
464 470
     #define HEATER_3_USES_AD595
465 471
   #elif TEMP_SENSOR_3 == 0
466 472
     #undef HEATER_3_MINTEMP
@@ -470,7 +476,9 @@
470 476
     #define HEATER_3_USES_THERMISTOR
471 477
   #endif
472 478
 
473
-  #if TEMP_SENSOR_BED == -1
479
+  #if TEMP_SENSOR_BED <= -2
480
+    #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_BED
481
+  #elif TEMP_SENSOR_BED == -1
474 482
     #define BED_USES_AD595
475 483
   #elif TEMP_SENSOR_BED == 0
476 484
     #undef BED_MINTEMP
@@ -498,11 +506,11 @@
498 506
   /**
499 507
    * Shorthand for pin tests, used wherever needed
500 508
    */
501
-  #define HAS_TEMP_0 (PIN_EXISTS(TEMP_0) && TEMP_SENSOR_0 != 0 && TEMP_SENSOR_0 != -2)
502
-  #define HAS_TEMP_1 (PIN_EXISTS(TEMP_1) && TEMP_SENSOR_1 != 0)
503
-  #define HAS_TEMP_2 (PIN_EXISTS(TEMP_2) && TEMP_SENSOR_2 != 0)
504
-  #define HAS_TEMP_3 (PIN_EXISTS(TEMP_3) && TEMP_SENSOR_3 != 0)
505
-  #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0)
509
+  #define HAS_TEMP_0 (PIN_EXISTS(TEMP_0) && TEMP_SENSOR_0 != 0 && TEMP_SENSOR_0 > -2)
510
+  #define HAS_TEMP_1 (PIN_EXISTS(TEMP_1) && TEMP_SENSOR_1 != 0 && TEMP_SENSOR_1 > -2)
511
+  #define HAS_TEMP_2 (PIN_EXISTS(TEMP_2) && TEMP_SENSOR_2 != 0 && TEMP_SENSOR_2 > -2)
512
+  #define HAS_TEMP_3 (PIN_EXISTS(TEMP_3) && TEMP_SENSOR_3 != 0 && TEMP_SENSOR_3 > -2)
513
+  #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
506 514
   #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
507 515
   #define HAS_HEATER_1 (PIN_EXISTS(HEATER_1))
508 516
   #define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))

Loading…
Cancel
Save