From dd70e03767651f25463abc5d2a7b2274c76258bb Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 18 Aug 2019 18:00:35 -0400 Subject: [PATCH] lots of fixes --- .../DWIN_SET/13触控配置文件.bin | Bin 11794 -> 11794 bytes .../DWIN_SET/14变量配置文件.bin | Bin 30432 -> 30560 bytes .../DisplayConfig.xls | Bin 53248 -> 53760 bytes .../TFT/06_C_PrintFile.bmp.tft | Bin 14413 -> 14481 bytes .../TFT/09_C_Printstatus1.bmp.tft | Bin 10407 -> 10495 bytes .../TFT/17_C_PLAorABS.bmp.tft | Bin 6950 -> 7030 bytes .../TFT/19_C_NozzleHotbet.bmp.tft | Bin 8019 -> 8085 bytes .../TFT/41_C_Keyboard2.bmp.tft | Bin 2202 -> 2278 bytes .../TFT/46_E_PrintFile.bmp.tft | Bin 14696 -> 14764 bytes .../TFT/52_E_Printstatus2.bmp.tft | Bin 12490 -> 12490 bytes .../TFT/53_E_Printstatus3.bmp.tft | Bin 12890 -> 12958 bytes .../TFT/54_E_Printstatus4.bmp.tft | Bin 12933 -> 12933 bytes .../TFT/58_E_TempControl2.bmp.tft | Bin 10571 -> 10571 bytes .../TFT/59_E_PLAorABS.bmp.tft | Bin 7921 -> 8009 bytes .../TFT/60_E_PLAorABS.bmp.tft | Bin 7997 -> 7997 bytes .../TFT/68_E_ChngFlmHeating.bmp.tft | Bin 7244 -> 7312 bytes .../TFT/77_E_ContinuePrintstatus2.bmp.tft | Bin 2202 -> 2270 bytes .../TFT/82_E_Refuel2.bmp.tft | Bin 6693 -> 6837 bytes .../TFT/85_E_Autoleve.bmp.tft | Bin 4541 -> 6243 bytes .../TFT/87_E_Wait.bmp.tft | Bin 3574 -> 3642 bytes Marlin/Configuration.h | 12 +- Marlin/Configuration_adv.h | 2 +- Marlin/src/feature/host_actions.cpp | 5 + Marlin/src/feature/pause.cpp | 7 + Marlin/src/feature/prusa_MMU2/mmu2.cpp | 3 + Marlin/src/gcode/config/M43.cpp | 8 + .../lcd/extensible_ui/lib/Creality_DWIN.cpp | 193 +++++++----------- 27 files changed, 105 insertions(+), 125 deletions(-) diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin b/Marlin/CRX_ABL_1.70_ScreenFiles/DWIN_SET/13触控配置文件.bin index c2dbb8ea52e707ba3264f9ddbfd1b58091df2904..4007393cff5fa33860647d949ee68ea4dbec7d5f 100644 GIT binary patch delta 20 ccmbOfGbv_+G9!B`!)eCd4DUB!JZ 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 diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls b/Marlin/CRX_ABL_1.70_ScreenFiles/DisplayConfig.xls index 397b4353a0a0b54e50a43cca7a1e7f7024cc1d1f..bcd55fc84ff684fd5ae16d7f41829e926b79a089 100644 GIT binary patch delta 652 zcmY+CKTE?v7>D0CX&Y^aR6B;Ei?a?c>gESf+#GBDw+VtG6r=@l5=1>eKnF*0XlyP? zp<7CDaS}lX@mq+X@$&X^<^nnLT<-VecS$;3vvX%&E!1~F9#w!naf#ymO_C&?-FH8q zX7IXk+cVaR*mT#e7Yhe$&R#L@Bi6LLIB?DC=>u!D3dq?;tA;*}0ga)1IOL@zTbO>J z43B7l4dOA9OhJ>13WEMu7E@wdkz;3beM(QUi^x&NKGHhr@I-YR-V|ZZ=uvu_eMC+> zGkRK@YiW-8G^cb;nmOj1bIdpAn$y>uJ~^$n)c7Rz73HNqNiB6R-DXCCCJjhhkt+jo zdW!PSfSeUL7{C93nr6X}r0+5qj+-hDGi;v?K;$MKmlKXSk0%Mxz0^XHR4V^D%% delta 288 zcmZoz!rZWcd4hp#G6NI{FfgP7nT$aE@Bjb*AknnV56{RmPE44xiOG+Z(QC6m`&D+v z?UPmct(ka^Oitooz_@)gvq0^-%@_8qV6$Wg>iEmR#ju5uiGiPC2b{+Y3 DDP%|g diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/06_C_PrintFile.bmp.tft index 3c3d11202f8bff14cf9b4a10ad6fc53f50c9f9ff..5766b2e19a5c0d8c7887eff78010dfe34ef3b4a5 100644 GIT binary patch delta 11 ScmX?GFtKohuf=3e3l{(&tOSh! delta 7 OcmbPOc(!1JuLS@PM+0>L diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/09_C_Printstatus1.bmp.tft index 45ae706a156c350658c405eeff7491cb987d6eee..8deed60b7dbb1b07903d151c6c0f5689af27cfb5 100644 GIT binary patch delta 11 ScmZ1;_&;#Na*fIU8W8{^L*r2F5A>|NmbN#N7;?42+YZoWl%982B0f|7ZBmnKt>1loSAr3>pjo diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/19_C_NozzleHotbet.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/19_C_NozzleHotbet.bmp.tft index 9a7c4526d7fe3f2b7ea6941f12204826bf233cfc..c0d2bf3c2bd796b9cdf4a5b0b797f55ed844b944 100644 GIT binary patch delta 29 lcmca?H`RW_L3TDaMFs{2=gIlZ&XbR^uVGZ&T+DG#3;>Qm31$EQ delta 27 jcmbPgf7x!sL3UP7IR*xX$y^+3809u^=eQ@v#K;W*b-4#_ diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/41_C_Keyboard2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/41_C_Keyboard2.bmp.tft index 16893101e8c3bd7e22aa6b4f3ce4ab264ffc18cc..e12195e744076e2a61e545d12c16f608519a1f4a 100644 GIT binary patch delta 11 ScmbOw_)KuaERM;396kUX7X&H* delta 7 OcmaDRI7@KDEDit-Ndol% diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/46_E_PrintFile.bmp.tft index 0ccf645b032ee414e266850f3680453d1d41fa4b..d241732e6a2edae932b95c2e87eef24aa693258f 100644 GIT binary patch delta 11 ScmaD+w5E7NhUH`xOBVnm<^=x$ delta 7 OcmZ2e{Gw<>h9v+H)&t7` diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/52_E_Printstatus2.bmp.tft index 9388741146daa6543a996ee9f8e39cd74efc9297..a63a3b17e02e287214a22cea2b5360fccfd95699 100644 GIT binary patch delta 14 VcmX?=cq(y2J3r&{%^mzsiU2et1@Zs@ delta 14 VcmX?=cq(y2J3ph_<_>-*MF26~1(5&% diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/53_E_Printstatus3.bmp.tft index c80efd7d0b015333812809ad417967640b2da604..eb15bb1e93aa397289130077f797e5bc7c208305 100644 GIT binary patch delta 18 acmcbWGB0&QH$UU@%{~0*lqQQAxc~rBkq40g delta 14 VcmbQ2dMjl^H$S7><{tiYN&qp}1`z-N diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/54_E_Printstatus4.bmp.tft index 94751d4e088bf511fe23e622bebd1b60ee1eea05..0c3f3efa631004154db68eca50e951b16d254d21 100644 GIT binary patch delta 28 icmZooZB5- delta 28 icmZooZB5dbUJ9mFCNC_n}72J$N&I1q6WVJ delta 14 VcmX>dbUJ9mFCIp>&A)j9WB@i?23`OF diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/59_E_PLAorABS.bmp.tft index 77ccd2d9d12295755632e06d5c83af217e3fb257..58532c1ea158fa93d3bea0727730c678da51cffd 100644 GIT binary patch delta 18 acmexpd(v*hQy#|Uo1gJ;3r(IW7XbiNy9eU{ delta 14 VcmX?U_tAF4QyxaQ&Chtag#a{o1>gVx diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/60_E_PLAorABS.bmp.tft index 041cba111082bf7d08d0bbdf4e53850466579eb6..ae886a6b88430025cb13f54b010db1cc90c466f1 100644 GIT binary patch delta 14 WcmdmMx7TjNQy#|Uo1gK73jqK$Nd`^; delta 14 VcmdmMx7TjNQyxaQ&Chtkg#a=G1?>O; diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/68_E_ChngFlmHeating.bmp.tft index 3033b00f40e17074516136d7e31ec9871887cd00..ee4fe5f46fae321b8bfaae6fcb80b31babf0ce97 100644 GIT binary patch delta 11 ScmX?OF~M?!kIZBa85aN>+XLYM delta 7 OcmbPWdB$Rcj|>0|?E>Zi diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/77_E_ContinuePrintstatus2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/77_E_ContinuePrintstatus2.bmp.tft index 6aba345623462b5e96b016847ccb73d09198f59e..46e7f64562710823d7cdf696d4c6c987e07649df 100644 GIT binary patch delta 11 ScmbOwcu#P{ERM-x94-JG-vlB6 delta 7 Ocmca7I7@KDEDit-5d!T1 diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/82_E_Refuel2.bmp.tft index 90271164b0a7c386e11b4adf4734d6b45a69eac4..2cc0af856ef32b24bc6607c1f81bdd4e9ab93dbe 100644 GIT binary patch delta 11 ScmZ2#vek5hs?_AEk`n+NEChrA delta 7 OcmdmLy3}NYsuTbWwF0vM diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/85_E_Autoleve.bmp.tft index fc2c866bf890ffcd28983a381d47c3abc04f689e..7bf287b6d9e2c88493d639b1a0585da3c19d008d 100644 GIT binary patch literal 6243 zcmeHL-ESOM6`yO*%+9PoY9&o+(v++ULM<`tHLmTZA_9BYj!o>;%{s=F9hUL#wLSIj zj59N9#}-HxFMJ3jgm^%R2ZVS*2m}IwKp-d;kAhBRlSyRjJ=pKxo@rZF4IMwl%*kyG}YK~?rGI2&@o37p298%EjL2D-CeP2SHg zIl)A&7RWHP%L_@Xzt{|d!wGYu8Tm^K5JKI%c!Bf%=YSnt1626f?utC|X&~;F1%!%f*>m}N_y(WV*EIFT0nc9KR%{X4IE`tYjLf)|) zD|gA-vRK;|E1OjoRo14IsSlX_`p`9`LQR&l;$@;zV96r0hyTbJ2#HIULPLkpSp;gQ9?ZE1Ov zuH$VwzFqXab$0{MpliC&1qz%{f4p_W`2#U1l=bMbStSu?K9DN5t@B=8OoXKq9jCG2 zyI!QITUSylv25i{e>YFyTa@=BcKA6T<6nU0j*>FS#eK17>=HlCO$DYHgA-d88NG_< zuXv{MycZ9^Lo@yflE+0;+ao#M11uXmPQ59!Tb{q`sTm`T5QY5O&SXfKL7~d~K+_yx z)A$GIo>4oblu=A76-@=4qD?w>Yi0bsjkHRUR1Y`L-BKhXBN6gtv{~%)sC0(#8K8o( zWTj}6iBYkTX~<~PuNAuW?n3GgodM};`uUU>1$*riA7vg&NZpp}Ns7tO%f^}vX1#U4 z4ba(-;v-w>=P|SdRj+{QJqP0#(aI2^lz|mQT}mD7sGG)Z3K8Sm6Kq{(^&~5LhnTS8@UL9Rh0K17$KH- z*4u7I`QkQVfU4{7ic8yIBn2)qb6m-t=5`!p!L_;!4`T%9HuEVg(5F$vpAjnr3=Fgs z^Zn?G0-bzp!1xnZoFbW67B7KoKLvOd2m+F};OC07_#-F~MY4DjW?h<2KYi#pQD>Hj zaP5R4!l1rq#?f~!e$g-!$xQ#@kaC(hJlX84C2^@@4~IS2>)~V8d>T7wcW5x5!Nko* zSoMRtyY|1N#_@4yv^qLAd~M`eS$OW6`9Tm&VaB|Q&f9U~HU~kdJ@A+x!qlbsuuy4p z+RN(1mWPEVb@ZhEds7p!V;AeNrD~NCY7TD-*%;zz&4J`RJrQiE%RtD4taV#`2`+NY z%3YfR+tiHBU6}<`A6xR>TCVdZo=zylFgKV>y6X4`Zs9XT#;hQ2DomxhZJO2`L6w^0 z2-7hPUrzY7Jq~9Dp_i(&x%SAX*U+6jDsS8G&nPi*nzD=65pN9eH_O}s(#Dcc`r^uh#N%8*$mXZIxcKm;ii4OdKhN%UyikendOSOZLqlWFRrpWOoZOK^ zL&N#C#yy4#1EnsTGXGC#mlwTgO04v3Zi>LFm~5@olW( zS?Wzd@uk-_8-Ft;1jV;7tf1%*ul=6Rj?$$GVp#{yRZPX4zj+$xj|_-!B%G(k8^@1k zUr#yXeaM+8)`2raCg%J#e8DKiKubB;^Ya7ZtC;7W?}78NJ%0tm5A4}sAfAK~Ovdlf z%^*vhs+4i4j4aih@@hS*fos4)@Ne;jBVFXTiX!4PiePbqkj-T&X8mMZhEhx_Ba zbKjyQ>?VzL1Q!RL_gZVxscx}hmK98#?|*G%m#-!l7gk5dJzG53{zCT`~_ xrZTAcX$(Db1V-}^jA-~7jK>E4EKJeSz*wbyc|g3981W)fh0rdlr^E!`^IwtMC-MLQ delta 888 zcmZuvOKTHR6rMZIy~$)Ik4`g5CRUTCCb3vzVj36prRc)M2!4LrmuJX&HfBXa31(-+U zG=t4==`gS9Fbo31dcYztcu+TNnhm`aaf(0q< zQuCItO`U`*TCH81yxVThHkKQusrnpiJq7=^)-~|@TJ!$k;J+Uet33&xHjR;b KzMbZWw0;8zfxT4# diff --git a/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft b/Marlin/CRX_ABL_1.70_ScreenFiles/TFT/87_E_Wait.bmp.tft index 29490bc2f69ed9b8fb8fa8540b1b5f4136268219..2a01e65a8cf66bed2f72d4437332885a8d6edfad 100644 GIT binary patch delta 11 Scmew+y-Q}pH{QvccwGP@ss%9s delta 7 Ocmdlb^G$lgH(me_2m_k{ diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 05e9d6a8c1..0a32ae052c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -9,14 +9,14 @@ //#define MachineEnder3 //#define MachineEnder4 //#define MachineEnder5 -#define MachineEnder5Plus +//#define MachineEnder5Plus //#define MachineMini //#define MachineCR20 //Buzzer doesnt work //#define MachineCR20Pro //#define MachineCR10 //#define MachineCR10S //#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66 -//#define MachineCRX +#define MachineCRX //#define MachineCR10Max //#define MachineS4 //#define MachineS5 @@ -99,7 +99,7 @@ */ //#define ABL_EZABL // TH3D EZABL or Any NO Sensor //#define ABL_NCSW //Creality ABL or Any NC Sensor -//#define ABL_BLTOUCH +#define ABL_BLTOUCH //#define CREALITY_ABL_MOUNT //Using creality ABL mount //#define E3D_DUALFAN_MOUNT // Using HD Modular mount as above with 2 5015 blowers and sensor on the right @@ -827,9 +827,9 @@ #if ENABLED(HotendStock) #if ANY(MachineCRX, MachineCR10SPro, MachineCR10Max) - #define DEFAULT_Kp 17.5 - #define DEFAULT_Ki 1.37 - #define DEFAULT_Kd 55.47 + #define DEFAULT_Kp 20.22 + #define DEFAULT_Ki 3.43 + #define DEFAULT_Kd 29.81 #elif ENABLED(MachineEnder5Plus) #define DEFAULT_Kp 14.72 #define DEFAULT_Ki 0.89 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f1d9b4c0c8..fa9b6c0c2e 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2416,7 +2416,7 @@ #if (ENABLED(ABL_UBL)) #define USER_GCODE_1 "M190S" CommBedTmp "\nG28\nG29P1\nM109S215\nG29S1\nG29S0\nG29F0.0\nG29A\nG28\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset" #elif ENABLED(ABL_BI) - #define USER_GCODE_1 "M190S" CommBedTmp "\nM104S215\nG28\nG29\nM400\nM109S215\nG28\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset" + #define USER_GCODE_1 "M190S" CommBedTmp "\nG28\nG29\nM400\nM109S215\nG28\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset" #endif #define USER_DESC_2 "PID Tune" diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp index b39b0fbc3c..5ffa6adb84 100644 --- a/Marlin/src/feature/host_actions.cpp +++ b/Marlin/src/feature/host_actions.cpp @@ -37,6 +37,10 @@ #include "runout.h" #endif +#if ENABLED(EXTENSIBLE_UI) + #include "../lcd/extensible_ui/ui_api.h" +#endif + void host_action(const char * const pstr, const bool eol) { SERIAL_ECHOPGM("//action:"); serialprintPGM(pstr); @@ -88,6 +92,7 @@ void host_action(const char * const pstr, const bool eol) { void host_action_prompt_show() { host_action_prompt(PSTR("show")); } void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const pbtn/*=nullptr*/) { host_prompt_reason = reason; + host_action_prompt_end(); host_action_prompt_begin(pstr); if (pbtn) host_action_prompt_button(pbtn); diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 17dd469632..93ec782027 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -187,6 +187,9 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l host_action_prompt_button(PSTR("Continue")); host_action_prompt_show(); #endif + #if ENABLED(EXTENSIBLE_UI) + ExtUI::onUserConfirmRequired("Load Filament"); + #endif while (wait_for_user) { #if HAS_BUZZER filament_change_beep(max_beep_count); @@ -511,6 +514,10 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep extruder_duplication_enabled = false; #endif + #if ENABLED(EXTENSIBLE_UI) + ExtUI::onUserConfirmRequired("Paused for User"); + #endif + // Wait for filament insert by user and press button KEEPALIVE_STATE(PAUSED_FOR_USER); wait_for_user = true; // LCD click or M108 will clear this diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp index 3450e98b3f..3eda08c820 100644 --- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp +++ b/Marlin/src/feature/prusa_MMU2/mmu2.cpp @@ -707,6 +707,9 @@ void MMU2::filament_runout() { if (recover) { LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER); BUZZ(200, 404); + #if ENABLED(EXTENSIBLE_UI) + ExtUI::onUserConfirmRequired("MMU2 Eject Recover"); + #endif wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), PSTR("Continue")); diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp index 8909397b32..1212abf8b7 100644 --- a/Marlin/src/gcode/config/M43.cpp +++ b/Marlin/src/gcode/config/M43.cpp @@ -42,6 +42,10 @@ #include "../../feature/host_actions.h" #endif +#if ENABLED(EXTENSIBLE_UI) + #include "../../lcd/extensible_ui/ui_api.h" +#endif + #ifndef GET_PIN_MAP_PIN_M43 #define GET_PIN_MAP_PIN_M43(Q) GET_PIN_MAP_PIN(Q) #endif @@ -324,6 +328,10 @@ void GcodeSuite::M43() { } #if HAS_RESUME_CONTINUE + #if ENABLED(EXTENSIBLE_UI) + ExtUI::onUserConfirmRequired("M43 Called"); + #endif + KEEPALIVE_STATE(PAUSED_FOR_USER); wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index e6f8b726dc..f7e3e6bb80 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -3,7 +3,6 @@ #include #include #include - #include "../ui_api.h" namespace ExtUI @@ -130,16 +129,18 @@ void onStartup() void onIdle() { - if(waitway && !commandsInQueue()) waitway_lock++; + else + waitway_lock = 0; + if(waitway_lock > 100) { waitway_lock = 0; waitway = 0; //clear waitway if nothing is going on } - switch (waitway) - { + switch (waitway) + { case 1: if(isPositionKnown()) { InforShowStatus = true; @@ -151,19 +152,20 @@ void onIdle() break; case 2: - if (isPositionKnown()) + if (isPositionKnown() && !commandsInQueue()) waitway = 0; break; case 3: - waitway = 0; SERIAL_ECHOLN("==waitway 3=="); - if(isPositionKnown()) + if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) { rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); + waitway = 0; + } break; case 4: - if (AutohomeKey && isPositionKnown()) + if (AutohomeKey && isPositionKnown() && !commandsInQueue()) { //Manual Move Home Done SERIAL_ECHOLN("==waitway 4=="); rtscheck.RTS_SndData(ExchangePageBase + 71 + AxisPagenum, ExchangepageAddr); @@ -172,92 +174,30 @@ void onIdle() } break; case 5: - if(isPositionKnown()) { + if(isPositionKnown() && !commandsInQueue()) { InforShowStatus = true; waitway = 0; SERIAL_ECHOLN("==waitway 5=="); rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr); //exchange to 78 page } break; - } -#if ENABLED(POWER_LOSS_RECOVERY) - if (PoweroffContinue) - { - PoweroffContinue = false; - injectCommands_P(power_off_commands[3]); - card.startFileprint(); - print_job_timer.power_off_start(); - } -#endif - + #if ENABLED(POWER_LOSS_RECOVERY) + if (PoweroffContinue) + { + PoweroffContinue = false; + injectCommands_P(power_off_commands[3]); + card.startFileprint(); + print_job_timer.power_off_start(); + } + #endif if (InforShowStatus) { - if ((power_off_type_yes == 0) && lcd_sd_status && (power_off_commands_count > 0)) // print the file before the power is off. - { - SERIAL_ECHOLN(" ***test1*** "); - if (startprogress == 0) - { - rtscheck.RTS_SndData(StartSoundSet, SoundAddr); - - rtscheck.RTS_SndData(5, VolumeIcon); - rtscheck.RTS_SndData(8, SoundIcon); - rtscheck.RTS_SndData(0xC0, VolumeIcon - 2); - if (VolumeSet == 0) - { - rtscheck.RTS_SndData(0, VolumeIcon); - rtscheck.RTS_SndData(9, SoundIcon); - } - else - { - rtscheck.RTS_SndData((VolumeSet + 1) / 32 - 1, VolumeIcon); - rtscheck.RTS_SndData(8, SoundIcon); - } - rtscheck.RTS_SndData(VolumeSet, VolumeIcon - 2); - rtscheck.RTS_SndData(VolumeSet << 8, SoundAddr + 1); - } - if (startprogress <= 100) - rtscheck.RTS_SndData(startprogress, StartIcon); - else - rtscheck.RTS_SndData((startprogress - 100), StartIcon + 1); - delay_ms(30); - if ((startprogress += 1) > 200) - { -#if ENABLED(POWER_LOSS_RECOVERY) - power_off_type_yes = 1; - - for (uint16_t i = 0; i < CardRecbuf.Filesum; i++) - { - if (!strcmp(CardRecbuf.Cardfilename[i], &power_off_info.sd_filename[1])) - { - InforShowStatus = true; - int filelen = strlen(CardRecbuf.Cardshowfilename[i]); - filelen = (TEXTBYTELEN - filelen) / 2; - if (filelen > 0) - { - char buf[20]; - memset(buf, 0, sizeof(buf)); - strncpy(buf, " ", filelen); - strcpy(&buf[filelen], CardRecbuf.Cardshowfilename[i]); - RTS_SndData(buf, Printfilename); - } - else - RTS_SndData(CardRecbuf.Cardshowfilename[i], Printfilename); //filenames - RTS_SndData(ExchangePageBase + 76, ExchangepageAddr); - break; - } - } -#endif - } - - return; - } - else if ((power_off_type_yes == 0) && !power_off_commands_count) - { - - if (startprogress == 0) + if(power_off_type_yes ==0) + { + if (startprogress == 0) { rtscheck.RTS_SndData(StartSoundSet, SoundAddr); @@ -278,30 +218,50 @@ void onIdle() rtscheck.RTS_SndData(startprogress, StartIcon); else rtscheck.RTS_SndData((startprogress - 100), StartIcon + 1); - delay_ms(30); - if ((startprogress += 1) > 200) + if ((startprogress += 1) > 200) { - SERIAL_ECHOLN(" startprogress "); - power_off_type_yes = 1; - InforShowStatus = true; - TPShowStatus = false; - rtscheck.RTS_SndData(ExchangePageBase + 45, ExchangepageAddr); + #if ENABLED(POWER_LOSS_RECOVERY) + if(lcd_sd_status && (power_off_commands_count > 0)) { + for (uint16_t i = 0; i < CardRecbuf.Filesum; i++) + { + if (!strcmp(CardRecbuf.Cardfilename[i], &power_off_info.sd_filename[1])) + { + InforShowStatus = true; + int filelen = strlen(CardRecbuf.Cardshowfilename[i]); + filelen = (TEXTBYTELEN - filelen) / 2; + if (filelen > 0) + { + char buf[20]; + memset(buf, 0, sizeof(buf)); + strncpy(buf, " ", filelen); + strcpy(&buf[filelen], CardRecbuf.Cardshowfilename[i]); + RTS_SndData(buf, Printfilename); + } + else + RTS_SndData(CardRecbuf.Cardshowfilename[i], Printfilename); //filenames + RTS_SndData(ExchangePageBase + 76, ExchangepageAddr); + break; + } + } + } + return; + #endif + SERIAL_ECHOLN(" startprogress "); + power_off_type_yes = 1; + InforShowStatus = true; + TPShowStatus = false; + rtscheck.RTS_SndData(ExchangePageBase + 45, ExchangepageAddr); } return; - } - else - { + } + if (TPShowStatus && isPrinting()) //need to optimize { - static unsigned int last_cardpercentValue = 101; rtscheck.RTS_SndData(getProgress_seconds_elapsed() / 3600, Timehour); - rtscheck.RTS_SndData((getProgress_seconds_elapsed() / 3600) / 60, Timemin); - - if (last_cardpercentValue != getProgress_percent()) - { - if (progress_bar_percent > 0) + rtscheck.RTS_SndData((getProgress_seconds_elapsed() % 3600) / 60, Timemin); + if (getProgress_percent() > 0) { - Percentrecord = progress_bar_percent + 1; + Percentrecord = getProgress_percent() + 1; if (Percentrecord <= 50) { rtscheck.RTS_SndData((unsigned int)Percentrecord * 2, PrintscheduleIcon); @@ -319,37 +279,30 @@ void onIdle() rtscheck.RTS_SndData(0, PrintscheduleIcon + 1); } rtscheck.RTS_SndData((unsigned int)getProgress_percent(), Percentage); - last_cardpercentValue = getProgress_percent(); - } } rtscheck.RTS_SndData(getZOffset_mm() * 100, 0x1026); //float temp_buf = getActualTemp_celsius(H0); rtscheck.RTS_SndData(getActualTemp_celsius(H0), NozzleTemp); rtscheck.RTS_SndData(getActualTemp_celsius(BED), Bedtemp); - if (last_target_temperature_bed != getTargetTemp_celsius(BED) || (last_target_temperature[0] != getTargetTemp_celsius(H0))) - { - rtscheck.RTS_SndData(getTargetTemp_celsius(H0), NozzlePreheat); - rtscheck.RTS_SndData(getTargetTemp_celsius(BED), BedPreheat); + rtscheck.RTS_SndData(getTargetTemp_celsius(H0), NozzlePreheat); + rtscheck.RTS_SndData(getTargetTemp_celsius(BED), BedPreheat); if (isPrinting()) { //keep the icon } - else if (last_target_temperature_bed < getTargetTemp_celsius(BED) || (last_target_temperature[0] < getTargetTemp_celsius(H0))) + else if (getActualTemp_celsius(BED) < getTargetTemp_celsius(BED) || (getActualTemp_celsius(H0) < getTargetTemp_celsius(H0))) { - rtscheck.RTS_SndData(1 + CEIconGrap, IconPrintstatus); + rtscheck.RTS_SndData(1 + CEIconGrap, IconPrintstatus); // Heating Status PrinterStatusKey[1] = (PrinterStatusKey[1] == 0 ? 1 : PrinterStatusKey[1]); } - else if (last_target_temperature_bed > getTargetTemp_celsius(BED) || (last_target_temperature[0] > getTargetTemp_celsius(H0))) + else if (getActualTemp_celsius(BED) > getTargetTemp_celsius(BED) || (getActualTemp_celsius(H0) > getTargetTemp_celsius(H0))) { - rtscheck.RTS_SndData(8 + CEIconGrap, IconPrintstatus); + rtscheck.RTS_SndData(8 + CEIconGrap, IconPrintstatus); // Cooling Status PrinterStatusKey[1] = (PrinterStatusKey[1] == 0 ? 2 : PrinterStatusKey[1]); } - last_target_temperature_bed = getTargetTemp_celsius(BED); - last_target_temperature[0] = getTargetTemp_celsius(H0); - } if (NozzleTempStatus[0] || NozzleTempStatus[2]) //statuse of loadfilement and unloadfinement when temperature is less than { @@ -402,7 +355,7 @@ void onIdle() rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)X), DisplayXaxis); rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Y), DisplayYaxis); rtscheck.RTS_SndData(10 * getAxisPosition_mm((axis_t)Z), DisplayZaxis); - } + if (getLevelingActive()) rtscheck.RTS_SndData(2, AutoLevelIcon); /*Off*/ @@ -410,7 +363,6 @@ void onIdle() rtscheck.RTS_SndData(3, AutoLevelIcon); /*On*/ } if (rtscheck.RTS_RecData() > 0) - //SERIAL_PROTOCOLLN(" Handle Data "); rtscheck.RTS_HandleData(); } @@ -823,7 +775,7 @@ void RTSSHOW::RTS_HandleData() } else { - RTS_SndData(ExchangePageBase + 52, ExchangepageAddr); + RTS_SndData(ExchangePageBase + 53, ExchangepageAddr); } } else if (recdat.data[0] == 3) @@ -1413,7 +1365,7 @@ void RTSSHOW::RTS_HandleData() PrintStatue[1] = 0; PrinterStatusKey[1] = 3; CardCheckStatus[0] = 1; // open the key of checking card in printing - RTS_SndData(ExchangePageBase + 52, ExchangepageAddr); + RTS_SndData(ExchangePageBase + 53, ExchangepageAddr); FilementStatus[0] = 0; // recover the status waiting to check filements } @@ -1482,7 +1434,7 @@ void RTSSHOW::RTS_HandleData() CardCheckStatus[0] = 1; // open the key of checking card in printing RTS_SndData(1 + CEIconGrap, IconPrintstatus); - RTS_SndData(ExchangePageBase + 52, ExchangepageAddr); + RTS_SndData(ExchangePageBase + 53, ExchangepageAddr); //card.startFileprint(); //print_job_timer.power_off_start(); @@ -1855,6 +1807,7 @@ void onFilamentRunout(extruder_t extruder) } void onUserConfirmRequired(const char *const msg) { + PrintStatue[1] = 1; // for returning the corresponding page PrinterStatusKey[1] = 4; TPShowStatus = false; FilementStatus[0] = 2; @@ -1873,6 +1826,10 @@ void onFactoryReset() } void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval) { + if(waitway==3) + if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) + rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); + bool zig = true; for (uint8_t yCount = 0, showcount = 0; yCount < GRID_MAX_POINTS_Y; yCount++) {