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

fix PIN_EXISTS calls in PR 18389 #21284

Merged

Conversation

ellensp
Copy link
Contributor

@ellensp ellensp commented Mar 8, 2021

Description

PIN_EXISTS macro appends "_PIN" automatically
In the current Configuration_adv.h that is with bugfix the following are incorrect

#if PIN_EXISTS(BUTTON1_PIN)
#if PIN_EXISTS(BUTTON2_PIN)
#if PIN_EXISTS(BUTTON3_PIN)

Should be

#if PIN_EXISTS(BUTTON1)
#if PIN_EXISTS(BUTTON2)
#if PIN_EXISTS(BUTTON3)

Requirements

Current bugfix Configuration_adv.h file

Benefits

Works as expected

Related Issues

See comments at end of #18389

@thinkyhead thinkyhead merged commit aad0f51 into MarlinFirmware:bugfix-2.0.x Mar 8, 2021
@ellensp ellensp deleted the bugfix-2.0.x-#fix_PR18389 branch March 8, 2021 10:16
vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
TyMi pushed a commit to TyMi/Marlin that referenced this pull request Mar 11, 2021
* bugfix-2.0.x: (248 commits)
  [cron] Bump distribution date (2021-03-11)
  Fix password menu stickiness before first auth (MarlinFirmware#21295)
  Lerdge-K TMC 2208/9 UART pins (MarlinFirmware#21299)
  Fix LERDGE 'extends' env references (MarlinFirmware#21305)
  Fix TouchMI stow in G34 (MarlinFirmware#21291)
  Fix MeatPack with per-serial-port instances (MarlinFirmware#21306)
  Tricked-out declaration
  Update MEATPACK test
  Number serial from 1 to match settings
  Clean up spaces and words
  Fix serial index types
  Add binary file transfer test
  fix meat pack internal buffer for multi serial
  [cron] Bump distribution date (2021-03-10)
  Fix LPC + TMC boot loop (MarlinFirmware#21298)
  Distinguish serial index from mask (MarlinFirmware#21287)
  Host Keepalive followup (MarlinFirmware#21290)
  [cron] Bump distribution date (2021-03-09)
  CUSTOM_USER_BUTTONS followup (MarlinFirmware#21284)
  Fix Host Keepalive serial target (MarlinFirmware#21283)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
W4tel-BiDi pushed a commit to W4tel-BiDi/Marlin that referenced this pull request Apr 5, 2021
thinkyhead pushed a commit that referenced this pull request Apr 30, 2021
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.

2 participants