From c31f56a38c0091873eb13cf8c6e1d6e4a4b84fa7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 29 Jul 2016 15:14:13 -0700
Subject: [PATCH] Deprecate EXTRUDER_WATTS and BED_WATTS
---
Marlin/Configuration.h | 4 ----
Marlin/Marlin_main.cpp | 21 +++----------------
Marlin/SanityCheck.h | 4 ++--
.../Cartesio/Configuration.h | 4 ----
.../Felix/Configuration.h | 4 ----
.../Felix/DUAL/Configuration.h | 4 ----
.../Hephestos/Configuration.h | 4 ----
.../Hephestos_2/Configuration.h | 4 ----
.../K8200/Configuration.h | 4 ----
.../K8400/Configuration.h | 4 ----
.../K8400/Dual-head/Configuration.h | 4 ----
.../RepRapWorld/Megatronics/Configuration.h | 4 ----
.../RigidBot/Configuration.h | 4 ----
.../SCARA/Configuration.h | 4 ----
.../TAZ4/Configuration.h | 4 ----
.../WITBOX/Configuration.h | 4 ----
.../adafruit/ST7565/Configuration.h | 4 ----
.../delta/biv2.5/Configuration.h | 4 ----
.../delta/generic/Configuration.h | 4 ----
.../delta/kossel_mini/Configuration.h | 4 ----
.../delta/kossel_pro/Configuration.h | 4 ----
.../delta/kossel_xl/Configuration.h | 4 ----
.../makibox/Configuration.h | 4 ----
.../tvrrug/Round2/Configuration.h | 4 ----
24 files changed, 5 insertions(+), 108 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b8ebd20833..7f0904d2e6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -263,10 +263,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 9f7e78b1e2..a47b446c3b 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4488,31 +4488,16 @@ inline void gcode_M104() {
}
#endif
SERIAL_PROTOCOLPGM(" @:");
- #ifdef EXTRUDER_WATTS
- SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(target_extruder)) / 127);
- SERIAL_PROTOCOLCHAR('W');
- #else
- SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
- #endif
+ SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
#if HAS_TEMP_BED
SERIAL_PROTOCOLPGM(" B@:");
- #ifdef BED_WATTS
- SERIAL_PROTOCOL(((BED_WATTS) * thermalManager.getHeaterPower(-1)) / 127);
- SERIAL_PROTOCOLCHAR('W');
- #else
- SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
- #endif
+ SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
#endif
#if HOTENDS > 1
HOTEND_LOOP() {
SERIAL_PROTOCOLPAIR(" @", e);
SERIAL_PROTOCOLCHAR(':');
- #ifdef EXTRUDER_WATTS
- SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(e)) / 127);
- SERIAL_PROTOCOLCHAR('W');
- #else
- SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
- #endif
+ SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
}
#endif
}
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 12e5e9b345..2cbdcc5494 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -698,8 +698,8 @@
#error "EXTRUDER_OFFSET_[XY] is deprecated. Use HOTEND_OFFSET_[XY] instead."
#elif defined(PID_PARAMS_PER_EXTRUDER)
#error "PID_PARAMS_PER_EXTRUDER is deprecated. Use PID_PARAMS_PER_HOTEND instead."
-#elif defined(EXTRUDER_WATTS)
- #error "EXTRUDER_WATTS is deprecated. Use HOTEND_WATTS instead."
+#elif defined(EXTRUDER_WATTS) || defined(BED_WATTS)
+ #error "EXTRUDER_WATTS and BED_WATTS are deprecated. Remove them from your configuration."
#elif defined(SERVO_ENDSTOP_ANGLES)
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 7892e4e43e..4f77d4bb25 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -265,10 +265,6 @@
#define HEATER_3_MAXTEMP 415
#define BED_MAXTEMP 165
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index b0e218b5d0..4be4e79501 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 30ea847f45..7399f98fdc 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index a578621c80..8dc9522fdc 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -267,10 +267,6 @@
#define HEATER_3_MAXTEMP 260
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index 6586758cab..bed48247b9 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -263,10 +263,6 @@
//#define HEATER_3_MAXTEMP 275
//#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 9608baed40..49057aea05 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -271,10 +271,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index 5a431599c5..f53441c748 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
index cf3cb68d70..3b76fbda12 100644
--- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 5f7ce95eec..2dc3555c61 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index ed919e87fb..571e3aa168 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -267,10 +267,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 3ee07c3a9c..b6c70ee743 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -289,10 +289,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-#define HOTEND_WATTS (2*2/5.9) // P=U^2/R
-#define BED_WATTS (5.45*5.45/2.2) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index bf7c10f3bd..54f69f5467 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 250
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index 0f81183e3e..67fc743a99 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -266,10 +266,6 @@
#define HEATER_3_MAXTEMP 260
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index fd4441f842..80b0715a7e 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 35ec25acbd..79079193ff 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 1632511689..e3232022e1 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index f5283d99a3..873f3c6aa6 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index 65e68a4b51..f6a09cac22 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -270,10 +270,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index 9aac30d6be..d3b4bb0d14 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -257,10 +257,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index ad2997dda7..9f9d940650 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -264,10 +264,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index dbe5b9cd2b..a36fb37f02 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -263,10 +263,6 @@
#define HEATER_3_MAXTEMP 275
#define BED_MAXTEMP 150
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
-//#define BED_WATTS (12.0*12.0/1.1) // P=U^2/R
-
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
--
GitLab