touch fix + ui improvements

Author: adequator

Diff for: Marlin/Configuration.h

@@ -104,10 +104,11 @@
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
-#define SERIAL_PORT 0
 
 #if MOTHERBOARD == BOARD_MKS_ROBIN_NANO_V3
   #define SERIAL_PORT -1
+#else
+  #define SERIAL_PORT 0
 #endif
 
 
@@ -3196,7 +3197,9 @@
   //#define DISABLE_ENCODER         // Disable the click encoder, if any
   //#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S.
 
-  //#define TOUCH_SCREEN_CALIBRATION
+#if MOTHERBOARD == BOARD_LINUX_RAMPS
+  #define TOUCH_SCREEN_CALIBRATION
+#endif
 
   //#define TOUCH_CALIBRATION_X 12316
   //#define TOUCH_CALIBRATION_Y -8981

Diff for: Marlin/src/inc/Conditionals_LCD.h

@@ -1490,7 +1490,12 @@
   #define TFT_INTERFACE_SPI
 #elif ENABLED(MKS_TS35_V2_0_VERTICAL)
   #define TFT_DEFAULT_DRIVER ST7796
-  #define TFT_DEFAULT_ORIENTATION  TFT_INVERT_Y
+  #define TFT_DEFAULT_ORIENTATION TFT_INVERT_Y
+  #define TOUCH_ORIENTATION TOUCH_PORTRAIT
+  #define TOUCH_CALIBRATION_X            11579
+  #define TOUCH_CALIBRATION_Y            17253
+  #define TOUCH_OFFSET_X                   -24
+  #define TOUCH_OFFSET_Y                   -42
   #define TFT_RES_320x480
   #define TFT_INTERFACE_SPI
 #elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35)                                    // ST7796

Diff for: Marlin/src/lcd/tft/touch.cpp

@@ -63,11 +63,8 @@ void Touch::init() {
   enable();
 }
 
-//void Touch::add_control(TouchControlType type, uint16_t x, uint16_t y, uint16_t width, uint16_t height, intptr_t data) {   //   TEST !!!!!!!!!!!!!!
-void Touch::add_control(TouchControlType type, uint16_t y, uint16_t x, uint16_t height, uint16_t width, intptr_t data) {
-  //y = 320 - x;
-  //y = y;
-  x = 480 - x - width;
+void Touch::add_control(TouchControlType type, uint16_t x, uint16_t y, uint16_t width, uint16_t height, intptr_t data) {   //   TEST !!!!!!!!!!!!!!
+
   if (controls_count == MAX_CONTROLS) return;
 
   controls[controls_count].type = type;
@@ -115,6 +112,11 @@ void Touch::idle() {
     if (PENDING(last_touch_ms, time_to_hold)) return;
 
     if (x != 0 && y != 0) {
+      // char msg[20];
+      // sprintf_P(msg, "(%d, %d)", x, y);
+      // ui.set_status(msg);
+      // return;
+
       if (current_control) {
         if (WITHIN(x, current_control->x - FREE_MOVE_RANGE, current_control->x + current_control->width + FREE_MOVE_RANGE) && WITHIN(y, current_control->y - FREE_MOVE_RANGE, current_control->y + current_control->height + FREE_MOVE_RANGE)) {
           NOLESS(x, current_control->x);

Diff for: Marlin/src/lcd/tft/ui_320x480.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "../../inc/MarlinConfigPre.h"
+#include "../../HAL/shared/Marduino.h"
 
 #if HAS_UI_320x480
 
@@ -323,29 +324,29 @@ void MarlinUI::draw_status_screen() {
     TERN_(SDSUPPORT, add_control(20, 190, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
   #endif                                                                                                  //SD           !!!!!!!!!!!!!!!!
 
-  y += TERN(HAS_UI_480x272, 36, 44);
   // print duration
-  char buffer[14];
+  const uint8_t progress = ui.get_progress_percent();
+  char buffer[30];
   duration_t elapsed = print_job_timer.duration();
   elapsed.toDigital(buffer);
 
-  tft.canvas(96, 325, 128, 30);
+  sprintf_P(buffer, PSTR("%s    %d %%"), buffer, progress);
+
+  tft.canvas(96, 400, 128, 30);
   tft.set_background(COLOR_BACKGROUND);
   tft_string.set(buffer);
   tft.add_text(tft_string.center(128), 0, COLOR_PRINT_TIME, tft_string);
 
-  y += TERN(HAS_UI_480x272, 28, 36);
   // progress bar
-  const uint8_t progress = ui.get_progress_percent();
-  tft.canvas(4, 380, 312, 9);
+  //const uint8_t progress = ui.get_progress_percent();
+  tft.canvas(4, 433, 312, 9);
   tft.set_background(COLOR_PROGRESS_BG);
   tft.add_rectangle(0, 0, 312, 9, COLOR_PROGRESS_FRAME);
   if (progress)
     tft.add_bar(1, 1, (310 * progress) / 100, 7, COLOR_PROGRESS_BAR);
 
-  y += 20;
   // status message
-  tft.canvas(0, 400, 320, 30);
+  tft.canvas(0, 445, 320, 30);
   tft.set_background(COLOR_BACKGROUND);
   tft_string.set(status_message);
   tft_string.trim();