andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Deprecate EXTRUDER_WATTS and BED_WATTS

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

4
Marlin/Configuration.h
View File

@ -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 ================================
//===========================================================================

15
Marlin/Marlin_main.cpp
View File

@ -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
#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
#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
}
#endif
}

4
Marlin/SanityCheck.h
View File

@ -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)

4
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/Felix/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/K8200/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/K8400/Configuration.h
View File

@ -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 ================================
//===========================================================================

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

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -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 ================================
//===========================================================================

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

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/makibox/Configuration.h
View File

@ -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 ================================
//===========================================================================

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -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 ================================
//===========================================================================

Write Preview
Loading…
Cancel
Save