Minor FTDI EVE Touch UI fixes (MarlinFirmware#21232)

vyacheslav-shubin · Mar 10, 2021 · eee5bf7 · eee5bf7
1 parent ac5c748
commit eee5bf7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_MKS)
 

diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp b/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) {
       break;
     }
     case 3: {
-      if (get_chocolate_fill_level() > 0.9) {
+      if (get_chocolate_fill_level() > 0.75) {
         mydata.repeat_tag = 0;
         return false;
       }

diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
@@ -32,12 +32,12 @@ struct LoadChocolateScreenData {
 
 class LoadChocolateScreen : public BaseScreen, public CachedScreen<LOAD_CHOCOLATE_SCREEN_CACHE> {
   private:
-    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
     static void draw_syringe(draw_mode_t what);
     static void draw_arrows(draw_mode_t what);
     static void draw_buttons(draw_mode_t what);
     static void draw_text(draw_mode_t what);
   public:
+    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
     static void onEntry();
     static void onIdle();
     static void onRedraw(draw_mode_t);

diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp b/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;
 
 void MoveEScreen::onRedraw(draw_mode_t what) {
   widgets_t w(what);
-  w.precision(1);
+  w.precision(1, DEFAULT_MIDRANGE);
   w.units(GET_TEXT_F(MSG_UNITS_MM));
   w.heading(                           GET_TEXT_F(MSG_E_MOVE));
   w.color(Theme::e_axis);

diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
@@ -235,7 +235,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
 
 bool StatusScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case  1: SpinnerDialogBox::enqueueAndWait_P(F("G0 X0 Y0")); break;
+    case  1: SpinnerDialogBox::enqueueAndWait_P(F("G28 O\nG27")); break;
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
     case  3: GOTO_SCREEN(PreheatMenu); break;
     case  4: GOTO_SCREEN(MainMenu); break;
@@ -274,8 +274,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
 
 bool StatusScreen::onTouchHeld(uint8_t tag) {
   if (tag == 8 && !ExtUI::isMoving()) {
-    increment = 0.05;
-    MoveAxisScreen::setManualFeedrate(E0, increment);
+    LoadChocolateScreen::setManualFeedrateAndIncrement(1, increment);
     UI_INCREMENT(AxisPosition_mm, E0);
     current_screen.onRefresh();
   }

diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
@@ -100,6 +100,7 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
+  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_ADVANCED_SETTINGS_MENU)
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)