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

Arduino IDE - 21283 follow up #21290

Merged
merged 2 commits into from
Mar 9, 2021

Conversation

rhapsodyv
Copy link
Member

Missing ifdef breaks arduino ide ...

@thinkyhead
Copy link
Member

thinkyhead commented Mar 9, 2021

In Marlin we don't wrap .h files like this (because headers are not automatically compiled). Instead we wrap the #include line so the header is only included where necessary.

@thinkyhead thinkyhead merged commit 787e83a into MarlinFirmware:bugfix-2.0.x Mar 9, 2021
thinkyhead added a commit that referenced this pull request Mar 9, 2021
Followup to #21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
@rhapsodyv
Copy link
Member Author

In Marlin we don't wrap .h files like this (because headers are not automatically compiled). Instead we wrap the #include line so the header is only included where necessary.

I confess that I never noted about headers... because normally they are harmless...
But if we will use more and more advanced c++ templates, we will need to handle headers more like CPP files... So I think we will end up wrapping headers too... Just thinking loud...

vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
Followup to MarlinFirmware#21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
vyacheslav-shubin pushed a commit to vyacheslav-shubin/Marlin that referenced this pull request Mar 10, 2021
Followup to MarlinFirmware#21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
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
chrisjenda pushed a commit to chrisjenda/Marlin that referenced this pull request Apr 3, 2021
Followup to MarlinFirmware#21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
W4tel-BiDi pushed a commit to W4tel-BiDi/Marlin that referenced this pull request Apr 5, 2021
Followup to MarlinFirmware#21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
thinkyhead added a commit that referenced this pull request Apr 30, 2021
Followup to #21283

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
@rhapsodyv rhapsodyv deleted the 21283-followup branch May 30, 2021 22:55
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