re layout

bigtreetech · Oct 29, 2020 · 0457276 · 0457276
1 parent a2b6e19
commit 0457276
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 14 deletions.
diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c
@@ -166,6 +166,11 @@ void initMachineSetting(void){
 
 void setupMachine(void)
 {
+  // Avoid repeated calls caused by manually sending M115 in terminal menu
+  static bool firstCall = true;
+  if (!firstCall) return;
+  firstCall = false;
+
   #ifdef ENABLE_BL_VALUE
     #if ENABLE_BL_VALUE == 2
         infoMachineSettings.leveling = BL_ABL;

diff --git a/TFT/src/User/Menu/SendGcode.c b/TFT/src/User/Menu/SendGcode.c
@@ -220,34 +220,64 @@ void sendGcodeTerminalCache(char *stream, TERMINAL_SRC src)
 
 #define CURSOR_START_X 0
 #define CURSOR_END_X   LCD_WIDTH
-#define CURSOR_START_Y TITLE_END_Y
-#define CURSOR_END_Y   LCD_HEIGHT
-#define HALF_HEIGHT ((LCD_HEIGHT-CURSOR_START_Y)/2)
+#define CURSOR_START_Y 0
+#define CURSOR_END_Y   (LCD_HEIGHT - TITLE_END_Y)
+
+const GUI_RECT terminalRect[] = {
+  {0, CURSOR_END_Y, LCD_WIDTH / 3, LCD_HEIGHT},
+  {LCD_WIDTH / 3, CURSOR_END_Y,  2 * LCD_WIDTH / 3, LCD_HEIGHT},
+  {2 * LCD_WIDTH / 3, CURSOR_END_Y, LCD_WIDTH, LCD_HEIGHT},
+};
+
+const char *terminalString[] = {"<", ">", "Back"};
+
+void terminalReDrawButton(u8 position, u8 pressed)
+{
+  if(position > COUNT(terminalString)) return;
+  if(pressed)
+  {
+    GUI_SetColor(BLACK);
+    GUI_SetBkColor(WHITE);
+  }
+  else
+  {
+    GUI_SetColor(WHITE);
+    GUI_SetBkColor(BLACK);
+  }
+
+  GUI_ClearPrect(terminalRect + position);
+  GUI_DispStringInPrect(terminalRect + position, (const u8 *)terminalString[position]);
+
+  GUI_SetColor(BLACK);
+  GUI_SetBkColor(GRAY);
+}
 
 void menuTerminal(void)
 {
-  const GUI_RECT terminalRect[] = {
-    {0, CURSOR_START_Y, LCD_WIDTH, HALF_HEIGHT+CURSOR_START_Y},
-    {0, HALF_HEIGHT+CURSOR_START_Y, LCD_WIDTH, LCD_HEIGHT},
-    {0, 0, LCD_WIDTH, CURSOR_START_Y},
-    };
   CHAR_INFO info;
   int16_t cursorX = CURSOR_START_X,
           cursorY = CURSOR_START_Y;
   uint16_t lastTerminalIndex = 0;
   uint16_t key_num = IDLE_TOUCH;
   uint8_t pageBufIndex = 0;
-  GUI_ClearRect(0, 0, LCD_WIDTH, CURSOR_START_Y);
-  GUI_DispStringInRect(0, 0, LCD_WIDTH, CURSOR_START_Y, (uint8_t *)"B A C K");
-  // GUI_DispStringInRect(0, 0, LCD_WIDTH, CURSOR_START_Y, textSelect(LABEL_TOUCH_TO_EXIT));
+
+  GUI_ClearRect(0, CURSOR_END_Y, LCD_WIDTH, LCD_HEIGHT);
+  GUI_SetTextMode(GUI_TEXTMODE_TRANS);
+  for (uint8_t i = 0; i < COUNT(terminalString); i++)
+  {
+    GUI_DispStringInPrect(terminalRect + i, (const u8 *)terminalString[i]);
+  }
+  GUI_SetTextMode(GUI_TEXTMODE_NORMAL);
+
   GUI_SetColor(BLACK);
   GUI_SetBkColor(GRAY);
   GUI_ClearRect(CURSOR_START_X, CURSOR_START_Y, CURSOR_END_X, CURSOR_END_Y);
-  TSC_ReDrawIcon = NULL; // Disable icon redraw callback function
+
+  setMenu(MENU_TYPE_FULLSCREEN, NULL, COUNT(terminalRect), terminalRect, terminalReDrawButton);
 
   while(infoMenu.menu[infoMenu.cur] == menuTerminal)
   {
-    key_num = KEY_GetValue(3, &terminalRect);
+    key_num = KEY_GetValue(3, terminalRect);
     switch (key_num)
     {
       case GKEY_0:              //page up

diff --git a/TFT/src/User/Menu/SendGcode.h b/TFT/src/User/Menu/SendGcode.h
@@ -7,7 +7,7 @@ extern "C" {
 
 #include "menu.h"
 
-#define TERMINAL_MAX_CHAR (LCD_WIDTH/BYTE_WIDTH * (LCD_HEIGHT - BYTE_HEIGHT) /BYTE_HEIGHT * 4)
+#define TERMINAL_MAX_CHAR ((LCD_WIDTH / BYTE_WIDTH) * (LCD_HEIGHT / BYTE_HEIGHT) * 4)
 #define MAX_BUFF  20
 
 typedef enum