Robin nano V2, TFT_LVGL_UI parameter adjustment

Marlin/src/MarlinCore.cpp

@@ -63,6 +63,7 @@
   #include "lvgl.h"
   #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
   #include "lcd/extui/lib/mks_ui/draw_ui.h"
+  #include "lcd/extui/lib/mks_ui/mks_hardware_test.h"
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)

Marlin/src/core/boards.h

@@ -311,6 +311,7 @@
 #define BOARD_CHITU3D_V5              4030  // Chitu3D TronXY X5SA V5 Board
 #define BOARD_CHITU3D_V6              4031  // Chitu3D TronXY X5SA V5 Board
 #define BOARD_CREALITY_V4             4032  // Creality v4.x (STM32F103RE)
+#define BOARD_MKS_ROBIN_NANO_V2       4033  // MKS Robin Nano V2 (STM32F103VET6)
 
 //
 // ARM Cortex-M4F

Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp

@@ -27,6 +27,7 @@
   #include <SPI.h>
   #include "../../../../inc/MarlinConfig.h"
   #include "SPI_TFT.h"
+  #include "pic_manager.h"
 
   TFT SPI_TFT;
 
@@ -145,18 +146,28 @@
     LCD_WR_DATA(y >> 8);
     LCD_WR_DATA(y);
   }
+void TFT::SetPoit(uint16_t x,uint16_t y,uint16_t point)
+{
+    if ( (x>480)||(y>320) ) return;
+
+    SetCursor(x,y); 
+
+    LCD_WriteRAM_Prepare(); 
+    LCD_WR_DATA((uint8_t)(point >> 8));
+    LCD_WR_DATA((uint8_t)point);
+}
   void TFT::SetWindows(uint16_t x, uint16_t y, uint16_t with, uint16_t height) {
     LCD_WR_REG(0x2a);
     LCD_WR_DATA(x >> 8);
     LCD_WR_DATA(x);
-    LCD_WR_DATA((x + with) >> 8);
-    LCD_WR_DATA((x + with));
+	LCD_WR_DATA((x+with-1)>>8);
+	LCD_WR_DATA((x+with-1));	
 
     LCD_WR_REG(0x2b);
     LCD_WR_DATA(y >> 8);
     LCD_WR_DATA(y);
-    LCD_WR_DATA((y + height) >> 8);
-    LCD_WR_DATA(y + height);
+	LCD_WR_DATA((y+height-1)>>8);
+	LCD_WR_DATA(y+height-1);		
   }
   void TFT::LCD_init() {
     SPI_TFT_RST_H;
@@ -237,12 +248,13 @@
     LCD_WR_REG(0x29);     // Display ON
 
     LCD_clear(0x0000);    //
+	LCD_Draw_Logo();
     SPI_TFT_BLK_H;
+	delay(2000);
 
   }
   void TFT::LCD_clear(uint16_t color) {
-    unsigned int i, m;
-    uint32_t count;
+  	unsigned int i;
     uint8_t tbuf[960];
 
     SetCursor(0, 0);
@@ -267,5 +279,63 @@
     }
     SPI_TFT_CS_H;
   }
+
+extern unsigned char bmp_public_buf[17 * 1024];
+void TFT::LCD_Draw_Logo()
+{  
+	uint16_t i,y_off = 0;
+	uint16_t *p_index;
+	uint16_t Color;
+
+	#if 1
+	for(y_off = 0; y_off < 320; y_off ++)
+	{
+		Pic_Logo_Read((uint8_t *)"", (uint8_t *)bmp_public_buf, 960);
+
+		SPI_TFT.spi_init(SPI_FULL_SPEED);
+		SetWindows(0, y_off, 480, 1);
+		LCD_WriteRAM_Prepare(); /* Prepare to write GRAM */ 
+		for(i=0;i<960;)
+		{
+			p_index = (uint16_t *)(&bmp_public_buf[i]);
+
+		       Color = (*p_index >> 8);
+			*p_index = Color | ((*p_index & 0xff) << 8);
+			i+=2;
+		}
+		SPI_TFT_CS_L;
+		SPI_TFT_DC_H;
+		SPI.dmaSend(bmp_public_buf,960,true);
+		SPI_TFT_CS_H;	
+	}
+	SetWindows(0, 0, 479, 319);
+	#else
+	for(index = 0; index < 40; index ++)
+	{
+		Pic_Logo_Read((uint8_t *)"", bmp_public_buf, 480*8*2);
+
+		i = 0;
+		SetCursor(0,0);
+		SetWindows(0, y_off * 8, 480, 8);
+		LCD_WriteRAM_Prepare(); /* Prepare to write GRAM */ 
+		for(i=0;i<480*8*2;)
+		{
+			p_index = (uint16_t *)(&bmp_public_buf[i]);
+
+		       Color = (*p_index >> 8);
+			*p_index = Color | ((*p_index & 0xff) << 8);
+			i+=2;
+		}
+		SPI_TFT_CS_L;
+		SPI_TFT_DC_H;
+		SPI.dmaSend(bmp_public_buf,480*8*2,true);
+		SPI_TFT_CS_H;
+
+		y_off++;		
+
+	}
+	SetWindows(0, 0, 479, 319);
+	#endif
+}
 
 #endif // SPI_GRAPHICAL_TFT

Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h

@@ -46,10 +46,12 @@ class TFT {
   void LCD_WR_REG(uint8_t cmd);
   void LCD_WR_DATA(uint8_t data);
   void SetCursor(uint16_t x, uint16_t y);
+	void SetPoit(uint16_t x,uint16_t y,uint16_t point);
   void SetWindows(uint16_t x, uint16_t y, uint16_t with, uint16_t height);
   void LCD_init();
   void LCD_clear(uint16_t color);
   void LCD_WriteRAM_Prepare();
+	void LCD_Draw_Logo();
 };
 
 extern TFT SPI_TFT;

Marlin/src/lcd/extui/lib/mks_ui/W25Qxx.cpp

@@ -131,7 +131,7 @@ void ext_FLASH::spi_flash_SendBlock(uint8_t token, const uint8_t* buf) {
 uint16_t ext_FLASH::W25QXX_ReadID(void) {
   uint16_t Temp = 0;
   W25QXX_CS_L;
-  spi_flash_Send(0x90);//���Ͷ�ȡID����
+  spi_flash_Send(0x90);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);

Marlin/src/lcd/extui/lib/mks_ui/W25Qxx.h

@@ -56,38 +56,38 @@
 
   #define PIC_NAME_MAX_LEN        50
 
-  #define LOGO_MAX_SIZE           (300*1024)//logo���ֵ
-  #define TITLELOGO_MAX_SIZE      (150*1024)//logo���ֵ
+  #define LOGO_MAX_SIZE           (300*1024)
+  #define TITLELOGO_MAX_SIZE      (150*1024)
   #define DEFAULT_VIEW_MAX_SIZE   (200*200*2)
   #define FLASH_VIEW_MAX_SIZE     (200*200*2)
 
   //ͼƬ
   //Robin2�洢��ַ
-  #define PIC_NAME_ADDR           0x003000  //ͼƬ��Ϣ�洢��ַ��ͼƬ����
-  #define PIC_SIZE_ADDR           0x007000  //ͼƬ��Ϣ�洢��ַ��ͼƬ��Сֵ
-  #define PIC_COUNTER_ADDR        0x008000  //ͼƬ������ֵ�洢��ַ
-  #define PIC_LOGO_ADDR           0x009000  //ͼƬlogo�洢��ַ
-  //#define PIC_DATA_ADDR         0x02f000  //ͼƬ���ݴ洢��ַ
+  #define PIC_NAME_ADDR           0x003000  
+  #define PIC_SIZE_ADDR           0x007000  
+  #define PIC_COUNTER_ADDR        0x008000  
+  #define PIC_LOGO_ADDR           0x009000  
+  //#define PIC_DATA_ADDR         0x02f000  
 
   #define DEFAULT_VIEW_ADDR       0XC5800
   #define BAK_VIEW_ADDR           (DEFAULT_VIEW_ADDR+90*1024)
   #define PIC_ICON_LOGO_ADDR      (BAK_VIEW_ADDR+80*1024)
 
-  #define PIC_DATA_ADDR           (PIC_ICON_LOGO_ADDR+350*1024) //ͼƬ���ݴ洢��ַ//(800*240)
+  #define PIC_DATA_ADDR           (PIC_ICON_LOGO_ADDR+350*1024) 
 
   // �ֿ�
-  #define FONTINFOADDR            0x600000 // 6M�Ժ��ַΪ�ֿ�
+  #define FONTINFOADDR            0x600000 
   #define UNIGBK_FLASH_ADDR       (FONTINFOADDR+4096) // 4*1024
   #define GBK_FLASH_ADDR          (UNIGBK_FLASH_ADDR+180224) // 176*1024
 
-  #define PER_PIC_MAX_SPACE       (32*1024) // Ϊ�˷�ֹ����Խ������⣬ÿ��СͼƬ�����仮��Ӧ��ȡ�ܹ�����4K��ֵ
+  #define PER_PIC_MAX_SPACE       (32*1024) 
 
   //
   union union32 {
     uint8_t bytes[4];
     uint32_t dwords;
   };
-  // ͼƬ��Ϣ�ṹ��
+
   struct pic_msg {
     uint8_t name[PIC_NAME_MAX_LEN];
     union union32 size;

Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp

@@ -78,8 +78,10 @@ void lv_draw_about(void) {
   /*Create an Image button*/
   buttonBack = lv_imgbtn_create(scr, NULL);
 
-  #if 1
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_A_RETURN, "bmp_Return.bin", 0);
+	#if 1
+
+
+	lv_obj_set_event_cb_mks(buttonBack, event_handler,ID_A_RETURN,"bmp_return.bin",0);	
     lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, &bmp_pic);
     lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, &bmp_pic);
     lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_lable_pre);
@@ -109,6 +111,8 @@ void lv_draw_about(void) {
       "Firmware: Robin_Pro35"
     #elif MB(MKS_ROBIN_NANO)
       "Firmware: Robin_Nano35"
+    #elif MB(MKS_ROBIN_NANO_V2)
+      "Firmware: Robin_Nano35"
     #else
       CUSTOM_MACHINE_NAME
     #endif