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
Merged
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
40fc582
update DWIN for additional ICON_'s
classicrocker883 Dec 23, 2023
7fe2177
update dwin_defines.h, add TJC option
classicrocker883 Dec 23, 2023
c4bc3ee
remove extra method impl
thinkyhead Dec 23, 2023
6a745ba
misc. cleanup
thinkyhead Dec 23, 2023
ae39db0
misc. style
thinkyhead Dec 23, 2023
8f47ef5
fix duplicate icons
thinkyhead Dec 23, 2023
2f02315
caps
thinkyhead Dec 23, 2023
ae0552a
ICON_ResumeEEPROM => ICON_ResetEEPROM
thinkyhead Dec 23, 2023
2bfc2d2
not all sets
thinkyhead Dec 23, 2023
784b5b2
updated icons
thinkyhead Dec 23, 2023
219e1da
add missing icons (prob. need optimization)
thinkyhead Dec 23, 2023
2db1845
update icon folders
thinkyhead Dec 23, 2023
3109a1e
add extra DWIN_SET's as icons-9
classicrocker883 Dec 24, 2023
588f609
update bedlevel_tools
classicrocker883 Dec 24, 2023
9282a17
oops, meant ">="
thinkyhead Dec 24, 2023
dc679eb
Not hosting old icon sets, only our unified set
thinkyhead Dec 24, 2023
59f83a1
Merge branch 'bugfix-2.1.x' into pr/26563
thinkyhead Dec 24, 2023
3bd285d
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 25, 2023
b3e106b
small change - add spacing dwinui.h
classicrocker883 Dec 25, 2023
5da9177
update checkkey ID_xx
classicrocker883 Dec 25, 2023
7deb831
remove unused, add DACAI support (maybe not full support??)
classicrocker883 Dec 25, 2023
9a2aabe
fix error - dwinDrawBox undef
classicrocker883 Dec 25, 2023
253ce70
move MSG_PREHEAT_(count)
classicrocker883 Dec 25, 2023
84b20b2
Not the way to do this
thinkyhead Dec 25, 2023
a3fb87a
add new icons to script
thinkyhead Dec 25, 2023
620aa67
remove non-translated atoms
thinkyhead Dec 26, 2023
dc4bb42
quick spacing - dwin_api.h
classicrocker883 Dec 26, 2023
438d55c
Merge branch 'bugfix-2.1.x-Dec3' of https://github.com/classicrocker8…
classicrocker883 Dec 26, 2023
c072c5b
fix script
thinkyhead Dec 26, 2023
cc2fe31
Fix splitIco.py
thinkyhead Dec 26, 2023
392b968
update ICON_'s - arrange
classicrocker883 Dec 27, 2023
026a25c
Use u8g 0.5.2 for now
thinkyhead Dec 27, 2023
a020170
fix at 0.5.4
thinkyhead Dec 28, 2023
76697a8
Merge branch 'bugfix-2.1.x' into pr/26563
thinkyhead Dec 29, 2023
51f67d3
fix DWIN_ICO.py - was not grabbing all with Split
classicrocker883 Dec 29, 2023
3e766d7
update buildroot/share/dwin/bin README.md
classicrocker883 Dec 30, 2023
baab1f4
add option to center Title
classicrocker883 Dec 31, 2023
d10e6df
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 2, 2024
1c05caf
change DWIN popup img M0_M1.cpp
classicrocker883 Jan 4, 2024
af90529
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 4, 2024
e96988d
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 5, 2024
9750a59
fix extra space + ` => '
classicrocker883 Jan 5, 2024
dddf680
more comment fixings
classicrocker883 Jan 5, 2024
6af3eb6
revert comment fixings
classicrocker883 Jan 5, 2024
8dfb51a
fix for Plot Temp Graph
classicrocker883 Jan 5, 2024
c101ac6
Update Configuration_adv.h
classicrocker883 Jan 6, 2024
406891f
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 6, 2024
8b5c2ed
fix ReturnScreen while not printing
classicrocker883 Jan 6, 2024
5d114e0
fix for last commit, for real this time
classicrocker883 Jan 8, 2024
1f273bd
fix for ID_PlotProcess
classicrocker883 Jan 8, 2024
bc3ff2e
fix typo
classicrocker883 Jan 8, 2024
360256c
fix typo
classicrocker883 Jan 8, 2024
814c212
final fix for Plot graph
classicrocker883 Jan 8, 2024
945a0ec
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 9, 2024
4827f55
fix for error
classicrocker883 Jan 9, 2024
8943290
fix for indent warning
classicrocker883 Jan 9, 2024
40d37fa
add warning for ICON (.ICO)
classicrocker883 Jan 10, 2024
c9aab94
rename to dacaiIconShow
classicrocker883 Jan 10, 2024
b39cecf
rename ICON_Show
classicrocker883 Jan 10, 2024
13a2fb4
move PID case error
classicrocker883 Jan 10, 2024
3cef453
Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.…
classicrocker883 Jan 10, 2024
627c4e3
flx error, typo
classicrocker883 Jan 11, 2024
f8ceb74
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 13, 2024
abd1131
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 16, 2024
96d5ef1
dwinPidTuning only exists if PROUI_PID_TUNE
thinkyhead Jan 19, 2024
b1bcf47
dwinDrawPIDMPCPopup needed for both
thinkyhead Jan 19, 2024
ab3357a
add DACAI compatibility
classicrocker883 Jan 20, 2024
172f3bc
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 20, 2024
628adbf
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 21, 2024
b6eaca4
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 22, 2024
72ab6f7
remove PROUI_PID_TUNE, replace w/ HAS_PID_HEATING
classicrocker883 Jan 24, 2024
39b47f0
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Feb 9, 2024
4ee29a6
All E3V2 require Marlin-provided DWIN_SET
thinkyhead Feb 13, 2024
0b872af
tweak ico script / readme
thinkyhead Feb 13, 2024
d6efca3
Update dwin.h tempcontrol enum
classicrocker883 Feb 14, 2024
1bfa1b8
ExtUI layer for ProUI
thinkyhead Feb 13, 2024
dcf8d77
move lcd/u8g files
thinkyhead Feb 16, 2024
af7aef4
fix typos
thinkyhead Feb 18, 2024
221395c
axis_to_axis_t
thinkyhead Feb 18, 2024
29260e2
ExtUI:: prefix
thinkyhead Feb 18, 2024
9a30e4e
update pid_autotune_menu
classicrocker883 Feb 19, 2024
7e69486
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Feb 19, 2024
6cdf955
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Mar 14, 2024
544d18f
fixes for errors - revert temperature.cpp 'allow_cold_extrud_override…
classicrocker883 Mar 15, 2024
fea3c72
fix for error: cannot convert
classicrocker883 Mar 15, 2024
61ffb26
fix for not declared
classicrocker883 Mar 15, 2024
1050cd8
multiple changes to change warnings and errors. ui_api.h comment to k…
classicrocker883 Mar 16, 2024
9022ce3
fix no such file, lcd/dogm/u8g
classicrocker883 Mar 16, 2024
486e24e
fix no such file, lcd/dogm/u8g pt.2
classicrocker883 Mar 16, 2024
9f9c407
revert '#include "lcdprint.h" - marlinui.h
classicrocker883 Mar 16, 2024
fa02992
typo in ftdi_eve_extui.cpp - cstr, fstr
classicrocker883 Mar 16, 2024
8552ed2
??fix for abl/G29.cpp??
classicrocker883 Mar 16, 2024
b91e9ae
fix no such file lcd/dogm/u8g
classicrocker883 Mar 16, 2024
ad5e16b
fix 'HAS_PLR_UI_FLAG', move #define
classicrocker883 Mar 16, 2024
e7df8df
fixes for DWIN and ProUI
classicrocker883 Mar 16, 2024
78de136
Also ia_creality
thinkyhead Mar 16, 2024
4569d1b
other IA updates
thinkyhead Mar 16, 2024
790388e
cleanup
thinkyhead Mar 16, 2024
368e5c6
update spacing, revert 'stopPrint', change stuff to ExtUI in ProUI
classicrocker883 Mar 17, 2024
0afd980
add chamber pid tuning
thinkyhead Mar 29, 2024
2385932
move timeout msg
thinkyhead Mar 29, 2024
42b362b
DGUS_MSG_TEMP_TOO_LOW => MSG_TEMP_TOO_LOW
thinkyhead Mar 29, 2024
4e93a15
oops
thinkyhead Mar 31, 2024
88da06b
Merge branch 'bugfix-2.1.x' into pr/26563
thinkyhead Mar 31, 2024
b16b711
Merge branch 'bugfix-2.1.x' into pr/26563
thinkyhead Mar 31, 2024
576e83b
merge followup
thinkyhead Mar 31, 2024
bfe3ca1
split result_t to pidresult_t / mpcresult_t
classicrocker883 Apr 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge followup
thinkyhead committed Mar 31, 2024
commit 576e83bb83b652729dd1853ac82ba24b8ccbb8be
20 changes: 13 additions & 7 deletions Marlin/src/lcd/e3v2/proui/proui_extui.cpp
Original file line number Diff line number Diff line change
@@ -195,13 +195,19 @@ namespace ExtUI {
void onPIDTuning(const result_t rst) {
// Called for temperature PID tuning result
switch (rst) {
case PID_STARTED: dwinPIDTuning(PIDTEMP_START); break;
case PID_BED_STARTED: dwinPIDTuning(PIDTEMPBED_START); break;
case PID_CHAMBER_STARTED: dwinPIDTuning(PIDTEMPCHAMBER_START); break;
case PID_BAD_HEATER_ID: dwinPIDTuning(tempcontrol_t(PID_BAD_HEATER_ID)); break;
case PID_TEMP_TOO_HIGH: dwinPIDTuning(tempcontrol_t(PID_TEMP_TOO_HIGH)); break;
case PID_TUNING_TIMEOUT: dwinPIDTuning(tempcontrol_t(PID_TUNING_TIMEOUT)); break;
case PID_DONE: dwinPIDTuning(AUTOTUNE_DONE); break;
#if ENABLED(PIDTEMP)
case PID_STARTED: dwinPIDTuning(PIDTEMP_START); break;
#endif
#if ENABLED(PIDTEMPBED)
case PID_BED_STARTED: dwinPIDTuning(PIDTEMPBED_START); break;
#endif
#if ENABLED(PIDTEMPCHAMBER)
case PID_CHAMBER_STARTED: dwinPIDTuning(PIDTEMPCHAMBER_START); break;
#endif
case PID_BAD_HEATER_ID: dwinPIDTuning(tempcontrol_t(PID_BAD_HEATER_ID)); break;
case PID_TEMP_TOO_HIGH: dwinPIDTuning(tempcontrol_t(PID_TEMP_TOO_HIGH)); break;
case PID_TUNING_TIMEOUT: dwinPIDTuning(tempcontrol_t(PID_TUNING_TIMEOUT)); break;
case PID_DONE: dwinPIDTuning(AUTOTUNE_DONE); break;

}
}