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

Removes the DISABLE from HOST_KEEPALIVE #3720

Merged
merged 2 commits into from
May 14, 2016

Conversation

jbrazio
Copy link
Contributor

@jbrazio jbrazio commented May 10, 2016

In order to harmonize HOST_KEEPALIVE with most of the other Configuration.h directives, DISABLE_HOST_KEEPALIVE was renamed to HOST_KEEPALIVE_FEATURE and it's now active by default on all configuration files.

No behavior change, just less twisting user's mind.

@jbrazio jbrazio added this to the 1.1.0 milestone May 10, 2016
@thinkyhead
Copy link
Member

I think you meant "and it's now active by default…."

@thinkyhead
Copy link
Member

thinkyhead commented May 10, 2016

HOST_KEEPALIVE_INTERVAL should probably retain the DEFAULT_ prefix. We name options with a DEFAULT_ prefix when they can be changed by the user during runtime, thus indicating that this is not THE host keepalive interval, just the default that your board will reset to with M502.

@jbrazio
Copy link
Contributor Author

jbrazio commented May 10, 2016

Ok makes sense, will fix it as soon as I stop commuting and get a wifi connection.

@Blue-Marlin
Copy link
Contributor

As far i remember we wanted to avoid

#define

as a default in the configurations and want to use

//#define

instead where ever possible.

Did that change?

@jbrazio
Copy link
Contributor Author

jbrazio commented May 10, 2016

@Blue-Marlin Why ? Does it make sense to complicate something by enabling the negative option to disable the option ? We're talking about pre-processor stuff it will not take more or less bytes on the binary file.

@Blue-Marlin
Copy link
Contributor

Blue-Marlin commented May 10, 2016

If there is still the idea around to have a user-pre- or post-configuration, what is basically a diff to the standard-configuration, every defined-by-default item needs a special handling. Ether a #ifndef #define #endif sequence in the main-config, or a #undefine #define in a post-config. The most elegant solution is to have no, or at least as few as possible, active defines in the main-config.

Is this still a design target?

@jbrazio
Copy link
Contributor Author

jbrazio commented May 11, 2016

My answer is "meh".. the over engineered config handler we have on MarlinDev is dead, this seems to be settled upon. But I never saw any discussion discarding [or approving] pre/post config files.

@jbrazio jbrazio force-pushed the feature/host-keepalive branch from c8ec6d3 to 85b2c80 Compare May 11, 2016 00:46
@jbrazio
Copy link
Contributor Author

jbrazio commented May 11, 2016

@thinkyhead rebased.

#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
#endif
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
Copy link
Member

@thinkyhead thinkyhead May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always group sub-options with the main option that they depend on. Because my configurator tool picks up on this and uses it to "grey out" the option until the main option is enabled.

#if ENABLED(HOST_KEEPALIVE_FEATURE)
  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
#endif

@thinkyhead thinkyhead merged commit f13c4a9 into MarlinFirmware:RCBugFix May 14, 2016
@jbrazio jbrazio deleted the feature/host-keepalive branch May 15, 2016 01:34
@ghost ghost mentioned this pull request May 15, 2016
thinkyhead added a commit that referenced this pull request May 15, 2016
nomukaiki pushed a commit to nomukaiki/Marlin that referenced this pull request May 19, 2016
* RCBugFix: (64 commits)
  Automatically set X2 stepper pins
  Add Travis test for DUAL_X_CARRIAGE
  Implements S1 argument in M999
  Improve DUAL_X_CARRIAGE sanity check errors
  Declare extruder_duplication_enabled in Marlin.h
  Update Japanese trasration
  Function decl. in headers don't need "extern"
  Bezier style and DELTA patch
  XYZ unhomed
  Require homing of Z before G29
  Minor DELTA segmentation speedup
  G29: Report final position back to host when using MBL
  Add stowing process for MECHANICAL_PROBE
  Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
  Fix checkExtruderAutoFans
  Bugfix: iteration invokes undefined behavior
  Fix MBL zigzag calls
  Follow-up the PR MarlinFirmware#3720 and MarlinFirmware#3759
  Remove the hotbed icon when HAS_TEMP_BED is false
  Prevent watchdog timeout in bezier moves
  ...

# Conflicts:
#	Marlin/pins_RAMPS_14.h
@thinkyhead thinkyhead mentioned this pull request Jul 8, 2016
CONSULitAS pushed a commit to CONSULitAS/Marlin-K8200 that referenced this pull request Aug 18, 2016
Update forgotten Configuration_DUAL.h
drewmoseley pushed a commit to drewmoseley/Marlin that referenced this pull request Nov 8, 2023
…odel_menu

MK3_3.12: Add Menu Calibration -> Temp Model cal.
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