thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Deprecate EXTRUDER_WATTS and BED_WATTS

Scott Lahteine 8 years ago
parent
e1970b4b28
commit
c31f56a38c
24 changed files with 5 additions and 108 deletions
Split View Show Diff Stats
  1. 0
    4
      Marlin/Configuration.h
  2. 3
    18
      Marlin/Marlin_main.cpp
  3. 2
    2
      Marlin/SanityCheck.h
  4. 0
    4
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 0
    4
      Marlin/example_configurations/Felix/Configuration.h
  6. 0
    4
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 0
    4
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 0
    4
      Marlin/example_configurations/Hephestos_2/Configuration.h
  9. 0
    4
      Marlin/example_configurations/K8200/Configuration.h
  10. 0
    4
      Marlin/example_configurations/K8400/Configuration.h
  11. 0
    4
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  12. 0
    4
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 0
    4
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 0
    4
      Marlin/example_configurations/SCARA/Configuration.h
  15. 0
    4
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 0
    4
      Marlin/example_configurations/WITBOX/Configuration.h
  17. 0
    4
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  18. 0
    4
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  19. 0
    4
      Marlin/example_configurations/delta/generic/Configuration.h
  20. 0
    4
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  21. 0
    4
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  22. 0
    4
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  23. 0
    4
      Marlin/example_configurations/makibox/Configuration.h
  24. 0
    4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 0
- 4
Marlin/Configuration.h View File 

@@ -263,10 +263,6 @@
263 263 
 #define HEATER_3_MAXTEMP 275
264 264 
 #define BED_MAXTEMP 150
265 265
266 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
267 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
268 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
269 
-
270 266 
 //===========================================================================
271 267 
 //============================= PID Settings ================================
272 268 
 //===========================================================================

+ 3
- 18
Marlin/Marlin_main.cpp View File 

@@ -4488,31 +4488,16 @@ inline void gcode_M104() {
4488 4488 
       }
4489 4489 
     #endif
4490 4490 
     SERIAL_PROTOCOLPGM(" @:");
4491 
-    #ifdef EXTRUDER_WATTS
4492 
-      SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(target_extruder)) / 127);
4493 
-      SERIAL_PROTOCOLCHAR('W');
4494 
-    #else
4495 
-      SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
4496 
-    #endif
4491 
+    SERIAL_PROTOCOL(thermalManager.getHeaterPower(target_extruder));
4497 4492 
     #if HAS_TEMP_BED
4498 4493 
       SERIAL_PROTOCOLPGM(" B@:");
4499 
-      #ifdef BED_WATTS
4500 
-        SERIAL_PROTOCOL(((BED_WATTS) * thermalManager.getHeaterPower(-1)) / 127);
4501 
-        SERIAL_PROTOCOLCHAR('W');
4502 
-      #else
4503 
-        SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
4504 
-      #endif
4494 
+      SERIAL_PROTOCOL(thermalManager.getHeaterPower(-1));
4505 4495 
     #endif
4506 4496 
     #if HOTENDS > 1
4507 4497 
       HOTEND_LOOP() {
4508 4498 
         SERIAL_PROTOCOLPAIR(" @", e);
4509 4499 
         SERIAL_PROTOCOLCHAR(':');
4510 
-        #ifdef EXTRUDER_WATTS
4511 
-          SERIAL_PROTOCOL(((EXTRUDER_WATTS) * thermalManager.getHeaterPower(e)) / 127);
4512 
-          SERIAL_PROTOCOLCHAR('W');
4513 
-        #else
4514 
-          SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
4515 
-        #endif
4500 
+        SERIAL_PROTOCOL(thermalManager.getHeaterPower(e));
4516 4501 
       }
4517 4502 
     #endif
4518 4503 
   }

+ 2
- 2
Marlin/SanityCheck.h View File 

@@ -698,8 +698,8 @@
698 698 
   #error "EXTRUDER_OFFSET_[XY] is deprecated. Use HOTEND_OFFSET_[XY] instead."
699 699 
 #elif defined(PID_PARAMS_PER_EXTRUDER)
700 700 
   #error "PID_PARAMS_PER_EXTRUDER is deprecated. Use PID_PARAMS_PER_HOTEND instead."
701 
-#elif defined(EXTRUDER_WATTS)
702 
-  #error "EXTRUDER_WATTS is deprecated. Use HOTEND_WATTS instead."
701 
+#elif defined(EXTRUDER_WATTS) || defined(BED_WATTS)
702 
+  #error "EXTRUDER_WATTS and BED_WATTS are deprecated. Remove them from your configuration."
703 703 
 #elif defined(SERVO_ENDSTOP_ANGLES)
