Skip to content

fixes issue 20862, missing semicolon #20868

Merged
thinkyhead merged 2 commits intoMarlinFirmware:bugfix-2.0.xfrom
ellensp:bugfix-2.0.x-#20862
Jan 25, 2021
Merged

fixes issue 20862, missing semicolon #20868
thinkyhead merged 2 commits intoMarlinFirmware:bugfix-2.0.xfrom
ellensp:bugfix-2.0.x-#20862

Conversation

@ellensp
Copy link
Contributor

@ellensp ellensp commented Jan 23, 2021

Description

With HAS_SUICIDE true you get a compile error due to a missing ;
Added in the ;

Requirements

Latest Marlin Bugfix
A board with SUICIDE_PIN defined

Benefits

Compiles as expected

Related Issues

Fixes issue #20862

@thinkyhead thinkyhead merged commit 53035de into MarlinFirmware:bugfix-2.0.x Jan 25, 2021
@ellensp ellensp deleted the bugfix-2.0.x-#20862 branch January 25, 2021 07:53
TyMi pushed a commit to TyMi/Marlin that referenced this pull request Jan 25, 2021
…_bugfix

* commit '876c2586b9146dd123af4c7b21138b8239ef5d39': (116 commits)
  Clean up MMU2 code (MarlinFirmware#20794)
  Init KILL, SUICIDE, PSU earlier (MarlinFirmware#20810)
  "Move … code" followup (MarlinFirmware#20869)
  Apply SEC_TO_MS and other fixes
  Reformat abortSDPrinting
  Fix sign warning (MarlinFirmware#20872)
  Cosmetic changes (2) (MarlinFirmware#20876)
  "Move … code" followup (MarlinFirmware#20868)
  "Move … code" followup (MarlinFirmware#20874)
  Graphical TFT fixes, cleanup (MarlinFirmware#20861)
  🧻 Cosmetic changes (MarlinFirmware#20859)
  🛠Fix deps script version regex
  Fix Ender 3 V2 DWIN manual move (MarlinFirmware#20837)
  [cron] Bump distribution date (2021-01-25)
  Fix LiquidCrystal CI failures (MarlinFirmware#20873)
  Revert "Adding custom move feedrate for G26 (MarlinFirmware#20729)" (MarlinFirmware#20870)
  MeatPack serial encoding (MarlinFirmware#20802)
  [cron] Bump distribution date (2021-01-24)
  lcd_put_wchar_max for COLOR_UI (MarlinFirmware#20838)
  Adding custom move feedrate for G26 (MarlinFirmware#20729)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
Jyers pushed a commit to Jyers/Marlin that referenced this pull request Feb 3, 2021
kpishere pushed a commit to kpishere/Marlin that referenced this pull request Feb 19, 2021
zillarob pushed a commit to zillarob/Marlin that referenced this pull request Feb 25, 2021
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.

[BUG] Marlin/src/MarlinCore.cpp:1292:1: error: expected '}' at end of input

3 participants