Add 7.5 black and white four grayscale code

Author: shhds

Arduino_R4/Arduino_R4.ino

@@ -5,7 +5,7 @@ void setup() {
     // EPD_1in02d_test();
 
     // EPD_1in54_test();
-    EPD_1in54_V2_test();
+    // EPD_1in54_V2_test();
     // EPD_1in54b_test();
     // EPD_1in54b_V2_test();
     // EPD_1in54c_test();

Arduino_R4/src/Examples/EPD_7in3e_test.cpp

@@ -46,12 +46,12 @@ int EPD_7in3e_test(void)
     //Create a new image cache
     UBYTE *BlackImage;
     UDOUBLE Imagesize = ((EPD_7IN3E_WIDTH % 2 == 0)? (EPD_7IN3E_WIDTH / 2 ): (EPD_7IN3E_WIDTH / 2 + 1)) * EPD_7IN3E_HEIGHT;
-    if((BlackImage = (UBYTE *)malloc(Imagesize/8)) == NULL) {
+    if((BlackImage = (UBYTE *)malloc(Imagesize/12)) == NULL) {
         Debug("Failed to apply for black memory...\r\n");
         return -1;
     }
 #if 1   // Drawing on the image
-    Paint_NewImage(BlackImage, EPD_7IN3E_WIDTH/4, EPD_7IN3E_HEIGHT/2, 0, EPD_7IN3E_WHITE);
+    Paint_NewImage(BlackImage, EPD_7IN3E_WIDTH/4, EPD_7IN3E_HEIGHT/3, 0, EPD_7IN3E_WHITE);
     Paint_SetScale(6);
     // 1.Select Image
     Debug("SelectImage:BlackImage\r\n");
@@ -60,30 +60,30 @@ int EPD_7in3e_test(void)
 
     // 2.Drawing on the image
     Debug("Drawing:BlackImage\r\n");
-    Paint_DrawPoint(10, 80, EPD_7IN3E_RED, DOT_PIXEL_1X1, DOT_STYLE_DFT);
-    Paint_DrawPoint(10, 90, EPD_7IN3E_BLUE, DOT_PIXEL_2X2, DOT_STYLE_DFT);
-    Paint_DrawPoint(10, 100, EPD_7IN3E_GREEN, DOT_PIXEL_3X3, DOT_STYLE_DFT);
-    Paint_DrawLine(20, 70, 70, 120, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
-    Paint_DrawLine(70, 70, 20, 120, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
-    Paint_DrawRectangle(20, 70, 70, 120, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
-    Paint_DrawRectangle(80, 70, 130, 120, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL);
-    Paint_DrawCircle(45, 95, 20, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
-    Paint_DrawCircle(105, 95, 20, EPD_7IN3E_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
-    Paint_DrawLine(85, 95, 125, 95, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
-    Paint_DrawLine(105, 75, 105, 115, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
-    Paint_DrawString_CN(10, 160, "你好abc", &Font12CN, EPD_7IN3E_BLACK, EPD_7IN3E_WHITE);
-    Paint_DrawString_CN(10, 180, "微雪电子", &Font24CN, EPD_7IN3E_WHITE, EPD_7IN3E_BLACK);
-    Paint_DrawNum(10, 33, 123456789, &Font12, EPD_7IN3E_BLACK, EPD_7IN3E_WHITE);
-    Paint_DrawNum(10, 50, 987654321, &Font16, EPD_7IN3E_WHITE, EPD_7IN3E_BLACK);
+    Paint_DrawPoint(10, 50, EPD_7IN3E_RED, DOT_PIXEL_1X1, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 60, EPD_7IN3E_BLUE, DOT_PIXEL_2X2, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 70, EPD_7IN3E_GREEN, DOT_PIXEL_3X3, DOT_STYLE_DFT);
+    Paint_DrawLine(20, 40, 70, 90, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawLine(70, 40, 20, 90, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawRectangle(20, 40, 70, 90, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawRectangle(80, 40, 130, 90, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawCircle(45, 65, 20, EPD_7IN3E_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawCircle(105, 65, 20, EPD_7IN3E_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawLine(85, 65, 125, 65, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawLine(105, 45, 105, 85, EPD_7IN3E_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawString_CN(10, 100, "你好abc", &Font12CN, EPD_7IN3E_BLACK, EPD_7IN3E_WHITE);
+    Paint_DrawString_CN(10, 120, "微雪电子", &Font24CN, EPD_7IN3E_YELLOW, EPD_7IN3E_BLACK);
+    Paint_DrawNum(10, 0, 123456789, &Font12, EPD_7IN3E_BLACK, EPD_7IN3E_WHITE);
+    Paint_DrawNum(10, 17, 987654321, &Font16, EPD_7IN3E_WHITE, EPD_7IN3E_BLACK);
 	Paint_DrawString_EN(145, 0, "Waveshare", &Font16, EPD_7IN3E_BLACK, EPD_7IN3E_WHITE);
 	Paint_DrawString_EN(145, 35, "Waveshare", &Font16, EPD_7IN3E_GREEN, EPD_7IN3E_WHITE);
 	Paint_DrawString_EN(145, 70, "Waveshare", &Font16, EPD_7IN3E_BLUE, EPD_7IN3E_WHITE);
 	Paint_DrawString_EN(145, 105, "Waveshare", &Font16, EPD_7IN3E_RED, EPD_7IN3E_WHITE);
-	Paint_DrawString_EN(145, 140, "Waveshare", &Font16, EPD_7IN3E_YELLOW, EPD_7IN3E_WHITE);
+	// Paint_DrawString_EN(145, 140, "Waveshare", &Font16, EPD_7IN3E_YELLOW, EPD_7IN3E_WHITE);
 	// Paint_DrawString_EN(145, 175, "Waveshare", &Font16, EPD_7IN3E_ORANGE, EPD_7IN3E_WHITE);
 
     Debug("EPD_Display\r\n");
-    EPD_7IN3E_DisplayPart(BlackImage, 300, 120, 200, 240);
+    EPD_7IN3E_DisplayPart(BlackImage, 300, 120, 200, 160);
     DEV_Delay_ms(3000);
 #endif
 

Arduino_R4/src/Examples/EPD_7in3f_test.cpp

@@ -47,12 +47,12 @@ int EPD_7in3f_test(void)
 	//Create a new image cache
 	UBYTE *BlackImage;
 	UDOUBLE Imagesize = ((EPD_7IN3F_WIDTH % 2 == 0)? (EPD_7IN3F_WIDTH / 2 ): (EPD_7IN3F_WIDTH / 2 + 1)) * EPD_7IN3F_HEIGHT;
-	if((BlackImage = (UBYTE *)malloc(Imagesize/8)) == NULL) {
+	if((BlackImage = (UBYTE *)malloc(Imagesize/12)) == NULL) {
 		Debug("Failed to apply for black memory...\r\n");
 		return -1;
 	}
 	Debug("Paint_NewImage\r\n");
-	Paint_NewImage(BlackImage, EPD_7IN3F_WIDTH/4, EPD_7IN3F_HEIGHT/2, 0, EPD_7IN3F_WHITE);
+	Paint_NewImage(BlackImage, EPD_7IN3F_WIDTH/4, EPD_7IN3F_HEIGHT/3, 0, EPD_7IN3F_WHITE);
 	Paint_SetScale(7);
 
 #if 1
@@ -68,30 +68,30 @@ int EPD_7in3f_test(void)
 
 	// 2.Drawing on the image
 	Debug("Drawing:BlackImage\r\n");
-	Paint_DrawPoint(10, 80, EPD_7IN3F_RED, DOT_PIXEL_1X1, DOT_STYLE_DFT);
-	Paint_DrawPoint(10, 90, EPD_7IN3F_BLUE, DOT_PIXEL_2X2, DOT_STYLE_DFT);
-	Paint_DrawPoint(10, 100, EPD_7IN3F_GREEN, DOT_PIXEL_3X3, DOT_STYLE_DFT);
-	Paint_DrawLine(20, 70, 70, 120, EPD_7IN3F_ORANGE, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
-	Paint_DrawLine(70, 70, 20, 120, EPD_7IN3F_ORANGE, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
-	Paint_DrawRectangle(20, 70, 70, 120, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
-	Paint_DrawRectangle(80, 70, 130, 120, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL);
-	Paint_DrawCircle(45, 95, 20, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
-	Paint_DrawCircle(105, 95, 20, EPD_7IN3F_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
-	Paint_DrawLine(85, 95, 125, 95, EPD_7IN3F_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
-	Paint_DrawLine(105, 75, 105, 115, EPD_7IN3F_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
-	Paint_DrawString_CN(10, 160, "你好abc", &Font12CN, EPD_7IN3F_BLACK, EPD_7IN3F_WHITE);
-	Paint_DrawString_CN(10, 180, "微雪电子", &Font24CN, EPD_7IN3F_WHITE, EPD_7IN3F_BLACK);
+	Paint_DrawPoint(10, 50, EPD_7IN3F_RED, DOT_PIXEL_1X1, DOT_STYLE_DFT);
+	Paint_DrawPoint(10, 60, EPD_7IN3F_BLUE, DOT_PIXEL_2X2, DOT_STYLE_DFT);
+	Paint_DrawPoint(10, 70, EPD_7IN3F_GREEN, DOT_PIXEL_3X3, DOT_STYLE_DFT);
+	Paint_DrawLine(20, 40, 70, 90, EPD_7IN3F_ORANGE, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+	Paint_DrawLine(70, 40, 20, 90, EPD_7IN3F_ORANGE, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+	Paint_DrawRectangle(20, 40, 70, 90, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+	Paint_DrawRectangle(80, 40, 130, 90, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+	Paint_DrawCircle(45, 65, 20, EPD_7IN3F_BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+	Paint_DrawCircle(105, 65, 20, EPD_7IN3F_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+	Paint_DrawLine(85, 65, 125, 56, EPD_7IN3F_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+	Paint_DrawLine(105, 45, 105, 85, EPD_7IN3F_YELLOW, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+	Paint_DrawString_CN(10, 100, "你好abc", &Font12CN, EPD_7IN3F_YELLOW, EPD_7IN3F_WHITE);
+	Paint_DrawString_CN(10, 120, "微雪电子", &Font24CN, EPD_7IN3F_ORANGE, EPD_7IN3F_BLACK);
 	Paint_DrawNum(10, 33, 123456789, &Font12, EPD_7IN3F_BLACK, EPD_7IN3F_WHITE);
 	Paint_DrawNum(10, 50, 987654321, &Font16, EPD_7IN3F_WHITE, EPD_7IN3F_BLACK);
 	Paint_DrawString_EN(145, 0, "Waveshare", &Font16, EPD_7IN3F_BLACK, EPD_7IN3F_WHITE);
 	Paint_DrawString_EN(145, 35, "Waveshare", &Font16, EPD_7IN3F_GREEN, EPD_7IN3F_WHITE);
 	Paint_DrawString_EN(145, 70, "Waveshare", &Font16, EPD_7IN3F_BLUE, EPD_7IN3F_WHITE);
 	Paint_DrawString_EN(145, 105, "Waveshare", &Font16, EPD_7IN3F_RED, EPD_7IN3F_WHITE);
-	Paint_DrawString_EN(145, 140, "Waveshare", &Font16, EPD_7IN3F_YELLOW, EPD_7IN3F_WHITE);
-	Paint_DrawString_EN(145, 175, "Waveshare", &Font16, EPD_7IN3F_ORANGE, EPD_7IN3F_WHITE);
+	// Paint_DrawString_EN(145, 140, "Waveshare", &Font16, EPD_7IN3F_YELLOW, EPD_7IN3F_WHITE);
+	// Paint_DrawString_EN(145, 175, "Waveshare", &Font16, EPD_7IN3F_ORANGE, EPD_7IN3F_WHITE);
 
 	Debug("EPD_Display\r\n");
-	EPD_7IN3F_DisplayPart(BlackImage, 300, 120, 200, 240);
+	EPD_7IN3F_DisplayPart(BlackImage, 300, 120, 200, 160);
 	DEV_Delay_ms(3000);
 #endif
 

Arduino_R4/src/Examples/EPD_7in3g_test.cpp

@@ -88,7 +88,7 @@ int EPD_7in3g_test(void)
     Paint_DrawNum(10, 50, 123456, &Font12, EPD_7IN3G_RED, EPD_7IN3G_WHITE);
 
     Debug("EPD_Display\r\n");
-    EPD_7IN3G_Display_part(BlackImage, 200, 120, 400, 240);
+    EPD_7IN3G_Display_part(BlackImage, 200, 120, 400, 160);
     DEV_Delay_ms(3000);
 #endif
 

Arduino_R4/src/Examples/EPD_7in5_V2_test.cpp

@@ -46,7 +46,7 @@ int EPD_7in5_V2_test(void)
     //Create a new image cache
     UBYTE *BlackImage;
     /* you have to edit the startup_stm32fxxx.s file and set a big enough heap size */
-    UWORD Imagesize = ((EPD_7IN5_V2_WIDTH % 8 == 0)? (EPD_7IN5_V2_WIDTH / 8 ): (EPD_7IN5_V2_WIDTH / 8 + 1)) * EPD_7IN5_V2_HEIGHT;
+    UDOUBLE Imagesize = ((EPD_7IN5_V2_WIDTH % 8 == 0)? (EPD_7IN5_V2_WIDTH / 8 ): (EPD_7IN5_V2_WIDTH / 8 + 1)) * EPD_7IN5_V2_HEIGHT;
     if((BlackImage = (UBYTE *)malloc(Imagesize/4)) == NULL) {
         Debug("Failed to apply for black memory...\r\n");
         return -1;
@@ -132,6 +132,48 @@ int EPD_7in5_V2_test(void)
     }
 #endif
 
+/*
+    The feature will only be available on screens sold after 24/10/23
+*/
+#if 0 // show image for array
+    // free(BlackImage);
+    // printf("show Gray------------------------\r\n");
+    // Imagesize = ((EPD_7IN5_V2_WIDTH % 4 == 0)? (EPD_7IN5_V2_WIDTH / 4 ): (EPD_7IN5_V2_WIDTH / 4 + 1)) * EPD_7IN5_V2_HEIGHT;
+    // if((BlackImage = (UBYTE *)malloc(Imagesize/8)) == NULL) {
+    //     printf("Failed to apply for black memory...\r\n");
+    //     return -1;
+    // }
+    EPD_7IN5_V2_Init_4Gray();
+    printf("4 grayscale display\r\n");
+    Paint_NewImage(BlackImage, EPD_7IN5_V2_WIDTH/4, EPD_7IN5_V2_HEIGHT/2, 0, WHITE);
+    Paint_SetScale(4);
+    Paint_Clear(0xff);
+    
+    Paint_DrawPoint(10, 80, GRAY4, DOT_PIXEL_1X1, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 90, GRAY4, DOT_PIXEL_2X2, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 100, GRAY4, DOT_PIXEL_3X3, DOT_STYLE_DFT);
+    Paint_DrawLine(20, 70, 70, 120, GRAY4, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawLine(70, 70, 20, 120, GRAY4, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawRectangle(20, 70, 70, 120, GRAY4, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawRectangle(80, 70, 130, 120, GRAY4, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawCircle(45, 95, 20, GRAY4, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawCircle(105, 95, 20, GRAY2, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawLine(85, 95, 125, 95, GRAY4, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawLine(105, 75, 105, 115, GRAY4, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawString_EN(10, 0, "waveshare", &Font16, GRAY4, GRAY1);
+    Paint_DrawString_EN(10, 20, "hello world", &Font12, GRAY3, GRAY1);
+    Paint_DrawNum(10, 33, 123456789, &Font12, GRAY4, GRAY2);
+    Paint_DrawNum(10, 50, 987654321, &Font16, GRAY1, GRAY4);
+    Paint_DrawString_CN(130, 0,"你好abc", &Font12CN, GRAY4, GRAY1);
+    Paint_DrawString_CN(130, 20,"你好abc", &Font12CN, GRAY3, GRAY2);
+    Paint_DrawString_CN(130, 40,"你好abc", &Font12CN, GRAY2, GRAY3);
+    Paint_DrawString_CN(130, 60,"你好abc", &Font12CN, GRAY1, GRAY4);
+    Paint_DrawString_CN(10, 130, "微雪电子", &Font24CN, GRAY1, GRAY4);
+    EPD_7IN5_V2_WritePicture_4Gray(BlackImage);
+    DEV_Delay_ms(3000);
+
+#endif
+
     Debug("Clear...\r\n");
     EPD_7IN5_V2_Init();
     EPD_7IN5_V2_Clear();