Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF #7000

Merged
merged 2 commits into from
Jun 12, 2017

Conversation

tcm0116
Copy link
Contributor

@tcm0116 tcm0116 commented Jun 9, 2017

Per #6910, this removes the ADVANCED_PAUSE_FEATURE for PROBING_HEATERS_OFF by enabling the shared features in temperature.h and temperature.cpp if either is enabled.

An alternate option would be to remove the preprocessor conditionals around these shared items and leave them in all the time. That should certainly be considered if more features wish to use the heater idle capability of the Temperature class.

@thinkyhead
Copy link
Member

thinkyhead commented Jun 12, 2017

A good solution. Normally, when two or more options combine into something that is used several times, we'll add something to Conditionals_post.h that captures the essence of the combination. For this one…

#define HAS_HEATER_IDLING (ENABLED(ADVANCED_PAUSE_FEATURE) || ENABLED(PROBING_HEATERS_OFF))

…or… if that's a terrible name, please suggest a better one.

This makes it possible to give new features heater idling if they need it by only changing one line.

@tcm0116
Copy link
Contributor Author

tcm0116 commented Jun 12, 2017

add something to Conditionals_post.h

Done.

@thinkyhead thinkyhead merged commit e470291 into MarlinFirmware:bugfix-1.1.x Jun 12, 2017
kcergfalo added a commit to kcergfalo/Marlin that referenced this pull request Jun 14, 2017
* commit '26d20ebcfc4c525b7fe15939b89eedc09eacdb47': (282 commits)
  Don't allow filament change without homing first (MarlinFirmware#7054)
  LCD Panel Interactive Mesh Editing (MarlinFirmware#7045)
  G33 eccentric probe fixes (MarlinFirmware#6850)
  Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF (MarlinFirmware#7000)
  CL-260 configs
  Create language_it.h
  fix pinsDebug.h error, add capability to display more than 70 pins.
  Circular scrolling of the status message
  Reduce size of heater state print code
  Fix extrude_min_temp compiler warning
  Tweak some else clauses
  Followup to German language update
  Create language_it.h
  Fix get/setDrvPct declarations
  update language_de.h
  Save 8 bytes of SRAM
  Unify AVR90USB: pinsDebug changes
  Unify AVR90USB: Pins cleanup
  Unify AVR90USB: Pins remap to Arduino
  Unify AVR90USB: fastio changes
  ...

# Conflicts:
#	Marlin/Conditionals_post.h
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	Marlin/G26_Mesh_Validation_Tool.cpp
#	Marlin/Marlin_main.cpp
#	Marlin/Version.h
#	Marlin/configuration_store.cpp
#	Marlin/example_configurations/Cartesio/Configuration.h
#	Marlin/example_configurations/Felix/Configuration.h
#	Marlin/example_configurations/Felix/DUAL/Configuration.h
#	Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h
#	Marlin/example_configurations/Hephestos/Configuration.h
#	Marlin/example_configurations/Hephestos_2/Configuration.h
#	Marlin/example_configurations/K8200/Configuration.h
#	Marlin/example_configurations/K8400/Configuration.h
#	Marlin/example_configurations/K8400/Dual-head/Configuration.h
#	Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
#	Marlin/example_configurations/RigidBot/Configuration.h
#	Marlin/example_configurations/SCARA/Configuration.h
#	Marlin/example_configurations/TAZ4/Configuration.h
#	Marlin/example_configurations/TinyBoy2/Configuration.h
#	Marlin/example_configurations/WITBOX/Configuration.h
#	Marlin/example_configurations/adafruit/ST7565/Configuration.h
#	Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
#	Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
#	Marlin/example_configurations/delta/generic/Configuration.h
#	Marlin/example_configurations/delta/kossel_mini/Configuration.h
#	Marlin/example_configurations/delta/kossel_pro/Configuration.h
#	Marlin/example_configurations/delta/kossel_xl/Configuration.h
#	Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
#	Marlin/example_configurations/makibox/Configuration.h
#	Marlin/example_configurations/tvrrug/Round2/Configuration.h
#	Marlin/example_configurations/wt150/Configuration.h
#	Marlin/least_squares_fit.cpp
#	Marlin/temperature.cpp
#	Marlin/temperature.h
#	Marlin/ubl.cpp
#	Marlin/ubl_G29.cpp
#	Marlin/ubl_motion.cpp
#	README.md
#	buildroot/share/git/mfpub
fixoid pushed a commit to fixoid/Marlin that referenced this pull request Jun 18, 2017
…rlinFirmware#7000)

* Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF

* Add HEATER_IDLE_HANDLER conditional
@tcm0116 tcm0116 deleted the probe_heaters branch September 24, 2017 01:20
damicreabox pushed a commit to damicreabox/Marlin that referenced this pull request Sep 14, 2018
…rlinFirmware#7000)

* Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF

* Add HEATER_IDLE_HANDLER conditional
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants