Added 2.36inch e-Paper (G) program and some fixes.

RaspberryPi_JetsonNano/c/examples/EPD_2in36g_test.c

@@ -0,0 +1,165 @@
+/*****************************************************************************
+* | File      	:   EPD_2in36g_test.c
+* | Author      :   Waveshare team
+* | Function    :   2.36inch e-Paper (G) test demo
+* | Info        :
+*----------------
+* |	This version:   V1.0
+* | Date        :   2022-08-18
+* | Info        :
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+******************************************************************************/
+#include "EPD_Test.h"
+#include "EPD_2in36g.h"
+#include "time.h"
+
+int EPD_2in36g_test(void)
+{
+    printf("EPD_2IN36G_test Demo\r\n");
+    if(DEV_Module_Init()!=0){
+        return -1;
+    }
+
+    printf("e-Paper Init and Clear...\r\n");
+    EPD_2IN36G_Init();
+
+	struct timespec start={0,0}, finish={0,0}; 
+    clock_gettime(CLOCK_REALTIME, &start);
+    EPD_2IN36G_Clear(EPD_2IN36G_WHITE); // White
+    clock_gettime(CLOCK_REALTIME, &finish);
+    printf("%ld S\r\n", finish.tv_sec-start.tv_sec);	
+    DEV_Delay_ms(2000);
+
+    //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_2IN36G_WIDTH % 4 == 0)? (EPD_2IN36G_WIDTH / 4 ): (EPD_2IN36G_WIDTH / 4 + 1)) * EPD_2IN36G_HEIGHT;
+    if((BlackImage = (UBYTE *)malloc(Imagesize)) == NULL) {
+        printf("Failed to apply for black memory...\r\n");
+        return -1;
+    }
+    printf("Paint_NewImage\r\n");
+    Paint_NewImage(BlackImage, EPD_2IN36G_WIDTH, EPD_2IN36G_HEIGHT, 0, WHITE);
+    Paint_SetScale(4);
+
+#if 1   // show bmp
+    printf("show window BMP-----------------\r\n");
+    Paint_SelectImage(BlackImage);
+    GUI_ReadBmp_RGB_4Color("./pic/2.36inch-1.bmp", 0, 0);
+    EPD_2IN36G_Display(BlackImage);
+    DEV_Delay_ms(2000);
+
+    printf("show bmp------------------------\r\n");
+    Paint_SelectImage(BlackImage);
+    GUI_ReadBmp_RGB_4Color("./pic/2.36inch-2.bmp", 0, 0);
+    EPD_2IN36G_Display(BlackImage);
+    DEV_Delay_ms(2000);
+#endif
+
+#if 1   // Drawing on the image
+    //1.Select Image
+    printf("SelectImage:BlackImage\r\n");
+    Paint_SelectImage(BlackImage);
+    Paint_Clear(EPD_2IN36G_WHITE);
+
+    // 2.Drawing on the image
+    printf("Drawing:BlackImage\r\n");
+    Paint_DrawPoint(10, 80, EPD_2IN36G_BLACK, DOT_PIXEL_1X1, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 90, EPD_2IN36G_WHITE, DOT_PIXEL_2X2, DOT_STYLE_DFT);
+    Paint_DrawPoint(10, 100, EPD_2IN36G_RED, DOT_PIXEL_3X3, DOT_STYLE_DFT);
+    Paint_DrawLine(20, 70, 70, 120, EPD_2IN36G_BLACK, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawLine(70, 70, 20, 120, EPD_2IN36G_BLACK, DOT_PIXEL_1X1, LINE_STYLE_SOLID);
+    Paint_DrawRectangle(20, 70, 70, 120, EPD_2IN36G_WHITE, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawRectangle(80, 70, 130, 120, EPD_2IN36G_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawCircle(45, 95, 20, EPD_2IN36G_RED, DOT_PIXEL_1X1, DRAW_FILL_EMPTY);
+    Paint_DrawCircle(105, 95, 20, EPD_2IN36G_RED, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawLine(85, 95, 125, 95, EPD_2IN36G_BLACK, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawLine(105, 75, 105, 115, EPD_2IN36G_WHITE, DOT_PIXEL_1X1, LINE_STYLE_DOTTED);
+    Paint_DrawString_EN(10, 0, "Red, yellow, white and black", &Font16, EPD_2IN36G_BLACK, EPD_2IN36G_WHITE);
+    Paint_DrawString_EN(10, 35, "Four color e-Paper", &Font12, EPD_2IN36G_WHITE, EPD_2IN36G_RED);
+    Paint_DrawString_CN(10, 125, "΢ѩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", &Font24CN, EPD_2IN36G_BLACK, EPD_2IN36G_YELLOW);
+    Paint_DrawNum(10, 50, 123456, &Font12, EPD_2IN36G_BLACK, EPD_2IN36G_YELLOW);
+
+    printf("EPD_Display\r\n");
+    EPD_2IN36G_Display(BlackImage);
+    DEV_Delay_ms(3000);
+#endif
+
+#if 1   // Drawing on the image
+    //1.Select Image
+    printf("SelectImage:BlackImage\r\n");
+    Paint_SelectImage(BlackImage);
+    Paint_Clear(EPD_2IN36G_WHITE);
+
+    // 2.Drawing on the image
+    printf("Drawing:BlackImage\r\n");
+    Paint_DrawRectangle(1, 1, 168, 86, EPD_2IN36G_BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawRectangle(1, 210, 167, 295, EPD_2IN36G_WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+    Paint_DrawRectangle(59, 1, 109, 295, EPD_2IN36G_RED, DOT_PIXEL_1X1, DRAW_FILL_FULL);
+
+    printf("EPD_Display\r\n");
+    EPD_2IN36G_Display(BlackImage);
+    DEV_Delay_ms(3000);
+#endif
+
+#if 1   // Drawing on the image
+    //1.Select Image
+    printf("SelectImage:BlackImage\r\n");
+    Paint_SelectImage(BlackImage);
+    Paint_Clear(EPD_2IN36G_WHITE);
+
+    int hNumber, hWidth, vNumber, vWidth;
+    hNumber = 16;
+	hWidth = EPD_2IN36G_HEIGHT/hNumber; // 368/16=23
+    vNumber = 16;
+	vWidth = EPD_2IN36G_WIDTH/vNumber; // 512/16=32
+
+    // 2.Drawing on the image
+    printf("Drawing:BlackImage\r\n");
+	for(int i=0; i<hNumber; i++) {  // horizontal
+		Paint_DrawRectangle(1, 1+i*hWidth, EPD_2IN36G_WIDTH, hWidth*(1+i), EPD_2IN36G_BLACK + (i % 2), DOT_PIXEL_1X1, DRAW_FILL_FULL);
+	}
+	for(int i=0; i<vNumber; i++) {  // vertical
+        if(i%2) {
+            Paint_DrawRectangle(1+i*vWidth, 1, vWidth*(i+1), EPD_2IN36G_HEIGHT, EPD_2IN36G_YELLOW + (i/2%2), DOT_PIXEL_1X1, DRAW_FILL_FULL);
+        }
+	}
+
+    printf("EPD_Display\r\n");  
+    EPD_2IN36G_Display(BlackImage);
+    DEV_Delay_ms(3000);
+#endif
+
+    printf("Clear...\r\n");
+    EPD_2IN36G_Clear(EPD_2IN36G_WHITE);
+
+    printf("Goto Sleep...\r\n");
+    EPD_2IN36G_Sleep();
+    free(BlackImage);
+    BlackImage = NULL;
+    DEV_Delay_ms(2000);//important, at least 2s
+    // close 5V
+    printf("close 5V, Module enters 0 power consumption ...\r\n");
+    DEV_Module_Exit();
+    
+    return 0;
+}
+

RaspberryPi_JetsonNano/c/examples/EPD_Test.h

@@ -38,7 +38,9 @@
 #include <stdlib.h> // malloc() free()
 
 int EPD_1in64g_test(void);
+int EPD_2in36g_test(void);
 int EPD_3in0g_test(void);
+int EPD_4in37g_test(void);
 int EPD_7in3g_test(void);
 
 int EPD_1in54_DES_test(void);

RaspberryPi_JetsonNano/c/examples/main.c

@@ -17,6 +17,7 @@ int main(void)
     signal(SIGINT, Handler);
 	
     // EPD_1in64g_test();
+    // EPD_2in36g_test();
     // EPD_3in0g_test();
     // EPD_4in37g_test();
     // EPD_7in3g_test();

RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_2in36g.c

@@ -0,0 +1,238 @@
+/*****************************************************************************
+* | File      	:   EPD_2in36g.c
+* | Author      :   Waveshare team
+* | Function    :   2.36inch e-Paper (G)
+* | Info        :
+*----------------
+* |	This version:   V1.0
+* | Date        :   2022-08-17
+* | Info        :
+* -----------------------------------------------------------------------------
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+******************************************************************************/
+#include "EPD_2in36g.h"
+#include "Debug.h"
+
+/******************************************************************************
+function :	Software reset
+parameter:
+******************************************************************************/
+static void EPD_2IN36G_Reset(void)
+{
+    DEV_Digital_Write(EPD_RST_PIN, 1);
+    DEV_Delay_ms(20);
+    DEV_Digital_Write(EPD_RST_PIN, 0);
+    DEV_Delay_ms(2);
+    DEV_Digital_Write(EPD_RST_PIN, 1);
+    DEV_Delay_ms(20);
+}
+
+/******************************************************************************
+function :	send command
+parameter:
+     Reg : Command register
+******************************************************************************/
+static void EPD_2IN36G_SendCommand(UBYTE Reg)
+{
+    DEV_Digital_Write(EPD_DC_PIN, 0);
+    DEV_Digital_Write(EPD_CS_PIN, 0);
+    DEV_SPI_WriteByte(Reg);
+    DEV_Digital_Write(EPD_CS_PIN, 1);
+}
+
+/******************************************************************************
+function :	send data
+parameter:
+    Data : Write data
+******************************************************************************/
+static void EPD_2IN36G_SendData(UBYTE Data)
+{
+    DEV_Digital_Write(EPD_DC_PIN, 1);
+    DEV_Digital_Write(EPD_CS_PIN, 0);
+    DEV_SPI_WriteByte(Data);
+    DEV_Digital_Write(EPD_CS_PIN, 1);
+}
+
+/******************************************************************************
+function :	Wait until the busy_pin goes LOW
+parameter:
+******************************************************************************/
+static void EPD_2IN36G_ReadBusyH(void)
+{
+    Debug("e-Paper busy H\r\n");
+    while(!DEV_Digital_Read(EPD_BUSY_PIN)) {      //LOW: idle, HIGH: busy
+        DEV_Delay_ms(5);
+    }
+    Debug("e-Paper busy H release\r\n");
+}
+static void EPD_2IN36G_ReadBusyL(void)
+{
+    Debug("e-Paper busy L\r\n");
+    while(DEV_Digital_Read(EPD_BUSY_PIN)) {      //LOW: idle, HIGH: busy
+        DEV_Delay_ms(5);
+    }
+    Debug("e-Paper busy L release\r\n");
+}
+
+/******************************************************************************
+function :	Turn On Display
+parameter:
+******************************************************************************/
+static void EPD_2IN36G_TurnOnDisplay(void)
+{
+    EPD_2IN36G_SendCommand(0x12); // DISPLAY_REFRESH
+    EPD_2IN36G_SendData(0x01);
+    EPD_2IN36G_ReadBusyH();
+
+    EPD_2IN36G_SendCommand(0x02); // POWER_OFF
+    EPD_2IN36G_SendData(0X00);
+    EPD_2IN36G_ReadBusyH();
+}
+
+/******************************************************************************
+function :	Initialize the e-Paper register
+parameter:
+******************************************************************************/
+void EPD_2IN36G_Init(void)
+{
+    EPD_2IN36G_Reset();
+
+    EPD_2IN36G_SendCommand(0x66);
+    EPD_2IN36G_SendData(0x49);
+    EPD_2IN36G_SendData(0x55);
+    EPD_2IN36G_SendData(0x13);
+    EPD_2IN36G_SendData(0x5D);
+
+    EPD_2IN36G_SendCommand(0x66);
+    EPD_2IN36G_SendData(0x49);
+    EPD_2IN36G_SendData(0x55);
+
+    EPD_2IN36G_SendCommand(0xB0);
+    EPD_2IN36G_SendData(0x03);//1 boost 20211113
+
+    EPD_2IN36G_SendCommand(0x00);
+    EPD_2IN36G_SendData(0x4F);
+    EPD_2IN36G_SendData(0x69);
+
+    EPD_2IN36G_SendCommand(0x03);
+    EPD_2IN36G_SendData(0x00);
+
+    EPD_2IN36G_SendCommand(0xF0);
+    EPD_2IN36G_SendData(0xF6);
+    EPD_2IN36G_SendData(0x0D);
+    EPD_2IN36G_SendData(0x00);
+    EPD_2IN36G_SendData(0x00);
+    EPD_2IN36G_SendData(0x00);
+
+    EPD_2IN36G_SendCommand(0x06); //20211113
+    EPD_2IN36G_SendData(0xCF);
+    EPD_2IN36G_SendData(0xDE);
+    EPD_2IN36G_SendData(0x0F);
+
+    EPD_2IN36G_SendCommand(0x41);
+    EPD_2IN36G_SendData(0x00);
+
+    EPD_2IN36G_SendCommand(0x50);
+    EPD_2IN36G_SendData(0x30);
+
+    EPD_2IN36G_SendCommand(0x60);
+    EPD_2IN36G_SendData(0x0C); 
+    EPD_2IN36G_SendData(0x05);
+
+    EPD_2IN36G_SendCommand(0x61);
+    EPD_2IN36G_SendData(0xA8);
+    EPD_2IN36G_SendData(0x01); 
+    EPD_2IN36G_SendData(0x28); 
+
+    EPD_2IN36G_SendCommand(0x84);
+    EPD_2IN36G_SendData(0x01);
+}
+
+/******************************************************************************
+function :	Clear screen
+parameter:
+******************************************************************************/
+void EPD_2IN36G_Clear(UBYTE color)
+{
+    UWORD Width, Height;
+    Width = (EPD_2IN36G_WIDTH % 4 == 0)? (EPD_2IN36G_WIDTH / 4 ): (EPD_2IN36G_WIDTH / 4 + 1);
+    Height = EPD_2IN36G_HEIGHT;
+
+    EPD_2IN36G_SendCommand(0x68);
+    EPD_2IN36G_SendData(0x01);
+    
+    EPD_2IN36G_SendCommand(0x04);
+    EPD_2IN36G_ReadBusyH();
+
+    EPD_2IN36G_SendCommand(0x10);
+    for (UWORD j = 0; j < Height; j++) {
+        for (UWORD i = 0; i < Width; i++) {
+                EPD_2IN36G_SendData((color << 6) | (color << 4) | (color << 2) | color);
+        }
+    }
+
+    EPD_2IN36G_SendCommand(0x68);
+    EPD_2IN36G_SendData(0x00);
+
+    EPD_2IN36G_TurnOnDisplay();
+}
+
+/******************************************************************************
+function :	Sends the image buffer in RAM to e-Paper and displays
+parameter:
+******************************************************************************/
+void EPD_2IN36G_Display(UBYTE *Image)
+{
+    UWORD Width, Height;
+    Width = (EPD_2IN36G_WIDTH % 4 == 0)? (EPD_2IN36G_WIDTH / 4 ): (EPD_2IN36G_WIDTH / 4 + 1);
+    Height = EPD_2IN36G_HEIGHT;
+
+    EPD_2IN36G_SendCommand(0x68);
+    EPD_2IN36G_SendData(0x01);
+    
+    EPD_2IN36G_SendCommand(0x04);
+    EPD_2IN36G_ReadBusyH();
+
+    EPD_2IN36G_SendCommand(0x10);
+    for (UWORD j = 0; j < Height; j++) {
+        for (UWORD i = 0; i < Width; i++) {
+            EPD_2IN36G_SendData(Image[i + j * Width]);
+        }
+    }
+	
+	EPD_2IN36G_SendCommand(0x68);
+    EPD_2IN36G_SendData(0x00);
+	
+    EPD_2IN36G_TurnOnDisplay();
+}
+
+/******************************************************************************
+function :	Enter sleep mode
+parameter:
+******************************************************************************/
+void EPD_2IN36G_Sleep(void)
+{
+    EPD_2IN36G_SendCommand(0x02); // POWER_OFF
+    EPD_2IN36G_SendData(0X00);
+    EPD_2IN36G_SendCommand(0x07); // DEEP_SLEEP
+    EPD_2IN36G_SendData(0XA5);
+}
+

RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_2in36g.h

@@ -0,0 +1,51 @@
+/*****************************************************************************
+* | File      	:   EPD_2in36g.h
+* | Author      :   Waveshare team
+* | Function    :   2.36inch e-Paper (G)
+* | Info        :
+*----------------
+* |	This version:   V1.0
+* | Date        :   2022-08-17
+* | Info        :
+* -----------------------------------------------------------------------------
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+******************************************************************************/
+#ifndef __EPD_2IN36G_H_
+#define __EPD_2IN36G_H_
+
+#include "DEV_Config.h"
+
+// Display resolution
+#define EPD_2IN36G_WIDTH       168
+#define EPD_2IN36G_HEIGHT      296
+
+// Color
+#define EPD_2IN36G_BLACK		0x0
+#define EPD_2IN36G_WHITE		0x1
+#define EPD_2IN36G_YELLOW		0x2
+#define EPD_2IN36G_RED			0x3
+
+void EPD_2IN36G_Init(void);
+void EPD_2IN36G_Clear(UBYTE color);
+void EPD_2IN36G_Display(UBYTE *Image);
+void EPD_2IN36G_Sleep(void);
+
+#endif

RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_4in37g.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* | File      	:   EPD_4in37g.h
+* | File      	:   EPD_4in37g.c
 * | Author      :   Waveshare team
 * | Function    :   4.37inch e-Paper (G)
 * | Info        :

RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_4in37g.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* | File      	:   EPD_4in37g.c
+* | File      	:   EPD_4in37g.h
 * | Author      :   Waveshare team
 * | Function    :   4.37inch e-Paper (G)
 * | Info        :