diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b8ebd2083379007f48614ee25c8622eeb3749353..7f0904d2e63fc8a2b9ea708931a92b463ee2a8c3 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 9f7e78b1e2e86a0775ce6f5461a201aada6701f0..a47b446c3b2f6f30398cd3389a3842f05457ac89 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 12e5e9b345372e19074c5de0f8e26be68837e045..2cbdcc54946eda371960630b15b2f4213db1ad66 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 7892e4e43e12d8e58078ff0ff770100de5c4f01d..4f77d4bb25f52b3819fbcccabea01f3c635521dd 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 b0e218b5d058dac7e330b799fdf63fc93ae1dd21..4be4e7950126b17b7021f70c8bb35ea3eb271468 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 30ea847f4571392e3426614f60cf193b81cad83e..7399f98fdcda4780eae8b458b9d71bcc839397b3 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 a578621c8053ff59eb45ad054d15794ad3508310..8dc9522fdc7781e77c23ca199dbfea28efcc4106 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 6586758cab4de4b6b47403dcc47af52304aa90d7..bed48247b963aa2f282bc4c305e453872db03eac 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 9608baed4094aa75564c6242bfa77ba3dbe44b7a..49057aea05ba66da7aa664fa405bb02c54ec1bc5 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 5a431599c506cb482829b3d41bdf180317df7133..f53441c748b20fa82a8aef442651105466b89638 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 cf3cb68d70c2818135cb85f51deee866044778b3..3b76fbda1270f6a67eb1c1f89ee665e836f43941 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 5f7ce95eec0531b4adb7ee7654bc003d929094fb..2dc3555c61f78cfaec11e06e68e3992fc4f56f48 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 ed919e87fb38a38390086c359fae2cb0a80cf9f9..571e3aa168b184f6730f236ad5f7a9440a5e065a 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 3ee07c3a9c08d7b70dbb6a629ab76af5318d102f..b6c70ee743443d675557846b5b04e2b1f751e76b 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 bf7c10f3bdce2ebfd69ba6aee41bd9c9c32b76b2..54f69f546767dd969581442282f8c30ba857d008 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 0f81183e3e928a535ff52567e67d0c621081fdfb..67fc743a99261c35e14eb69756e105f216c851c3 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 fd4441f842e12bf5789e1e2ffcdcb8a80a018b1f..80b0715a7e0667d63215535c1b9db9663b476d26 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 35ec25acbdc3436681a0fa5fe13f03861e931ee8..79079193ff36a0ad3410ed2d206557c0e336880d 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 16325116890e2aeb2aab164decc56eee42220df2..e3232022e1ee5302890663f234ac760311d661ca 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 f5283d99a38ca101ec31b063c161787670208f15..873f3c6aa6cdc8edbd78823ba3851cfbb0e1d2ee 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 65e68a4b518bfa28bcf455e08aea512f2f8bd4c0..f6a09cac22aeb6e8ed35408a382a7b44d7e5bcea 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 9aac30d6be67b878fd567fc150e1e7c93e5e9ff6..d3b4bb0d14682c454c7ce7a074f9b4618db18b32 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 ad2997dda7f3f9e3f0c238617fa648db00380b1a..9f9d940650d55ceb6beda82a15ca8c397510f9b9 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 dbe5b9cd2ba650c89577728baef94f55f521ae96..a36fb37f02f249bc849e13a4e5e342f056fa65ca 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 ================================
//===========================================================================