704 704 
   #error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
705 705 
 #elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)

+ 0
- 4
Marlin/example_configurations/Cartesio/Configuration.h View File 

@@ -265,10 +265,6 @@
265 265 
 #define HEATER_3_MAXTEMP 415
266 266 
 #define BED_MAXTEMP 165
267 267
268 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
269 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
270 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
271 
-
272 268 
 //===========================================================================
273 269 
 //============================= PID Settings ================================
274 270 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/Felix/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/Felix/DUAL/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/Hephestos/Configuration.h View File 

@@ -267,10 +267,6 @@
267 267 
 #define HEATER_3_MAXTEMP 260
268 268 
 #define BED_MAXTEMP 150
269 269
270 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
271 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
272 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
273 
-
274 270 
 //===========================================================================
275 271 
 //============================= PID Settings ================================
276 272 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/Hephestos_2/Configuration.h View File 

@@ -263,10 +263,6 @@
263 263 
 //#define HEATER_3_MAXTEMP 275
264 264 
 //#define BED_MAXTEMP 150
265 265
266 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
267 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
268 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
269 
-
270 266 
 //===========================================================================
271 267 
 //============================= PID Settings ================================
272 268 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/K8200/Configuration.h View File 

@@ -271,10 +271,6 @@
271 271 
 #define HEATER_3_MAXTEMP 275
272 272 
 #define BED_MAXTEMP 150
273 273
274 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
275 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
276 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
277 
-
278 274 
 //===========================================================================
279 275 
 //============================= PID Settings ================================
280 276 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/K8400/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/RigidBot/Configuration.h View File 

@@ -267,10 +267,6 @@
267 267 
 #define HEATER_3_MAXTEMP 275
268 268 
 #define BED_MAXTEMP 150
269 269
270 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
271 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
272 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
273 
-
274 270 
 //===========================================================================
275 271 
 //============================= PID Settings ================================
276 272 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/SCARA/Configuration.h View File 

@@ -289,10 +289,6 @@
289 289 
 #define HEATER_3_MAXTEMP 275
290 290 
 #define BED_MAXTEMP 150
291 291
292 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
293 
-#define HOTEND_WATTS (2*2/5.9)       // P=U^2/R
294 
-#define BED_WATTS (5.45*5.45/2.2)    // P=U^2/R
295 
-
296 292 
 //===========================================================================
297 293 
 //============================= PID Settings ================================
298 294 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/TAZ4/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 250
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/WITBOX/Configuration.h View File 

@@ -266,10 +266,6 @@
266 266 
 #define HEATER_3_MAXTEMP 260
267 267 
 #define BED_MAXTEMP 150
268 268
269 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
270 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
271 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
272 
-
273 269 
 //===========================================================================
274 270 
 //============================= PID Settings ================================
275 271 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/delta/biv2.5/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/delta/generic/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File 

@@ -270,10 +270,6 @@
270 270 
 #define HEATER_3_MAXTEMP 275
271 271 
 #define BED_MAXTEMP 150
272 272
273 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
274 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
275 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
276 
-
277 273 
 //===========================================================================
278 274 
 //============================= PID Settings ================================
279 275 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File 

@@ -257,10 +257,6 @@
257 257 
 #define HEATER_3_MAXTEMP 275
258 258 
 #define BED_MAXTEMP 150
259 259
260 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
261 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
262 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
263 
-
264 260 
 //===========================================================================
265 261 
 //============================= PID Settings ================================
266 262 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/makibox/Configuration.h View File 

@@ -264,10 +264,6 @@
264 264 
 #define HEATER_3_MAXTEMP 275
265 265 
 #define BED_MAXTEMP 150
266 266
267 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
268 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
269 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
270 
-
271 267 
 //===========================================================================
272 268 
 //============================= PID Settings ================================
273 269 
 //===========================================================================

+ 0
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File 

@@ -263,10 +263,6 @@
263 263 
 #define HEATER_3_MAXTEMP 275
264 264 
 #define BED_MAXTEMP 150
265 265
266 
-// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
267 
-//#define HOTEND_WATTS (12.0*12.0/6.7) // P=U^2/R
268 
-//#define BED_WATTS (12.0*12.0/1.1)    // P=U^2/R
269 
-
270 266 
 //===========================================================================
271 267 
 //============================= PID Settings ================================
272 268 
 //===========================================================================

Write Preview
Loading…
Cancel
Save