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.

Sign up for GitHub

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

Jump to bottom

Propose a new syntax to define UI for dgus #18718

Merged
merged 3 commits into from
Jul 21, 2020
Merged

Propose a new syntax to define UI for dgus #18718

merged 3 commits into from
Jul 21, 2020

Conversation

yufanyufan
Copy link
Contributor

@yufanyufan yufanyufan commented Jul 20, 2020 •
edited
Loading

Description

A demonstration of new syntax to easily define UI elements.
If this is accepted, I will change the whole implementation to use new syntax.

Benefits

  1. UI design is based ui_api instead of internal variables.
  2. UI logic is clear to glance, not hiding under Functions.
  3. DGUSScreenHandler can be greatly simplified. it does not rely on switch case to reuse functions.

Related Issues

@thinkyhead
Copy link
Member

thinkyhead commented Jul 20, 2020 •
edited
Loading

The methodology is alright, but it might be good to create some pre-defined getters and setters that are already typed, because it seems like it would get tedious having to specify the <type signatures> on every usage.

@yufanyufan yufanyufan changed the title Propose a new syntax to define UI for dbus Propose a new syntax to define UI for dgus Jul 20, 2020
@yufanyufan
Copy link
Contributor Author

Add syntax sugar, PTAL

VPHELPER(VP_T_E0_Set, nullptr, GET_VARIABLE(setTargetTemp_celsius, E0), SET_VARIABLE(getTargetTemp_celsius, E0))

@thinkyhead
Copy link
Member

Hey, why not? Looks much prettier!

