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

DWIN support for platforms other than STM32F1 #20738

Merged
merged 3 commits into from
Jan 13, 2021

Conversation

jvandervyver
Copy link
Contributor

@jvandervyver jvandervyver commented Jan 10, 2021

Requirements

None, this change should be fully backward compatible with existing working implementations

Description

I have a Ender 3 V2 and SKR1.4 Turbo. I was able to get it working, but I'm hoping I won't need to repeatedly merge my changes back in.

If my changes are not according to standards, give me code review feedback and I can make the changes required :)

Benefits

  • Allows using LCD_SERIAL_PORT for Creality DWIN display
  • Creality DWIN screen jumps from some screens to other without reason. For example, setting the hotend temperature would jump inadvertently to the Print options screen. To resolve this, I fixed the warnings, namely that an unsigned was being compared to a signed value (ie. char). That was probably what caused this issue. However I also replaced auto because it doesn't appear to conform to the Do use modern C++11 features

Configurations

I used the standard Ender 3 v2 configuration. Additionally I made the following change to pins_BTT_SKR_V1_4.h:

#if ENABLED(DWIN_CREALITY_LCD)
  // RET6 DWIN ENCODER LCD
  #define BTN_ENC                           P1_20
  #define BTN_EN1                           P1_23
  #define BTN_EN2                           P1_22

  #ifndef BEEPER_PIN
    #define BEEPER_PIN                      P1_21
    #undef SPEAKER
  #endif
#endif

Related Issues

Not fully aware of another issue

@thinkyhead thinkyhead merged commit 7f3dcb3 into MarlinFirmware:bugfix-2.0.x Jan 13, 2021
susisstrolch pushed a commit to susisstrolch/Marlin that referenced this pull request Feb 16, 2021
… into bugfix-2.0.x

* 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin: (29 commits)
  More MKS UI prelim. cleanup
  MKS WiFi for TFT_LVGL_UI (MarlinFirmware#20191)
  [cron] Bump distribution date (2021-01-14)
  Ignore M22 during SD print
  Move WRITE_FAN
  whitespace
  MKS UI prelim. cleanup (MarlinFirmware#20763)
  Rotary encoder cleanup (MarlinFirmware#20753)
  Fix comments (MarlinFirmware#20759)
  [cron] Bump distribution date (2021-01-13)
  Ok to use C++11 'auto'
  Multi-platform DWIN_CREALITY_LCD support (MarlinFirmware#20738)
  [cron] Bump distribution date (2021-01-12)
  Fix TMC220x short circuit (MarlinFirmware#20731)
  Fixes for TFTGLCD (MarlinFirmware#20734)
  NO_SD_DETECT option (MarlinFirmware#20741)
  Fix joystick include
  Tweak STM32F1 pin r/w/t
  Clean up some includes
  Update Slovak glyphs
  ...
kpishere pushed a commit to kpishere/Marlin that referenced this pull request Feb 19, 2021
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
zillarob pushed a commit to zillarob/Marlin that referenced this pull request Feb 25, 2021
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
W4tel-BiDi pushed a commit to W4tel-BiDi/Marlin that referenced this pull request Apr 5, 2021
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Apr 29, 2021
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead added a commit that referenced this pull request Apr 30, 2021
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
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