Skip to content

Updating DWIN menus to Marlin language_xx.h strings using GET_TEXT_F #19053

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

Merged
merged 7 commits into from
Aug 22, 2020
Merged

Updating DWIN menus to Marlin language_xx.h strings using GET_TEXT_F #19053

merged 7 commits into from
Aug 22, 2020

Conversation

CRCinAU
Copy link
Contributor

@CRCinAU CRCinAU commented Aug 17, 2020

This is a first-run at converting a menu within the DWIN system to use strings instead of copying parts of a JPG file between areas of the screen.

This allows us to start using the marlin language_XX.h files to localise menu items.

While this can be merged, I'm submitting for feedback as if this is the preferable way to do this before I take on more of the menus.

Feedback is welcome.

@CRCinAU
Copy link
Contributor Author

CRCinAU commented Aug 19, 2020

This is probably as complete as I can go right now without doing full structural changes to menus that seem to be unnecessarily complex.

ie the Prepare menu. That will be much more invasive than these.

@CRCinAU CRCinAU changed the title RFC for updating menus to Marlin language_xx.h strings Updating DWIN menus to Marlin language_xx.h strings using GET_TEXT_F Aug 19, 2020
@thinkyhead
Copy link
Member

The screens in dwin.cpp do need to be maintained because we don't have a viable way to get Chinese on this display using the current methodology, and it matches the branded interface of the Ender-3 V2.

However, the next effort for this display is to implement all the necessary MarlinUI methods so it can display the full menu tree, edit screens, and the rest.

There are some extra challenges because this display is persistent and can scroll its contents and do other tricks, so the typical screen update loop probably won't be applicable. But a crude "erase-and-redraw-everything" method could be developed pretty rapidly at first and then the screen update methods can be optimized from there.

I'm going to work on a first implementation of MarlinUI for this display over the weekend and should soon have something semi-working.

@thinkyhead thinkyhead merged commit 563eda4 into MarlinFirmware:bugfix-2.0.x Aug 22, 2020
susisstrolch pushed a commit to susisstrolch/Marlin that referenced this pull request Aug 24, 2020
… into bugfix-2.0.x

* 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin: (33 commits)
  Minor cleanup w/r/t LEDs
  TFT32 for MKS Robin Nano 1.2 (MarlinFirmware#19031)
  [cron] Bump distribution date (2020-08-24)
  Feedrate comment (MarlinFirmware#19116)
  Neopixel => NeoPixel
  Fix up conditions, comments
  Fix DUET_SMART_EFFECTOR
  Consistent static/value item macros
  [cron] Bump distribution date (2020-08-23)
  Fix probing margin sanity-check
  PGMSTR constexpr => const
  NOZZLE_CLEAN_NO_Y (MarlinFirmware#18870)
  Change XY_PROBE_SPEED format to (x*60) (MarlinFirmware#18997)
  Reformat pins files
  Permit ST7789V orientation override (MarlinFirmware#19044)
  Prefer Servo AVR timer4 over 3 (MarlinFirmware#19025)
  DIGIPOT_I2C pins for SMOOTHIEBOARD (MarlinFirmware#19098)
  Translatable strings on Ender-3 V2 DWIN (MarlinFirmware#19053)
  HIGH/LOW naming of pin state settings (MarlinFirmware#19089)
  Update copy_marlin_variant_to_framework.py
  ...
albertogg pushed a commit to albertogg/Marlin that referenced this pull request Aug 31, 2020
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Sep 2, 2020
vgadreau pushed a commit to vgadreau/Marlin that referenced this pull request Dec 9, 2020
kageurufu pushed a commit to CR30-Users/Marlin-CR30 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants