FTDI EVE custom user menus

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp

@@ -0,0 +1,215 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../config.h"
+
+#if BOTH(TOUCH_UI_FTDI_EVE, CUSTOM_USER_MENUS) && NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace ExtUI;
+using namespace Theme;
+
+#define _ITEM_TAG(N) (10+N)
+#define _USER_DESC(N) USER_DESC_##N
+#define _USER_GCODE(N) USER_GCODE_##N
+#define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N))
+#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
+
+#define _HAS_1(N) (defined(USER_DESC_##N) && defined(USER_GCODE_##N))
+#define HAS_USER_ITEM(V...) DO(HAS,||,V)
+
+void CustomUserMenus::onRedraw(draw_mode_t what) {
+  if (what & BACKGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+       .cmd(CLEAR(true, true, true));
+  }
+
+  #if HAS_USER_ITEM(16, 17, 18, 19, 20)
+    #define _MORE_THAN_FIFTEEN 1
+  #else
+    #define _MORE_THAN_FIFTEEN 0
+  #endif
+  #if _MORE_THAN_FIFTEEN || HAS_USER_ITEM(11, 12, 13, 14, 15)
+    #define _MORE_THAN_TEN 1
+  #else
+    #define _MORE_THAN_TEN 0
+  #endif
+
+  #ifdef TOUCH_UI_PORTRAIT
+    #define GRID_ROWS 11
+    #define GRID_COLS (1 + _MORE_THAN_TEN)
+    #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)
+    #define BACK_POS         BTN_POS(1,11), BTN_SIZE(1,1)
+  #else
+    #if _MORE_THAN_TEN || HAS_USER_ITEM(6, 7, 8, 9, 10)
+      #define _MORE_THAN_FIVE 1
+    #else
+      #define _MORE_THAN_FIVE 0
+    #endif
+    #define GRID_ROWS 6
+    #define GRID_COLS (1 + _MORE_THAN_FIVE + _MORE_THAN_TEN + _MORE_THAN_FIFTEEN)
+    #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/5)), ((N-1) % 5 + 1)), BTN_SIZE(1,1)
+    #define BACK_POS         BTN_POS(1,6), BTN_SIZE(GRID_COLS,1)
+  #endif
+
+  if (what & FOREGROUND) {
+    CommandProcessor cmd;
+    cmd.colors(normal_btn)
+       .font(Theme::font_medium)
+       #if HAS_USER_ITEM(1)
+        _USER_ITEM(1)
+       #endif
+       #if HAS_USER_ITEM(2)
+        _USER_ITEM(2)
+       #endif
+       #if HAS_USER_ITEM(3)
+        _USER_ITEM(3)
+       #endif
+       #if HAS_USER_ITEM(4)
+        _USER_ITEM(4)
+       #endif
+       #if HAS_USER_ITEM(5)
+        _USER_ITEM(5)
+       #endif
+       #if HAS_USER_ITEM(6)
+        _USER_ITEM(6)
+       #endif
+       #if HAS_USER_ITEM(7)
+        _USER_ITEM(7)
+       #endif
+       #if HAS_USER_ITEM(8)
+        _USER_ITEM(8)
+       #endif
+       #if HAS_USER_ITEM(9)
+        _USER_ITEM(9)
+       #endif
+       #if HAS_USER_ITEM(10)
+        _USER_ITEM(10)
+       #endif
+       #if HAS_USER_ITEM(11)
+        _USER_ITEM(11)
+       #endif
+       #if HAS_USER_ITEM(12)
+        _USER_ITEM(12)
+       #endif
+       #if HAS_USER_ITEM(13)
+        _USER_ITEM(13)
+       #endif
+       #if HAS_USER_ITEM(14)
+        _USER_ITEM(14)
+       #endif
+       #if HAS_USER_ITEM(15)
+        _USER_ITEM(15)
+       #endif
+       #if HAS_USER_ITEM(16)
+        _USER_ITEM(16)
+       #endif
+       #if HAS_USER_ITEM(17)
+        _USER_ITEM(17)
+       #endif
+       #if HAS_USER_ITEM(18)
+        _USER_ITEM(18)
+       #endif
+       #if HAS_USER_ITEM(19)
+        _USER_ITEM(19)
+       #endif
+       #if HAS_USER_ITEM(20)
+        _USER_ITEM(20)
+       #endif
+      .colors(action_btn)
+      .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+  }
+}
+
+bool CustomUserMenus::onTouchEnd(uint8_t tag) {
+  switch (tag) {
+    #if HAS_USER_ITEM(1)
+      _USER_ACTION(1)
+    #endif
+    #if HAS_USER_ITEM(2)
+      _USER_ACTION(2)
+    #endif
+    #if HAS_USER_ITEM(3)
+      _USER_ACTION(3)
+    #endif
+    #if HAS_USER_ITEM(4)
+      _USER_ACTION(4)
+    #endif
+    #if HAS_USER_ITEM(5)
+      _USER_ACTION(5)
+    #endif
+    #if HAS_USER_ITEM(6)
+      _USER_ACTION(6)
+    #endif
+    #if HAS_USER_ITEM(7)
+      _USER_ACTION(7)
+    #endif
+    #if HAS_USER_ITEM(8)
+      _USER_ACTION(8)
+    #endif
+    #if HAS_USER_ITEM(9)
+      _USER_ACTION(9)
+    #endif
+    #if HAS_USER_ITEM(10)
+      _USER_ACTION(10)
+    #endif
+    #if HAS_USER_ITEM(11)
+      _USER_ACTION(11)
+    #endif
+    #if HAS_USER_ITEM(12)
+      _USER_ACTION(12)
+    #endif
+    #if HAS_USER_ITEM(13)
+      _USER_ACTION(13)
+    #endif
+    #if HAS_USER_ITEM(14)
+      _USER_ACTION(14)
+    #endif
+    #if HAS_USER_ITEM(15)
+      _USER_ACTION(15)
+    #endif
+    #if HAS_USER_ITEM(16)
+      _USER_ACTION(16)
+    #endif
+    #if HAS_USER_ITEM(17)
+      _USER_ACTION(17)
+    #endif
+    #if HAS_USER_ITEM(18)
+      _USER_ACTION(18)
+    #endif
+    #if HAS_USER_ITEM(19)
+      _USER_ACTION(19)
+    #endif
+    #if HAS_USER_ITEM(20)
+      _USER_ACTION(20)
+    #endif
+
+    case 1: GOTO_PREVIOUS(); break;
+    default: return false;
+  }
+  return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE && CUSTOM_USER_MENUS && !TOUCH_UI_LULZBOT_BIO && !TOUCH_UI_COCOA_PRESS

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp

@@ -1,3 +1,25 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
 /*****************
  * main_menu.cpp *
  *****************/
@@ -42,7 +64,12 @@ void MainMenu::onRedraw(draw_mode_t what) {
     #define GRID_COLS 2
     #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
     #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
-    #define FILAMENTCHANGE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
+    #if ENABLED(CUSTOM_USER_MENUS)
+      #define FILAMENTCHANGE_POS  BTN_POS(1,3), BTN_SIZE(1,1)
+      #define CUSTOM_USER_MENUS_POS BTN_POS(2,3), BTN_SIZE(1,1)
+    #else
+      #define FILAMENTCHANGE_POS  BTN_POS(1,3), BTN_SIZE(2,1)
+    #endif
     #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(2,1)
     #define DISABLE_STEPPERS_POS  BTN_POS(1,5), BTN_SIZE(2,1)
     #define MOVE_AXIS_POS         BTN_POS(1,6), BTN_SIZE(1,1)
@@ -52,17 +79,23 @@ void MainMenu::onRedraw(draw_mode_t what) {
     #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
   #else
     #define GRID_ROWS 5
-    #define GRID_COLS 2
-    #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(1,1)
-    #define ABOUT_PRINTER_POS     BTN_POS(2,1), BTN_SIZE(1,1)
-    #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(1,1)
-    #define CLEAN_NOZZLE_POS      BTN_POS(2,2), BTN_SIZE(1,1)
-    #define MOVE_AXIS_POS         BTN_POS(1,3), BTN_SIZE(1,1)
-    #define DISABLE_STEPPERS_POS  BTN_POS(2,3), BTN_SIZE(1,1)
-    #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(1,1)
-    #define FILAMENTCHANGE_POS    BTN_POS(2,4), BTN_SIZE(1,1)
-    #define LEVELING_POS          BTN_POS(1,5), BTN_SIZE(1,1)
-    #define BACK_POS              BTN_POS(2,5), BTN_SIZE(1,1)
+    #define GRID_COLS 6
+    #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(3,1)
+    #define ABOUT_PRINTER_POS     BTN_POS(4,1), BTN_SIZE(3,1)
+    #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(3,1)
+    #define CLEAN_NOZZLE_POS      BTN_POS(4,2), BTN_SIZE(3,1)
+    #define MOVE_AXIS_POS         BTN_POS(1,3), BTN_SIZE(3,1)
+    #define DISABLE_STEPPERS_POS  BTN_POS(4,3), BTN_SIZE(3,1)
+    #if ENABLED(CUSTOM_USER_MENUS)
+      #define TEMPERATURE_POS     BTN_POS(1,4), BTN_SIZE(2,1)
+      #define FILAMENTCHANGE_POS  BTN_POS(3,4), BTN_SIZE(2,1)
+      #define CUSTOM_USER_MENUS_POS BTN_POS(5,4), BTN_SIZE(2,1)
+    #else
+      #define TEMPERATURE_POS     BTN_POS(1,4), BTN_SIZE(3,1)
+      #define FILAMENTCHANGE_POS  BTN_POS(4,4), BTN_SIZE(3,1)
+    #endif
+    #define LEVELING_POS          BTN_POS(1,5), BTN_SIZE(3,1)
+    #define BACK_POS              BTN_POS(4,5), BTN_SIZE(3,1)
   #endif
 
   if (what & FOREGROUND) {
@@ -81,6 +114,9 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .enabled(TERN_(HAS_LEVELING, 1))
        .tag( 9).button(LEVELING_POS,        GET_TEXT_F(MSG_LEVELING))
        .tag(10).button(ABOUT_PRINTER_POS,   GET_TEXT_F(MSG_INFO_MENU))
+       #if ENABLED(CUSTOM_USER_MENUS)
+        .tag(11).button(CUSTOM_USER_MENUS_POS, GET_TEXT_F(MSG_USER_MENU))
+       #endif
        .colors(action_btn)
        .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BACK));
   }
@@ -104,6 +140,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case 9:  GOTO_SCREEN(LevelingMenu);                               break;
     #endif
     case 10: GOTO_SCREEN(AboutScreen);                                break;
+    #if ENABLED(CUSTOM_USER_MENUS)
+      case 11: GOTO_SCREEN(CustomUserMenus);                          break;
+    #endif
+
     default:
       return false;
   }