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

🔧 Assert Probe Temp Comp requirements (#24468)

Browse Source
This commit is contained in:
Keith Bennett 2022-07-08 13:30:03 -07:00 committed by Scott Lahteine
parent 24c211307d
commit 678474d55c
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/inc/Conditionals_adv.h
View File

@ -560,16 +560,6 @@
#endif #endif
#endif #endif
// Probe Temperature Compensation
#if !TEMP_SENSOR_PROBE
#undef PTC_PROBE
#endif
#if !TEMP_SENSOR_BED
#undef PTC_BED
#endif
#if !HAS_EXTRUDERS
#undef PTC_HOTEND
#endif
#if ANY(PTC_PROBE, PTC_BED, PTC_HOTEND) #if ANY(PTC_PROBE, PTC_BED, PTC_HOTEND)
#define HAS_PTC 1 #define HAS_PTC 1
#endif #endif

60
Marlin/src/inc/SanityCheck.h
View File

@ -666,34 +666,46 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#endif #endif
#endif #endif
#ifdef PTC_PROBE_START #if ENABLED(PTC_PROBE)
constexpr auto _ptc_sample_start = PTC_PROBE_START; #if !TEMP_SENSOR_PROBE
constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f; #error "PTC_PROBE requires a probe with a thermistor."
static_assert(_test_ptc_sample_start != 12.3f, "PTC_PROBE_START must be a whole number."); #endif
#ifdef PTC_PROBE_START
constexpr auto _ptc_sample_start = PTC_PROBE_START;
constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f;
static_assert(_test_ptc_sample_start != 12.3f, "PTC_PROBE_START must be a whole number.");
#endif
#ifdef PTC_PROBE_RES
constexpr auto _ptc_sample_res = PTC_PROBE_RES;
constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f;
static_assert(_test_ptc_sample_res != 12.3f, "PTC_PROBE_RES must be a whole number.");
#endif
#if ENABLED(PTC_BED) && defined(PTC_PROBE_TEMP)
constexpr auto _btc_probe_temp = PTC_PROBE_TEMP;
constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
static_assert(_test_btc_probe_temp != 12.3f, "PTC_PROBE_TEMP must be a whole number.");
#endif
#endif #endif
#ifdef PTC_PROBE_RES
constexpr auto _ptc_sample_res = PTC_PROBE_RES; #if ENABLED(PTC_BED)
constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f; #if !TEMP_SENSOR_BED
static_assert(_test_ptc_sample_res != 12.3f, "PTC_PROBE_RES must be a whole number."); #error "PTC_BED requires a bed with a thermistor."
#endif #endif
#ifdef PTC_BED_START #ifdef PTC_BED_START
constexpr auto _btc_sample_start = PTC_BED_START; constexpr auto _btc_sample_start = PTC_BED_START;
constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f; constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f;
static_assert(_test_btc_sample_start != 12.3f, "PTC_BED_START must be a whole number."); static_assert(_test_btc_sample_start != 12.3f, "PTC_BED_START must be a whole number.");
#endif #endif
#ifdef PTC_BED_RES #ifdef PTC_BED_RES
constexpr auto _btc_sample_res = PTC_BED_RES; constexpr auto _btc_sample_res = PTC_BED_RES;
constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f; constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
static_assert(_test_btc_sample_res != 12.3f, "PTC_BED_RES must be a whole number."); static_assert(_test_btc_sample_res != 12.3f, "PTC_BED_RES must be a whole number.");
#endif #endif
#ifdef PTC_PROBE_TEMP
constexpr auto _btc_probe_temp = PTC_PROBE_TEMP;
constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
static_assert(_test_btc_probe_temp != 12.3f, "PTC_PROBE_TEMP must be a whole number.");
#endif #endif
#if ENABLED(PTC_HOTEND) #if ENABLED(PTC_HOTEND)
#if EXTRUDERS != 1 #if EXTRUDERS != 1
#error "PTC_HOTEND only works with a single extruder." #error "PTC_HOTEND requires a single extruder."
#endif #endif
#ifdef PTC_HOTEND_START #ifdef PTC_HOTEND_START
constexpr auto _etc_sample_start = PTC_HOTEND_START; constexpr auto _etc_sample_start = PTC_HOTEND_START;