From ffbf63e6afb7728849d434ccfda89e3fd8b37094 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 7 Mar 2018 01:53:50 -0600
Subject: [PATCH] Add HAS_TEMP_SENSOR conditional
---
Marlin/src/Marlin.cpp | 2 +-
Marlin/src/gcode/gcode.cpp | 2 +-
Marlin/src/gcode/gcode.h | 2 +-
Marlin/src/gcode/temperature/M105.cpp | 2 +-
Marlin/src/gcode/temperature/M155.cpp | 4 ++--
Marlin/src/inc/Conditionals_post.h | 5 +++++
Marlin/src/module/temperature.cpp | 6 +++---
Marlin/src/module/temperature.h | 2 +-
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index b8c0255365..89a4d47b10 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -519,7 +519,7 @@ void idle(
gcode.host_keepalive();
#endif
- #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+ #if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
thermalManager.auto_report_temperatures();
#endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 45f7dc6108..938488996e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -391,7 +391,7 @@ void GcodeSuite::process_parsed_command() {
KEEPALIVE_STATE(NOT_BUSY);
return; // "ok" already printed
- #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+ #if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
case 155: M155(); break; // M155: Set temperature auto-report interval
#endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 296c0f3f47..bdef7dfca2 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -547,7 +547,7 @@ private:
static void M150();
#endif
- #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+ #if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
static void M155();
#endif
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temperature/M105.cpp
index 36d4d67ac5..2c569e2888 100644
--- a/Marlin/src/gcode/temperature/M105.cpp
+++ b/Marlin/src/gcode/temperature/M105.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M105() {
const int16_t port = command_queue_port[cmd_queue_index_r];
#endif
- #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+ #if HAS_TEMP_SENSOR
SERIAL_PROTOCOLPGM_P(port, MSG_OK);
thermalManager.print_heaterstates(
#if NUM_SERIAL > 1
diff --git a/Marlin/src/gcode/temperature/M155.cpp b/Marlin/src/gcode/temperature/M155.cpp
index d97e7b9ae9..611676a672 100644
--- a/Marlin/src/gcode/temperature/M155.cpp
+++ b/Marlin/src/gcode/temperature/M155.cpp
@@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
-#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
#include "../gcode.h"
#include "../../module/temperature.h"
@@ -37,4 +37,4 @@ void GcodeSuite::M155() {
}
-#endif // AUTO_REPORT_TEMPERATURES && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+#endif // AUTO_REPORT_TEMPERATURES && HAS_TEMP_SENSOR
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 25a7d4086f..084f525869 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -754,6 +754,7 @@
#define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2)
#define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675))
#define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
+#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_TEMP_BED)
// Heaters
#define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
@@ -816,6 +817,10 @@
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
#define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))
+#if !HAS_TEMP_SENSOR
+ #undef AUTO_REPORT_TEMPERATURES
+#endif
+
/**
* This setting is also used by M109 when trying to calculate
* a ballpark safe margin to prevent wait-forever situation.
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index bdee6e6bb0..fdefeeff04 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -417,7 +417,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
// Report heater states every 2 seconds
if (ELAPSED(ms, next_temp_ms)) {
- #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+ #if HAS_TEMP_SENSOR
print_heaterstates();
SERIAL_EOL();
#endif
@@ -2144,7 +2144,7 @@ void Temperature::isr() {
ENABLE_TEMPERATURE_INTERRUPT(); //re-enable Temperature ISR
}
-#if HAS_TEMP_HOTEND || HAS_TEMP_BED
+#if HAS_TEMP_SENSOR
#include "../gcode/gcode.h"
@@ -2251,4 +2251,4 @@ void Temperature::isr() {
#endif // AUTO_REPORT_TEMPERATURES
-#endif // HAS_TEMP_HOTEND || HAS_TEMP_BED
+#endif // HAS_TEMP_SENSOR
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 9709ddff81..b92140c26a 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -564,7 +564,7 @@ class Temperature {
#endif // HEATER_IDLE_HANDLER
- #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+ #if HAS_TEMP_SENSOR
static void print_heaterstates(
#if NUM_SERIAL > 1
const int8_t port = -1
--
GitLab