Pārlūkot izejas kodu

Minor FTDI EVE Touch UI fixes (#21232)

Marcio T 4 gadus atpakaļ
vecāks
revīzija
f52cba6aff
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp Parādīt failu

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
-#include "../../../../inc/MarlinConfigPre.h"
23
+#include "../../../../../inc/MarlinConfigPre.h"
24
 
24
 
25
 #if ENABLED(DGUS_LCD_UI_MKS)
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 Parādīt failu

187
       break;
187
       break;
188
     }
188
     }
189
     case 3: {
189
     case 3: {
190
-      if (get_chocolate_fill_level() > 0.9) {
190
+      if (get_chocolate_fill_level() > 0.75) {
191
         mydata.repeat_tag = 0;
191
         mydata.repeat_tag = 0;
192
         return false;
192
         return false;
193
       }
193
       }

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h Parādīt failu

32
 
32
 
33
 class LoadChocolateScreen : public BaseScreen, public CachedScreen<LOAD_CHOCOLATE_SCREEN_CACHE> {
33
 class LoadChocolateScreen : public BaseScreen, public CachedScreen<LOAD_CHOCOLATE_SCREEN_CACHE> {
34
   private:
34
   private:
35
-    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
36
     static void draw_syringe(draw_mode_t what);
35
     static void draw_syringe(draw_mode_t what);
37
     static void draw_arrows(draw_mode_t what);
36
     static void draw_arrows(draw_mode_t what);
38
     static void draw_buttons(draw_mode_t what);
37
     static void draw_buttons(draw_mode_t what);
39
     static void draw_text(draw_mode_t what);
38
     static void draw_text(draw_mode_t what);
40
   public:
39
   public:
40
+    static void setManualFeedrateAndIncrement(float feedrate_mm_s, float &increment);
41
     static void onEntry();
41
     static void onEntry();
42
     static void onIdle();
42
     static void onIdle();
43
     static void onRedraw(draw_mode_t);
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 Parādīt failu

34
 
34
 
35
 void MoveEScreen::onRedraw(draw_mode_t what) {
35
 void MoveEScreen::onRedraw(draw_mode_t what) {
36
   widgets_t w(what);
36
   widgets_t w(what);
37
-  w.precision(1);
37
+  w.precision(1, DEFAULT_MIDRANGE);
38
   w.units(GET_TEXT_F(MSG_UNITS_MM));
38
   w.units(GET_TEXT_F(MSG_UNITS_MM));
39
   w.heading(                           GET_TEXT_F(MSG_E_MOVE));
39
   w.heading(                           GET_TEXT_F(MSG_E_MOVE));
40
   w.color(Theme::e_axis);
40
   w.color(Theme::e_axis);

+ 2
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp Parādīt failu

235
 
235
 
236
 bool StatusScreen::onTouchEnd(uint8_t tag) {
236
 bool StatusScreen::onTouchEnd(uint8_t tag) {
237
   switch (tag) {
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
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
239
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
240
     case  3: GOTO_SCREEN(PreheatMenu); break;
240
     case  3: GOTO_SCREEN(PreheatMenu); break;
241
     case  4: GOTO_SCREEN(MainMenu); break;
241
     case  4: GOTO_SCREEN(MainMenu); break;
274
 
274
 
275
 bool StatusScreen::onTouchHeld(uint8_t tag) {
275
 bool StatusScreen::onTouchHeld(uint8_t tag) {
276
   if (tag == 8 && !ExtUI::isMoving()) {
276
   if (tag == 8 && !ExtUI::isMoving()) {
277
-    increment = 0.05;
278
-    MoveAxisScreen::setManualFeedrate(E0, increment);
277
+    LoadChocolateScreen::setManualFeedrateAndIncrement(1, increment);
279
     UI_INCREMENT(AxisPosition_mm, E0);
278
     UI_INCREMENT(AxisPosition_mm, E0);
280
     current_screen.onRefresh();
279
     current_screen.onRefresh();
281
   }
280
   }

+ 1
- 0
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp Parādīt failu

100
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
100
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
101
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
101
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
102
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
102
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
103
+  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_ADVANCED_SETTINGS_MENU)
103
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
104
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
104
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
105
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
105
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)
106
   DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)

Notiek ielāde…
Atcelt
Saglabāt