瀏覽代碼

Minor FTDI EVE Touch UI fixes (#21232)

Marcio T 4 年之前
父節點
當前提交
f52cba6aff
No account linked to committer's email address

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp 查看文件

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-#include "../../../../inc/MarlinConfigPre.h"
23
+#include "../../../../../inc/MarlinConfigPre.h"
24 24
 
25 25
 #if ENABLED(DGUS_LCD_UI_MKS)
26 26
 

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp 查看文件

@@ -187,7 +187,7 @@ bool LoadChocolateScreen::onTouchHeld(uint8_t tag) {
187 187
       break;
188 188
     }
189 189
     case 3: {
190
-      if (get_chocolate_fill_level() > 0.9) {
190
+      if (get_chocolate_fill_level() > 0.75) {
191 191
         mydata.repeat_tag = 0;
192 192
         return false;
193 193
       }

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h 查看文件

@@ -32,12 +32,12 @@ struct LoadChocolateScreenData {
32 32
 
33 33
 class LoadChocolateScreen : public BaseScreen, public CachedScreen<LOAD_CHOCOLATE_SCREEN_CACHE> {
34 34
   private:
35
-    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
36 35
     static void draw_syringe(draw_mode_t what);
37 36
     static void draw_arrows(draw_mode_t what);
38 37
     static void draw_buttons(draw_mode_t what);
39 38
     static void draw_text(draw_mode_t what);
40 39
   public:
40
+    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
41 41
     static void onEntry();
42 42
     static void onIdle();
43 43
     static void onRedraw(draw_mode_t);

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp 查看文件

@@ -34,7 +34,7 @@ constexpr static MoveAxisScreenData &mydata = screen_data.MoveAxisScreen;
34 34
 
35 35
 void MoveEScreen::onRedraw(draw_mode_t what) {
36 36
   widgets_t w(what);
37
-  w.precision(1);
37
+  w.precision(1, DEFAULT_MIDRANGE);
38 38
   w.units(GET_TEXT_F(MSG_UNITS_MM));
39 39
   w.heading(                           GET_TEXT_F(MSG_E_MOVE));
40 40
   w.color(Theme::e_axis);

+ 2
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp 查看文件

@@ -235,7 +235,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
235 235
 
236 236
 bool StatusScreen::onTouchEnd(uint8_t tag) {
237 237
   switch (tag) {
238
-    case  1: SpinnerDialogBox::enqueueAndWait_P(F("G0 X0 Y0")); break;
238
+    case  1: SpinnerDialogBox::enqueueAndWait_P(F("G28 O\nG27")); break;
239 239
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
240 240
     case  3: GOTO_SCREEN(PreheatMenu); break;
241 241
     case  4: GOTO_SCREEN(MainMenu); break;
@@ -274,8 +274,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
274 274
 
275 275
 bool StatusScreen::onTouchHeld(uint8_t tag) {
276 276
   if (tag == 8 && !ExtUI::isMoving()) {
277
-    increment = 0.05;
278
-    MoveAxisScreen::setManualFeedrate(E0, increment);
277
+    LoadChocolateScreen::setManualFeedrateAndIncrement(1, increment);
279 278
     UI_INCREMENT(AxisPosition_mm, E0);
280 279
     current_screen.onRefresh();
281 280
   }

+ 1
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp 查看文件

@@ -100,6 +100,7 @@ SCREEN_TABLE {
100 100
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
101 101
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
102 102
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
103
+  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_ADVANCED_SETTINGS_MENU)
103 104
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
104 105
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
105 106
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)

Loading…
取消
儲存