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

Follow up to "🚸 Update ProUI Plot graph (#26539)" #26563

Merged

Conversation

classicrocker883
Copy link
Contributor

@classicrocker883 classicrocker883 commented Dec 23, 2023

Description

I wanted to make an update following #26539

  • update ProUI for additional ICON_'s for new DWIN_SET
  • update temp popup
  • remove unused,
  • rearrange/change ICON_ names
  • rearrange enum PauseMessage
  • add TJC support

Update

  • update DWIN_ICO.py
  • add extra ICON_'s to buildroot/share/dwin
  • rename DACAI_ICON_Show => dacaiIconShow | ICON_Show => iconShow

I made a fix for this issue "[BUG] Unresponsive display with Hotend/Bed Temp Graph - PROUI_ITEM_PLOT #26630 "

  • Update ID_MPC/PIDProcess with TERN_
  • Fix Plot Temp Graph issue by making it return screen if there is a popup

Benefits

this updates proui/dwin.cpp menu ICON's with more variety.

  • fixes some things that are unused and duplicates
  • tweak it to be arranged better

Configurations

Related Issues

for the added EXTUI, I made some fixes to the errors which popped up.

  • reverted allow_cold_extrude_override in src/module/temperature.cpp (which was removed??)
  • fixed the no such file errors in moved lcd/dogm/u8g/
  • various small tweaks to fix errors/warnings since EXTUI stuff was added.

classicrocker883 and others added 4 commits December 23, 2023 03:23
update temp popup
remove unused,
rearrange/change ICON_ names
rearrange enum PauseMessage
add TJC support
@thinkyhead
Copy link
Member

You'll need to rename Icon number 44 in the various icon packs from ICON_ResumeEEPROM to ICON_ResetEEPROM. I renamed this for clarity since it's being used as a stand-in for a more general "reset" icon.

@thinkyhead
Copy link
Member

For best compatibility with Marlin's DWIN helper scripts, you'll want to organize custom icon packs into "icons-#" sub-folders with the same numbering and organization as the buildroot/share/dwin folder contents.

@thinkyhead
Copy link
Member

What is the procedure to prepare icons 93, 200-206, and 250-254 ? and do these only pertain to TJC? We should add these to buildroot/share/dwin for completeness with our "unified" DWIN set.

@thinkyhead
Copy link
Member

I've updated the contents of the buildroot/share/dwin folder, so it should now have everything needed to generate the numbered ICO files for sets 3, 4, and 7. If there's anything missing from that folder, now would be the best time to add the missing pieces.

@classicrocker883
Copy link
Contributor Author

classicrocker883 commented Dec 24, 2023

You'll need to rename Icon number 44 in the various icon packs from ICON_ResumeEEPROM to ICON_ResetEEPROM.

I suppose you mean within this PR here, Configurations #994?
Redoing each one is tedious just to rename one ICON name. I suppose I could do it, but it really doesn't matter with firmware implementation. I would only be able to do it for any labeled DWIN_SET and not for the other TJC "private" or DACAI.

let me know if you want me to do that. otherwise how it is now since you renamed to ICON_ResetEEPROM will be fine.

edit: I just did a test and whatever name you passthrough into creating the .ICO doesn't actually come back out when you split it. but for posterity I can go ahead rename # 44 of the .jpg itself.

@classicrocker883
Copy link
Contributor Author

What is the procedure to prepare icons 93, 200-206, and 250-254 ? and do these only pertain to TJC? We should add these to buildroot/share/dwin for completeness with our "unified" DWIN set.

*it is actually 249-254

I do not know what others are supported in TJC, same goes for the "private" folder. I guess the same original icons work, but the added ones 93, 200-206, and 249-254 probably do not...

What do you mean by to prepare the icons?

so what I did was take the existing .jpg files, edit them in MS paint, literally pixel by pixel (since it is only 20x20 for the majority of them); remove the "noise" from the background, clean up anything to match the others, fix the loss of quality by the previous editor which happens when saving as .jpg. then I saved it as .png, then used something to convert to .jpg without losing any quality. after going through each one, I followed the instructions how to convert all of them to an .ICO and thats how you get your DWIN_SET.

@classicrocker883
Copy link
Contributor Author

I've updated the contents of the buildroot/share/dwin folder, so it should now have everything needed to generate the numbered ICO files for sets 3, 4, and 7. If there's anything missing from that folder, now would be the best time to add the missing pieces.

I added the icon packs of the other DWIN_SET's as "icons-9". is this what you were looking for?

@thinkyhead
Copy link
Member

thinkyhead commented Dec 24, 2023

I added the icon packs of the other DWIN_SET's as "icons-9". is this what you were looking for?

Not exactly. We're not supporting the original Creality set (icon set 9), only Marlin's (icon sets 3, 4, 7). So I'm just checking to make sure we have all the icons needed for that. It looks like ProUI is now using Icons numbered 93, 200-206, 249-254, so we need the standard icons added to Icon Set 7. I presume that Miguel has already added those icons and created new DWIN_SET / private folders that contain the updated icons for his distribution. We'll need those icons added to our own set 7 in order to support this updated ProUI code.

Note that after we get through this set of changes you should submit any changes we've made to mainline Marlin to the @mriscoc fork so that we are relatively in sync. In the long run it will be better for you to first submit any changes and fixes to that fork, and then we can coordinate with Miguel to bring those changes over en masse to this repo when he reaches a good milestone. The same goes for any other forks that are actively under development.

