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

Fix MKS LVGL UI retraction #23267

Merged
merged 40 commits into from
Dec 8, 2021
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
aa595f5
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 11, 2020
d5d325c
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 13, 2020
d8d5c0f
Merge pull request #4 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 14, 2020
a1055dd
Merge pull request #6 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 18, 2020
8b349b1
Merge pull request #7 from MarlinFirmware/bugfix-2.0.x
makerbase-mks May 22, 2020
8c42e50
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
makerbase-mks Jun 27, 2020
626ed70
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
makerbase-mks Jul 1, 2020
80a2552
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
MKS-Sean Jul 2, 2020
8386fdf
Merge pull request #54 from MarlinFirmware/bugfix-2.0.x
MKS-Sean Jun 11, 2021
3034d86
mks robin nano v3 add function of wifi
MKS-Sean Jun 11, 2021
8975478
Update irq_overrid.cpp
thinkyhead Jun 11, 2021
5708db5
Fix the header file path
MKS-Sean Jun 12, 2021
321a2fa
Update printer_operation.cpp
thinkyhead Jun 13, 2021
523f2db
split up wifiserial
thinkyhead Jun 13, 2021
f86189c
updata
solawc Jul 21, 2021
f2d1f15
Merge pull request #61 from MarlinFirmware/bugfix-2.0.x
solawc Jul 21, 2021
98bdb52
Merge pull request #63 from MarlinFirmware/bugfix-2.0.x
solawc Sep 10, 2021
976abe9
change lvgl lcd disp driver
solawc Sep 10, 2021
5a8c30b
fix and add
solawc Sep 16, 2021
88646c2
misc. cleanup
thinkyhead Sep 16, 2021
46c0e0a
MKS UI cosmetic changes
thinkyhead Sep 16, 2021
09daeb7
Merge pull request #64 from MarlinFirmware/bugfix-2.0.x
solawc Sep 22, 2021
49b9451
Modify LVGL touch driver
solawc Sep 22, 2021
e7a20ab
clean up, fix typos
thinkyhead Sep 23, 2021
0f13641
Merge pull request #65 from MarlinFirmware/bugfix-2.0.x
solawc Sep 24, 2021
43d3b13
修复挤出、热床切换时,出现的图标出错的问题
solawc Sep 27, 2021
5d99eb8
Merge pull request #66 from MarlinFirmware/bugfix-2.0.x
solawc Sep 27, 2021
b6a2804
Merge branch 'bugfix-2.0.x' of https://github.com/makerbase-mks/Marli…
solawc Sep 27, 2021
3c2cb1b
fix
solawc Sep 27, 2021
b53b703
reset
solawc Sep 29, 2021
4de8951
Merge pull request #67 from MarlinFirmware/bugfix-2.0.x
solawc Sep 29, 2021
565368c
Merge pull request #68 from MarlinFirmware/bugfix-2.0.x
solawc Oct 9, 2021
45ae4d4
Merge pull request #69 from MarlinFirmware/bugfix-2.0.x
solawc Oct 13, 2021
41d2e25
Merge pull request #70 from MarlinFirmware/bugfix-2.0.x
solawc Oct 26, 2021
409ce77
Merge pull request #71 from MarlinFirmware/bugfix-2.0.x
solawc Dec 6, 2021
ab32893
Fix the problem that the material cannot be returned
solawc Dec 6, 2021
eb204e6
cleanup
thinkyhead Dec 8, 2021
881e42b
Update draw_extrusion.cpp
thinkyhead Dec 8, 2021
601e5da
use hot enough method
thinkyhead Dec 8, 2021
a56ce93
the more likely intention
thinkyhead Dec 8, 2021
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
6 changes: 3 additions & 3 deletions Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
if (event != LV_EVENT_RELEASED) return;
switch (obj->mks_obj_id) {
case ID_E_ADD:
if (thermalManager.degHotend(uiCfg.extruderIndex) >= EXTRUDE_MINTEMP) {
if (thermalManager.hotEnoughToExtrude(uiCfg.extruderIndex)) {
sprintf_P((char *)public_buf_l, PSTR("G91\nG1 E%d F%d\nG90"), uiCfg.extruStep, 60 * uiCfg.extruSpeed);
queue.inject(public_buf_l);
extrudeAmount += uiCfg.extruStep;
disp_extru_amount();
}
break;
case ID_E_DEC:
if (thermalManager.degHotend(uiCfg.extruderIndex) >= EXTRUDE_MINTEMP) {
if (thermalManager.hotEnoughToExtrude(uiCfg.extruderIndex)) {
sprintf_P((char *)public_buf_l, PSTR("G91\nG1 E%d F%d\nG90"), 0 - uiCfg.extruStep, 60 * uiCfg.extruSpeed);
queue.enqueue_one_now(public_buf_l);
queue.inject(public_buf_l);
Copy link
Member

@thinkyhead thinkyhead Dec 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems more likely that this is what was actually intended, rather than changing the plus above to a minus.

extrudeAmount -= uiCfg.extruStep;
disp_extru_amount();
}
Expand Down