@thinkyhead thinkyhead merged commit 469f63f into MarlinFirmware:bugfix-2.0.x Jul 21, 2020
dotdash32 added a commit to dotdash32/Marlin that referenced this pull request Aug 26, 2020
@dotdash32 @thinkyhead
@GMagician @thisiskeithb @JohnnyTheOne @lucasoshiro @sjasonsmith @InsanityAutomation @jpflouret @Fabi0San @Serhiy-K @ellensp @GerogeFu @robbycandra @rhapsodyv @cbteeple @notabucketofspam @jan-gerard @oliver-eifler @ManuelMcLure @GhostlyCrowd @longlh @xC0000005 @shuttercat @espr14 @ccccmagicboy @mrseeker @chepo92 @Speaka @p3p @Lord-Quake @Evg33 @Sergey1560 @hub-jba @mtowara @yufanyufan @TheNitek @pmjdebruijn @marknn3 @ivankravets @Diegovd @fleek @MKS-Sean @giryan @Palatis @MoellerDi @natemason @swissnorp @andrivet @FLYmaker @cbaugher @rmoravcik @jufimu12
Updating personal fork for 2.0.6 release. (#4)
e5efb7a 
* Fix material preset type

* Fix material preset editing

* NO_LCD_REINIT for FSMC (or, no SD_DETECT_PIN)

* Clean up preheat edit items

* [cron] Bump distribution date (2020-06-26)

* Minor LCD cleanup, improvement

* Fix typo in DWIN, preheat array

* Update Italian language (MarlinFirmware#18414)

* [samd51] Manifest assigned timers priority (MarlinFirmware#18402)

* Update MKS Robin Nano auto-build env (MarlinFirmware#18417)

* SAMD51 cleanup (MarlinFirmware#18419)

* BTT SKR Pro runout pins (MarlinFirmware#18416)

* Update Brazilian Portuguese language (MarlinFirmware#18411)

* Fix Fan Speed menu items (MarlinFirmware#18400)

* Patch some DGUS warnings

* Allow larger ADC debounce

Reference MarlinFirmware#17205

* [cron] Bump distribution date (2020-06-27)

* [cron] Bump distribution date (2020-06-28)

* Update language fonts

* Tool Change Migration fixes and debugging (MarlinFirmware#18448)

* ExtUI additions (MarlinFirmware#18447)

Co-authored-by: Scott Lahteine <[email protected]>

* Add Romanian language (MarlinFirmware#18455)

Co-authored-by: cristyanul <[email protected]>

* Fix "probing failed" false positives (MarlinFirmware#18435)

* Adjustable delta_diagonal_rod_trim (MarlinFirmware#18423)

* Russian, Ukranian for wide LCD (MarlinFirmware#18433)

* Tweak pins formatting

* Suppress unused var warning

* ClosedLoop as singleton

* [cron] Bump distribution date (2020-06-29)

* MKS Robin Nano flash-based EEPROM (MarlinFirmware#18466)

* Use "reset reason" defines (MarlinFirmware#18462)

* [cron] Bump distribution date (2020-06-30)

* [cron] Bump distribution date (2020-07-01)

* Fix missing parenthesis (MarlinFirmware#18473)

* Fix FYSETC CHEETAH V1.2 SD re-insert (MarlinFirmware#18474)

Include this board with other Cheetah stepper reset.

* Hide menu item with no fan (MarlinFirmware#18470)

* Permit independent X2,Y2,Z2,Z3,Z4 endstop inverting (MarlinFirmware#18481)

* Add TFT_LVGL_UI support (MarlinFirmware#18438)

* Per-Hotend Default PIDs (MarlinFirmware#18483)

* Enforce sensor range for temperature target (MarlinFirmware#18465)

* Mitigate stepper timeout

* Add CHAMBER PWM code

* Structured thermistor tables

* Fix reversed sensor ranges

* Prevent temps outside sensor range

* [cron] Bump distribution date (2020-07-02)

* Tweak stepper shutdown test

* Extend thermistor 1047 to 500°C

* Updated lock / unlock actions

* [cron] Bump distribution date (2020-07-03)

* Keep filament runout pin for Creality Melzi (MarlinFirmware#18504)

* Add FYSETC 2.42 inch OLED support (MarlinFirmware#18485)

* Option to set manual Babystepping distance in mm (MarlinFirmware#18503)

Co-authored-by: Scott Lahteine <[email protected]>

* Clean up LCD Manual Move / UBL Mesh Edit (MarlinFirmware#18373)

* FYSETC OLED followup (MarlinFirmware#18519)

* Ensure Git applies Unix line-endings in tests (MarlinFirmware#18495)

* Fix axis name in serial output (MarlinFirmware#18522)

* Fix env:mks_robin_nano35 (MarlinFirmware#18516)

* FIx Sanguino/1284p board_upload.maximum_size (MarlinFirmware#18502)

* M150 I to set Neopixel by index (MarlinFirmware#18490)

* [cron] Bump distribution date (2020-07-04)

* PID Accelerated Edit (MarlinFirmware#18532)

* Patch Bad PR action

* Two lock-closed per day

* [cron] Bump distribution date (2020-07-05)

* Fix "'ubl' not declared" error (MarlinFirmware#18541)

* Fix thermistors exist-for-reading tests (MarlinFirmware#18533)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix "Probing mesh point" message

Closes MarlinFirmware#17770

Co-Authored-By: Jan-Gerard van der Toorn <[email protected]>

* Limit actions to main

* Probing points followup (MarlinFirmware#18552)

* Update actions on bugfix branch

* Add CI for pushed commits

Co-Authored-By: thisiskeithb <[email protected]>

* Add CI for pushed commits (MarlinFirmware#18549)

* Fix Neopixel set_color (MarlinFirmware#18544)

* Fix stall sensitivity adjustment for FTDI screens (MarlinFirmware#18554)

* Minor pins cleanup

* Add comment to M412

* Reduce string duplication

* STM32: No compile-time check for PWM_PIN (MarlinFirmware#18539)

Co-authored-by: Scott Lahteine <[email protected]>

* Filament Runout Inverting => State (MarlinFirmware#18537)

Co-authored-by: Scott Lahteine <[email protected]>

* Simplify home_z_safely, respect HOME_AFTER_DEACTIVATE

* [cron] Bump distribution date (2020-07-06)

* Temporarily use patched lock-threads

* Filament state followup

* Get SAMD51 CXX flags from script

* Use Material Preset 1 for PID autotune (MarlinFirmware#18446)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix broken POWER_LOSS_RECOVERY prompt (MarlinFirmware#18557)

Co-authored-by: Scott Lahteine <[email protected]>

* Add Lerdge S,X,K (MarlinFirmware#18302)

* Fix TMC homing phase coils alignment (MarlinFirmware#18528)

Co-authored-by: Fabio Santos <[email protected]>

* Scale runout distance setting for editable range (MarlinFirmware#18567)

* 0.7.1 <= TMCStepper <= 0.7.9 (MarlinFirmware#18564)

* Reduce 'first loop' temperature residency time (MarlinFirmware#18421)

Co-authored-by: Scott Lahteine <[email protected]>

* Update and fix POWER_MONITOR (MarlinFirmware#18561)

* [cron] Bump distribution date (2020-07-07)

* Temp Residency followup

* Whitespace cleanup

* Combine command macros

* Fix typo in Configuration_adv.h (MarlinFirmware#18570)

* [cron] Bump distribution date (2020-07-08)

* Tweak PLR debug

* Fix warning with PIO

* SKR 1.4 alert for unsupported LCD

* Update Chinese (zh_CN) language (MarlinFirmware#18580)

* Lock threads updated

* Show fixed V in Power Display with no V sensor (MarlinFirmware#18579)

* Fix User Temp Sensor (1000), reversed Pt100 / Pt1000 (MarlinFirmware#18590)

* Fix some comments

* Add `Cap:RUNOUT`

Co-Authored-By: Julius ter Pelkwijk <[email protected]>

* [cron] Bump distribution date (2020-07-09)

* Fix missing controller fan include

* 2.0.5.4 : Use ststm32 < 6.2

* Consolidate probe clearance, add section debug (MarlinFirmware#18576)

* Better section / function log
* Add do_z_clearance motion function

* Remove outdated comment (MarlinFirmware#18597)

* Clean up some MMU comments

* MarlinUI support for up to 5 Material Presets (MarlinFirmware#18488)

- Add `I` preset parameter to `G26`, `M106`, `M140`, and `M190`.
- Extend menu items to permit a string interpolation.
- Keep material names in a list and interpolate in menu items.
- Extend material presets to support up to 5 predefined materials.

Co-authored-by: Scott Lahteine <[email protected]>

* "M122 I" to reinitialize TMC (MarlinFirmware#18571)

* [cron] Bump distribution date (2020-07-10)

* Add current offset for POWER_MONITOR sensor (MarlinFirmware#18600)

* Fix CMSIS / USB-FD regression (MarlinFirmware#18602)

* Fix Chitu V6 with LVGL UI (MarlinFirmware#18608)

* Fix CHITU_F103 pio.board name (MarlinFirmware#18486)

* Capitalize "G-code"

* [cron] Bump distribution date (2020-07-11)

* Option to assist thermocouple debug (MarlinFirmware#18621)

* Fix pid_debug_flag

* Specify supported library versions

* [cron] Bump distribution date (2020-07-12)

* Clarify MICROSTEP_MODES

* Option for extra endstop check (MarlinFirmware#18424)

* Fix G35 output formatting (MarlinFirmware#18631)

* [cron] Bump distribution date (2020-07-13)

* [email protected] for LPC

* Creality V4 cleanup

* [cron] Bump distribution date (2020-07-14)

* Fix / improve menu items (MarlinFirmware#18644)

* LPC fix NeoPixel fork

* Fix leveling "Point n of 3" message (MarlinFirmware#18639)

* Increase STM32F1 Servo Timer Interrupt Priority (MarlinFirmware#18637)

* [cron] Bump distribution date (2020-07-15)

* Specify ststm32 @ 6.1.x

* Tool-change debug option

* Add REPORT_FAN_CHANGE as an option

* Clean up DWIN code

* General cleanup

* Fix some Power Loss Recovery behaviors (MarlinFirmware#18558)

* PLR followup

* Fix Hotend Idle Timeout trigger (MarlinFirmware#18657)

* [cron] Bump distribution date (2020-07-16)

* Fix SKR 1.4 LCD / ADC Keypad sanity-check (MarlinFirmware#18670)

* Broadcast host actions

Fixes MarlinFirmware#18565

* Sanity-check BABYSTEP_MULTIPLICATOR_*

* [cron] Bump distribution date (2020-07-17)

* Fix material_preset reference issue

* Chopper Timing Preset for 24V 0.9° (MarlinFirmware#18662)

* Fix passive Chamber Temp reading (MarlinFirmware#18674)

* Fix check_hotends with > 1 hotend

* Tweak and use SD_ORDER

* ExtUI for Anycubic I3 Mega (MarlinFirmware#18655)

* Support FT81050 with FYSETC F6 (MarlinFirmware#18678)

Co-authored-by: Scott Lahteine <[email protected]>

* Smaller SD EEPROM file on Ender 3 V2

* Use safe_delay for PSU_POWERUP_DELAY (MarlinFirmware#18680)

Co-authored-by: Scott Lahteine <[email protected]>

* Fix E3V2 M0/M1 and wait_for_user

* [cron] Bump distribution date (2020-07-18)

* Chitu V6 - Stepper Z2 pins (MarlinFirmware#18683)

* Fix DGUS write variable endianness (MarlinFirmware#18689)

* Trigorilla Pro board (MarlinFirmware#18692)

* Prettier BLTouch menu items (MarlinFirmware#18682)

* Return to Status on PID Autotune (MarlinFirmware#18695)

* Misc formatting, cleanup

* [cron] Bump distribution date (2020-07-19)

* More customizable DGUSDisplay (MarlinFirmware#18700)

* Fix encoder reverse, partial steps handling (MarlinFirmware#18694)

* Update Chinese (cn) language (MarlinFirmware#18705)

* Fix endian DGUS WriteVariable (MarlinFirmware#18703)

* Fix BLTouch PWM reliability in HAL/STM32 (MarlinFirmware#18702)

* [cron] Bump distribution date (2020-07-20)

* SAMD51: More reliable Servo/BLTouch PWM (MarlinFirmware#18710)

* Only download & compile required libraries (MarlinFirmware#18699)

* Reduce Step Smoothing ceiling to 50% CPU usage (MarlinFirmware#18719)

* Fix some LVGL warnings

* Patch auto-deps for Windows CXX (MarlinFirmware#18721)

* [cron] Bump distribution date (2020-07-21)

* Matching mat.bed_temp condition

* Ignore unused (but downloaded) libraries (MarlinFirmware#18728)

* Use development version of PlatformIO (MarlinFirmware#18724)

* Fix build for Windows path edge case

* Filter some unused Marlin/src subfolders (MarlinFirmware#18729)

* New DGUS UI var / definition syntax (MarlinFirmware#18718)

* Optimize LCD, Wifi, etc. libraries (MarlinFirmware#18730)

* Fix inline AnycubicSerial method

* Anycubic followup

* [cron] Bump distribution date (2020-07-22)

* Fix Spanish preheat strings (MarlinFirmware#18743)

* Explicit SdFat

* Custom Nozzle Wipe (MarlinFirmware#18736)

* [cron] Bump distribution date (2020-07-23)

* Linear Advance: Only change E DIR when needed (MarlinFirmware#18744)

* Fix links to secure sites (MarlinFirmware#18745)

* Fast Filament Change temperature check (MarlinFirmware#18738)

* General cleanup

* [cron] Bump distribution date (2020-07-24)

* Update FYSETC AIO II TMC UART pins (MarlinFirmware#18749)

* Update links, README, contributing, etc.

* Update links, README, contributing, etc.

* ibid.

* Add CONTROLLER_FAN_IGNORE_Z (MarlinFirmware#18735)

* Simplify encoder handling (MarlinFirmware#18754)

* Fix ESP3D_WIFISUPPORT ini typo

* Apply lib_ignore from [features] (MarlinFirmware#18762)

* Ender 3 V2 BL24C16 EEPROM support (MarlinFirmware#18758)

* Filament Runout pin for Creality v4.2.2 board (MarlinFirmware#18763)

* [cron] Bump distribution date (2020-07-25)

* Ender 3 V2: Inject 'G28 O' before G29 (MarlinFirmware#18767)

* Fix Lerdge variant script (MarlinFirmware#18771)

* G425/G35 menu items; G425 pre- and post- scripts (MarlinFirmware#18737)

* Robin nano V2, TFT LVGL UI parameters, and more (MarlinFirmware#18500)

* Clean up after changes

* Update (c)

* Fix ui.external_control compile error (MarlinFirmware#18778)

* [cron] Bump distribution date (2020-07-26)

* Fix search for best compiler (MarlinFirmware#18779)

* Close host's Filament Change dialog (MarlinFirmware#18785)

* More folders only compiled when their feature is Enabled (MarlinFirmware#18780)

Co-authored-by: Scott Lahteine <[email protected]>

* Randomize firmware.bin, fix unflag

* Fix MKS Robin Nano V2 build / upload (MarlinFirmware#18784)

* Fix compile-time PWM_PIN (MarlinFirmware#18793)

Co-authored-by: Scott Lahteine <[email protected]>

* Prevent ESP3D_WIFISUPPORT with non-ESP32 board (MarlinFirmware#18792)

* Add 0 to EXTRUDERS :[json] (MarlinFirmware#18786)

* [cron] Bump distribution date (2020-07-27)

* Config for Anycubic Mega TFT

* Marlin Release 2.0.6

* [cron] Bump distribution date (2020-07-28)

* Fix WiFi / ESP32 sanity check (MarlinFirmware#18808)

* Fix garbled print_xyz output (MarlinFirmware#18810)

* Fix DELTA + TMC sensorless homing + SPI endstops (MarlinFirmware#18811)

* DISABLE_DEBUG required to free Robin nano Z_DIR_PIN (MarlinFirmware#18832)

* Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS (MarlinFirmware#18824)

* Add TEMP_PROBE_PIN for Einsy Rambo (MarlinFirmware#18823)

* Fix Cancel Objects index display (zero-based) (MarlinFirmware#18841)

* Fix UNKNOWN_Z_NO_RAISE in G28

Bug introduced in 73fc077

* In G28 Z is sort-of known

* Update include_tree

* Add monitor_flags

* Fix Duplicator i3 Plus pin diagram (MarlinFirmware#18862)

* Fix FLYF407ZG pins (MarlinFirmware#18865)

* Fix Spindle/Laser PWM DC (MarlinFirmware#18871)

* No mks_robin extra_scripts in Trigorilla build (MarlinFirmware#18872)

* Fix Z height after tool change (MarlinFirmware#18951)

* Move Cancel Object menu, fix canceled item index (MarlinFirmware#18930)

* Update Italian language (MarlinFirmware#18886)

* Update Slovak language (MarlinFirmware#18884)

* HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (MarlinFirmware#18947)

* Fix IS_PROBE_PIN macro (MarlinFirmware#19024)

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: thinkyhead <[email protected]>
Co-authored-by: Giuliano Zaro <[email protected]>
Co-authored-by: Keith Bennett <[email protected]>
Co-authored-by: Johnny Eshak <[email protected]>
Co-authored-by: Lucas Seiki Oshiro <[email protected]>
Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: InsanityAutomation <[email protected]>
Co-authored-by: cristyanul <[email protected]>
Co-authored-by: JP Flouret <[email protected]>
Co-authored-by: Fabio Santos <[email protected]>
Co-authored-by: Serhiy-K <[email protected]>
Co-authored-by: ellensp <[email protected]>
Co-authored-by: George Fu <[email protected]>
Co-authored-by: Robby Candra <[email protected]>
Co-authored-by: Victor Oliveira <[email protected]>
Co-authored-by: cbteeple <[email protected]>
Co-authored-by: notabucketofspam <[email protected]>
Co-authored-by: Jan-Gerard van der Toorn <[email protected]>
Co-authored-by: Oliver Jean Eifler <[email protected]>
Co-authored-by: ManuelMcLure <[email protected]>
Co-authored-by: GhostlyCrowd <[email protected]>
Co-authored-by: Luc Hoang Long <[email protected]>
Co-authored-by: J.C. Nelson <[email protected]>
Co-authored-by: shuttercat <[email protected]>
Co-authored-by: espr14 <[email protected]>
Co-authored-by: cccc <[email protected]>
Co-authored-by: Julius ter Pelkwijk <[email protected]>
Co-authored-by: Axel <[email protected]>
Co-authored-by: Speaka <[email protected]>
Co-authored-by: Chris Pepper <[email protected]>
Co-authored-by: Leo <[email protected]>
Co-authored-by: Evgeny Z <[email protected]>
Co-authored-by: Sergey1560 <[email protected]>
Co-authored-by: JBA <[email protected]>
Co-authored-by: Markus Towara <[email protected]>
Co-authored-by: yufanyufan <[email protected]>
Co-authored-by: Claus Näveke <[email protected]>
Co-authored-by: cr20-123 <[email protected]>
Co-authored-by: Pascal de Bruijn <[email protected]>
Co-authored-by: Mark Langezaal <[email protected]>
Co-authored-by: Ivan Kravets <[email protected]>
Co-authored-by: Diego von Deschwanden <[email protected]>
Co-authored-by: fleek <[email protected]>
Co-authored-by: MKS-Sean <[email protected]>
Co-authored-by: giryan <[email protected]>
Co-authored-by: Victor Tseng <[email protected]>
Co-authored-by: MoellerDi <[email protected]>
Co-authored-by: natemason <[email protected]>
Co-authored-by: swissnorp <[email protected]>
Co-authored-by: Sebastien Andrivet <[email protected]>
Co-authored-by: FLYmaker <[email protected]>
Co-authored-by: Claus Näveke <[email protected]>
Co-authored-by: cbaugher <[email protected]>
Co-authored-by: Roman Moravčík <[email protected]>
Co-authored-by: Julius Mumme <[email protected]>
albertogg pushed a commit to albertogg/Marlin that referenced this pull request Aug 31, 2020
@yufanyufan @albertogg
New DGUS UI var / definition syntax (MarlinFirmware#18718)
01b0c57
vgadreau pushed a commit to vgadreau/Marlin that referenced this pull request Dec 9, 2020
@yufanyufan @vgadreau
New DGUS UI var / definition syntax (MarlinFirmware#18718)
263aee4
@ellensp ellensp mentioned this pull request Jul 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C: LCD & Controllers PR: Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yufanyufan @thinkyhead