Skip to content

Commit 3706c16

Browse files
ellenspellensp
authored
🐛 Fix dummy thermistors 998-999 (#25956)
1 parent 0ed4640 commit 3706c16

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎Marlin/src/inc/Conditionals_adv.h

+29-29
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,12 @@
364364
#define TEMP_SENSOR_0_IS_AD8495 1
365365
#elif TEMP_SENSOR_0 == -1
366366
#define TEMP_SENSOR_0_IS_AD595 1
367-
#elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
368-
#define TEMP_SENSOR_0_IS_DUMMY 1
369367
#elif TEMP_SENSOR_0 > 0
370368
#define TEMP_SENSOR_0_IS_THERMISTOR 1
371369
#if TEMP_SENSOR_0 == 1000
372370
#define TEMP_SENSOR_0_IS_CUSTOM 1
371+
#elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
372+
#define TEMP_SENSOR_0_IS_DUMMY 1
373373
#endif
374374
#endif
375375

@@ -407,12 +407,12 @@
407407
#define TEMP_SENSOR_1_IS_AD8495 1
408408
#elif TEMP_SENSOR_1 == -1
409409
#define TEMP_SENSOR_1_IS_AD595 1
410-
#elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
411-
#define TEMP_SENSOR_1_IS_DUMMY 1
412410
#elif TEMP_SENSOR_1 > 0
413411
#define TEMP_SENSOR_1_IS_THERMISTOR 1
414412
#if TEMP_SENSOR_1 == 1000
415413
#define TEMP_SENSOR_1_IS_CUSTOM 1
414+
#elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
415+
#define TEMP_SENSOR_1_IS_DUMMY 1
416416
#endif
417417
#endif
418418

@@ -450,57 +450,57 @@
450450
#define TEMP_SENSOR_2_IS_AD8495 1
451451
#elif TEMP_SENSOR_2 == -1
452452
#define TEMP_SENSOR_2_IS_AD595 1
453-
#elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
454-
#define TEMP_SENSOR_2_IS_DUMMY 1
455453
#elif TEMP_SENSOR_2 > 0
456454
#define TEMP_SENSOR_2_IS_THERMISTOR 1
457455
#if TEMP_SENSOR_2 == 1000
458456
#define TEMP_SENSOR_2_IS_CUSTOM 1
457+
#elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
458+
#define TEMP_SENSOR_2_IS_DUMMY 1
459459
#endif
460460
#endif
461461

462-
#if TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
463-
#define TEMP_SENSOR_3_IS_DUMMY 1
464-
#elif TEMP_SENSOR_3 > 0
462+
#if TEMP_SENSOR_3 > 0
465463
#define TEMP_SENSOR_3_IS_THERMISTOR 1
466464
#if TEMP_SENSOR_3 == 1000
467465
#define TEMP_SENSOR_3_IS_CUSTOM 1
466+
#elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
467+
#define TEMP_SENSOR_3_IS_DUMMY 1
468468
#endif
469469
#endif
470470

471-
#if TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
472-
#define TEMP_SENSOR_4_IS_DUMMY 1
473-
#elif TEMP_SENSOR_4 > 0
471+
#if TEMP_SENSOR_4 > 0
474472
#define TEMP_SENSOR_4_IS_THERMISTOR 1
475473
#if TEMP_SENSOR_4 == 1000
476474
#define TEMP_SENSOR_4_IS_CUSTOM 1
475+
#elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
476+
#define TEMP_SENSOR_4_IS_DUMMY 1
477477
#endif
478478
#endif
479479

480-
#if TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
481-
#define TEMP_SENSOR_5_IS_DUMMY 1
482-
#elif TEMP_SENSOR_5 > 0
480+
#if TEMP_SENSOR_5 > 0
483481
#define TEMP_SENSOR_5_IS_THERMISTOR 1
484482
#if TEMP_SENSOR_5 == 1000
485483
#define TEMP_SENSOR_5_IS_CUSTOM 1
484+
#elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
485+
#define TEMP_SENSOR_5_IS_DUMMY 1
486486
#endif
487487
#endif
488488

489-
#if TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
490-
#define TEMP_SENSOR_6_IS_DUMMY 1
491-
#elif TEMP_SENSOR_6 > 0
489+
#if TEMP_SENSOR_6 > 0
492490
#define TEMP_SENSOR_6_IS_THERMISTOR 1
493491
#if TEMP_SENSOR_6 == 1000
494492
#define TEMP_SENSOR_6_IS_CUSTOM 1
493+
#elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
494+
#define TEMP_SENSOR_6_IS_DUMMY 1
495495
#endif
496496
#endif
497497

498-
#if TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
499-
#define TEMP_SENSOR_7_IS_DUMMY 1
500-
#elif TEMP_SENSOR_7 > 0
498+
#if TEMP_SENSOR_7 > 0
501499
#define TEMP_SENSOR_7_IS_THERMISTOR 1
502500
#if TEMP_SENSOR_7 == 1000
503501
#define TEMP_SENSOR_7_IS_CUSTOM 1
502+
#elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
503+
#define TEMP_SENSOR_7_IS_DUMMY 1
504504
#endif
505505
#endif
506506

@@ -680,12 +680,12 @@
680680
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
681681
#elif TEMP_SENSOR_BED == -1
682682
#define TEMP_SENSOR_BED_IS_AD595 1
683-
#elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
684-
#define TEMP_SENSOR_BED_IS_DUMMY 1
685683
#elif TEMP_SENSOR_BED > 0
686684
#define TEMP_SENSOR_BED_IS_THERMISTOR 1
687685
#if TEMP_SENSOR_BED == 1000
688686
#define TEMP_SENSOR_BED_IS_CUSTOM 1
687+
#elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
688+
#define TEMP_SENSOR_BED_IS_DUMMY 1
689689
#endif
690690
#else
691691
#undef BED_MINTEMP
@@ -700,12 +700,12 @@
700700
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
701701
#elif TEMP_SENSOR_CHAMBER == -1
702702
#define TEMP_SENSOR_CHAMBER_IS_AD595 1
703-
#elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
704-
#define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
705703
#elif TEMP_SENSOR_CHAMBER > 0
706704
#define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
707705
#if TEMP_SENSOR_CHAMBER == 1000
708706
#define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
707+
#elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
708+
#define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
709709
#endif
710710
#else
711711
#undef THERMAL_PROTECTION_CHAMBER
@@ -742,12 +742,12 @@
742742
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_PROBE."
743743
#elif TEMP_SENSOR_PROBE == -1
744744
#define TEMP_SENSOR_PROBE_IS_AD595 1
745-
#elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
746-
#define TEMP_SENSOR_PROBE_IS_DUMMY 1
747745
#elif TEMP_SENSOR_PROBE > 0
748746
#define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
749747
#if TEMP_SENSOR_PROBE == 1000
750748
#define TEMP_SENSOR_PROBE_IS_CUSTOM 1
749+
#elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
750+
#define TEMP_SENSOR_PROBE_IS_DUMMY 1
751751
#endif
752752
#endif
753753

@@ -759,12 +759,12 @@
759759
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BOARD."
760760
#elif TEMP_SENSOR_BOARD == -1
761761
#define TEMP_SENSOR_BOARD_IS_AD595 1
762-
#elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
763-
#define TEMP_SENSOR_BOARD_IS_DUMMY 1
764762
#elif TEMP_SENSOR_BOARD > 0
765763
#define TEMP_SENSOR_BOARD_IS_THERMISTOR 1
766764
#if TEMP_SENSOR_BOARD == 1000
767765
#define TEMP_SENSOR_BOARD_IS_CUSTOM 1
766+
#elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
767+
#define TEMP_SENSOR_BOARD_IS_DUMMY 1
768768
#endif
769769
#endif
770770

‎Marlin/src/module/temperature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2943,7 +2943,7 @@ void Temperature::init() {
29432943
temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
29442944
}while(0)
29452945

2946-
#define _MINMAX_TEST(N,M) (HOTENDS > N && TEMP_SENSOR_##N##_IS_THERMISTOR && defined(HEATER_##N##_##M##TEMP))
2946+
#define _MINMAX_TEST(N,M) (!TEMP_SENSOR_##N##_IS_DUMMY && HOTENDS > N && TEMP_SENSOR_##N##_IS_THERMISTOR && defined(HEATER_##N##_##M##TEMP))
29472947

29482948
#if _MINMAX_TEST(0, MIN)
29492949
_TEMP_MIN_E(0);

0 commit comments

Comments
 (0)