@thinkyhead thinkyhead merged commit 87e94f4 into MarlinFirmware:bugfix-2.1.x Apr 1, 2024
61 checks passed
@convicte
Copy link

convicte commented Apr 3, 2024

This seems to have had some unintended consequences breaking LCD support for among others Anycubic Viper

Marlin\src\inc\Warnings.cpp:115:6: warning: #warning "Note: Auto-assigned LCD_SERIAL_PORT. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" [-Wcpp]
  115 |     #warning "Note: Auto-assigned LCD_SERIAL_PORT. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
      |      ^~~~~~~
Marlin\src\inc\Warnings.cpp:223:6: warning: #warning "Note: Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" [-Wcpp]
  223 |     #warning "Note: Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
      |      ^~~~~~~
Marlin\src\inc\Warnings.cpp:760:4: warning: #warning "GD32 based controllers may not be fully compatible with STM32 platforms. Please report any issues." [-Wcpp]
  760 |   #warning "GD32 based controllers may not be fully compatible with STM32 platforms. Please report any issues."
      |    ^~~~~~~
c:/users/.platformio/packages/toolchain-gccarmnoneeabi/bin/../lib/gcc/arm-none-eabi/9.2.1/../../../../arm-none-eabi/bin/ld.exe: .pio/build/trigorilla_v006/src/src/gcode/config/M302.cpp.o: in function `GcodeSuite::M302()':
C:\Users\Documents\GitHub\Marlin/Marlin\src\gcode\config/M302.cpp:54: undefined reference to `ExtUI::onSetMinExtrusionTemp(short)'
collect2.exe: error: ld returned 1 exit status
*** [.pio\build\trigorilla_v006\firmware.elf] Error 1

smiksky added a commit to smiksky/Marlin that referenced this pull request Apr 4, 2024
commit 17dfe8e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 3 00:20:46 2024 +0000

    [cron] Bump distribution date (2024-04-03)

commit 7b6b6e1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 1 21:44:18 2024 -0500

    🩹 Revert motion change

commit 60f2837
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Tue Apr 2 03:30:04 2024 +0100

    🔧 Minor INPUT_SHAPING config fixes (MarlinFirmware#26882)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit ef5fb39
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 2 00:20:47 2024 +0000

    [cron] Bump distribution date (2024-04-02)

commit 87e94f4
Author: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date:   Mon Apr 1 16:05:11 2024 -0400

    🚸 Update ProUI Plot graph - part 2 (MarlinFirmware#26563)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 017a903
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 1 00:23:48 2024 +0000

    [cron] Bump distribution date (2024-04-01)

commit 466282f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 31 18:20:37 2024 -0500

    🩹 Misc. changes from ProUI / ExtUI updates (MarlinFirmware#26928)

commit 1759429
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Mar 28 00:20:53 2024 +0000

    [cron] Bump distribution date (2024-03-28)

commit 0b9f487
Author: Jordan Stocker <Pvthaggard@gmail.com>
Date:   Thu Mar 28 06:14:03 2024 +1030

    🔨 Fix binary upload firmware path (MarlinFirmware#26909)

commit d3e1a92
Author: Chris <52449218+shadow578@users.noreply.github.com>
Date:   Wed Mar 27 20:39:54 2024 +0100

    🔨 Fix HC32 preflight (MarlinFirmware#26912)

commit cd357b0
Author: Holger Mößinger <hm2dev@users.noreply.github.com>
Date:   Wed Mar 27 20:38:08 2024 +0100

    🔧🚸 Tweaks for (MiniRambo) CNC (MarlinFirmware#26892)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit d0d229e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Mar 25 00:21:58 2024 +0000

    [cron] Bump distribution date (2024-03-25)

commit eb897e6
Author: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date:   Mon Mar 25 03:49:25 2024 +0900

    📝 Fix Cutter.md typo (MarlinFirmware#26901)

commit 825ebfd
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 24 00:23:21 2024 +0000

    [cron] Bump distribution date (2024-03-24)

commit 3ee3964
Author: John Robertson <john@cirtech.co.uk>
Date:   Sat Mar 23 00:57:23 2024 +0000

    🐛 Fix ESP32 laser M4 exception (MarlinFirmware#26884)

commit aecfb25
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Sat Mar 23 00:27:13 2024 +0000

    🚸 Hide auto-run as needed (MarlinFirmware#26853)

commit 896a6a9
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 23 00:20:15 2024 +0000

    [cron] Bump distribution date (2024-03-23)

commit 075f96d
Author: Holger Mößinger <hm2dev@users.noreply.github.com>
Date:   Fri Mar 22 22:36:42 2024 +0100

    ✏️ Fix stepper MS pin typos (MarlinFirmware#26891)

commit 0589655
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Mar 18 00:21:39 2024 +0000

    [cron] Bump distribution date (2024-03-18)

commit ea6a891
Author: Manuel McLure <manuel@mclure.org>
Date:   Sun Mar 17 12:23:12 2024 -0700

    ✨ MAX7219_REINIT_ON_POWERUP (MarlinFirmware#26163)
@classicrocker883 classicrocker883 deleted the bugfix-2.1.x-Dec3 branch April 6, 2024 11:43
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.

4 participants