bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix thermistors exist-for-reading tests (#18533)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
ellensp 2020-07-05 13:04:31 +12:00 committed by GitHub
parent 6eb19cef11
commit 6df927d3b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Marlin/src/module/temperature.cpp
View File

@ -1804,76 +1804,55 @@ void Temperature::init() {
temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \ temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
}while(0) }while(0)
#if THERMISTOR_HEATER_0 #define _MINMAX_TEST(N,M) (HOTENDS > N && THERMISTOR_HEATER_##N && THERMISTOR_HEATER_##N != 998 && THERMISTOR_HEATER_##N != 999 && defined(HEATER_##N##_##M##TEMP))
#ifdef HEATER_0_MINTEMP
#if _MINMAX_TEST(0, MIN)
_TEMP_MIN_E(0); _TEMP_MIN_E(0);
#endif
#ifdef HEATER_0_MAXTEMP
_TEMP_MAX_E(0);
#endif
#endif #endif
#if _MINMAX_TEST(0, MAX)
#if HAS_MULTI_HOTEND && THERMISTOR_HEATER_1 _TEMP_MAX_E(0);
#ifdef HEATER_1_MINTEMP
_TEMP_MIN_E(1);
#endif
#ifdef HEATER_1_MAXTEMP
_TEMP_MAX_E(1);
#endif
#endif #endif
#if _MINMAX_TEST(1, MIN)
#if HOTENDS > 2 && THERMISTOR_HEATER_2 _TEMP_MIN_E(1);
#ifdef HEATER_2_MINTEMP
_TEMP_MIN_E(2);
#endif
#ifdef HEATER_2_MAXTEMP
_TEMP_MAX_E(2);
#endif
#endif #endif
#if _MINMAX_TEST(1, MAX)
#if HOTENDS > 3 && THERMISTOR_HEATER_3 _TEMP_MAX_E(1);
#ifdef HEATER_3_MINTEMP
_TEMP_MIN_E(3);
#endif
#ifdef HEATER_3_MAXTEMP
_TEMP_MAX_E(3);
#endif
#endif #endif
#if _MINMAX_TEST(2, MIN)
#if HOTENDS > 4 && THERMISTOR_HEATER_4 _TEMP_MIN_E(2);
#ifdef HEATER_4_MINTEMP
_TEMP_MIN_E(4);
#endif
#ifdef HEATER_4_MAXTEMP
_TEMP_MAX_E(4);
#endif
#endif #endif
#if _MINMAX_TEST(2, MAX)
#if HOTENDS > 5 && THERMISTOR_HEATER_5 _TEMP_MAX_E(2);
#ifdef HEATER_5_MINTEMP
_TEMP_MIN_E(5);
#endif
#ifdef HEATER_5_MAXTEMP
_TEMP_MAX_E(5);
#endif
#endif #endif
#if _MINMAX_TEST(3, MIN)
#if HOTENDS > 6 && THERMISTOR_HEATER_6 _TEMP_MIN_E(3);
#ifdef HEATER_6_MINTEMP
_TEMP_MIN_E(6);
#endif
#ifdef HEATER_6_MAXTEMP
_TEMP_MAX_E(6);
#endif
#endif #endif
#if _MINMAX_TEST(3, MAX)
#if HOTENDS > 7 && THERMISTOR_HEATER_7 _TEMP_MAX_E(3);
#ifdef HEATER_7_MINTEMP #endif
_TEMP_MIN_E(7); #if _MINMAX_TEST(4, MIN)
#endif _TEMP_MIN_E(4);
#ifdef HEATER_7_MAXTEMP #endif
_TEMP_MAX_E(7); #if _MINMAX_TEST(4, MAX)
#endif _TEMP_MAX_E(4);
#endif
#if _MINMAX_TEST(5, MIN)
_TEMP_MIN_E(5);
#endif
#if _MINMAX_TEST(5, MAX)
_TEMP_MAX_E(5);
#endif
#if _MINMAX_TEST(6, MIN)
_TEMP_MIN_E(6);
#endif
#if _MINMAX_TEST(6, MAX)
_TEMP_MAX_E(6);
#endif
#if _MINMAX_TEST(7, MIN)
_TEMP_MIN_E(7);
#endif
#if _MINMAX_TEST(7, MAX)
_TEMP_MAX_E(7);
#endif #endif
#endif // HAS_HOTEND #endif // HAS_HOTEND