From a45ad298b3e18862fd710128704e59f768928499 Mon Sep 17 00:00:00 2001 From: waveshare <36142105+waveshare@users.noreply.github.com> Date: Mon, 1 Apr 2019 14:15:27 +0800 Subject: [PATCH 1/2] Delete 2.9inch_e-paper_b --- 2.9inch_e-paper_b | 132 ---------------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 2.9inch_e-paper_b diff --git a/2.9inch_e-paper_b b/2.9inch_e-paper_b deleted file mode 100644 index b0aea56..0000000 --- a/2.9inch_e-paper_b +++ /dev/null @@ -1,132 +0,0 @@ -/***************************************************************************** -* | File : GUI_BMPfile.c -* | Author : Waveshare team -* | Function : Hardware underlying interface -* | Info : -* Used to shield the underlying layers of each master -* and enhance portability -*---------------- -* | This version: V2.1 -* | Date : 2019-03-29 -* | Info : -* 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c -* 2.fix: GUI_ReadBmp() -* Now Xstart and Xstart can control the position of the picture normally, -* and support the display of images of any size. If it is larger than -* the actual display range, it will not be displayed. -* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] -* -* 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 "GUI_BMPfile.h" -#include "GUI_Paint.h" -#include "Debug.h" - -#include -#include -#include -#include //exit() -#include //memset() -#include //memset() - -UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) -{ - FILE *fp; //Define a file pointer - BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure - BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure - - - // Binary file open - if((fp = fopen(path, "rb")) == NULL) { - Debug("Cann't open the file!\n"); - exit(0); - } - - // Set the file pointer from the beginning - fseek(fp, 0, SEEK_SET); - fread(&bmpFileHeader, sizeof(BMPFILEHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 14 - fread(&bmpInfoHeader, sizeof(BMPINFOHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 50 - printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); - - UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; - memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); - - // Determine if it is a monochrome bitmap - int readbyte = bmpInfoHeader.biBitCount; - if(readbyte != 1){ - Debug("the bmp Image is not a monochrome bitmap!\n"); - exit(0); - } - - // Determine black and white based on the palette - UWORD i; - UWORD Bcolor, Wcolor; - UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 - BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette - - for(i = 0; i < bmprgbquadsize; i++){ - // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); - fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); - } - if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ - Bcolor = BLACK; - Wcolor = WHITE; - }else{ - Bcolor = WHITE; - Wcolor = BLACK; - } - - // Read image data into the cache - UWORD x, y; - UBYTE Rdata; - fseek(fp, bmpFileHeader.bOffset, SEEK_SET); - for(y = 0; y < bmpInfoHeader.biHeight; y++) {//Total display column - for(x = 0; x < Bmp_Width_Byte; x++) {//Show a line in the line - if(fread((char *)&Rdata, 1, readbyte, fp) != readbyte) { - perror("get bmpdata:\r\n"); - break; - } - if(x < Image_Width_Byte) { //bmp - Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; - // printf("rdata = %d\r\n", Rdata); - } - } - } - fclose(fp); - - // Refresh the image to the display buffer based on the displayed orientation - UBYTE color, temp; - for(y = 0; y < bmpInfoHeader.biHeight; y++){ - for(x = 0; x < bmpInfoHeader.biWidth; x++){ - if(x > Paint.Width || y > Paint.Height){ - break; - } - temp = Image[(x / 8) + (y * Image_Width_Byte)]; - color = (((temp << (x%8)) & 0x80) == 0x80) ?Bcolor:Wcolor; - Paint_SetPixel(Xstart + x, Ystart + y, color); - } - } - return 0; -} - - From dd0f1e82254ca24ff854b1cc8b2ed4585897c7a0 Mon Sep 17 00:00:00 2001 From: chenzitai <16739327+gypsophlia@users.noreply.github.com> Date: Tue, 2 Apr 2019 22:16:49 +0100 Subject: [PATCH 2/2] Add CS in python code --- 2.13inch_e-paper_code/python2/epd2in13.py | 7 +++++++ 2.13inch_e-paper_code/python3/epd2in13.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/2.13inch_e-paper_code/python2/epd2in13.py b/2.13inch_e-paper_code/python2/epd2in13.py index 6fe0ca3..1339432 100644 --- a/2.13inch_e-paper_code/python2/epd2in13.py +++ b/2.13inch_e-paper_code/python2/epd2in13.py @@ -43,6 +43,7 @@ class EPD: self.reset_pin = epdconfig.RST_PIN self.dc_pin = epdconfig.DC_PIN self.busy_pin = epdconfig.BUSY_PIN + self.cs_pin = epdconfig.CS_PIN self.width = EPD_WIDTH self.height = EPD_HEIGHT lut_full_update = [ @@ -61,20 +62,26 @@ class EPD: # Hardware reset def reset(self): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, GPIO.LOW) # module reset epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def send_command(self, command): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.dc_pin, GPIO.LOW) epdconfig.spi_writebyte([command]) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def send_data(self, data): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.dc_pin, GPIO.HIGH) epdconfig.spi_writebyte([data]) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def wait_until_idle(self): while(epdconfig.digital_read(self.busy_pin) == 1): # 0: idle, 1: busy diff --git a/2.13inch_e-paper_code/python3/epd2in13.py b/2.13inch_e-paper_code/python3/epd2in13.py index 5be748b..556aeae 100644 --- a/2.13inch_e-paper_code/python3/epd2in13.py +++ b/2.13inch_e-paper_code/python3/epd2in13.py @@ -43,6 +43,7 @@ class EPD: self.reset_pin = epdconfig.RST_PIN self.dc_pin = epdconfig.DC_PIN self.busy_pin = epdconfig.BUSY_PIN + self.cs_pin = epdconfig.CS_PIN self.width = EPD_WIDTH self.height = EPD_HEIGHT lut_full_update = [ @@ -61,20 +62,26 @@ class EPD: # Hardware reset def reset(self): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, GPIO.LOW) # module reset epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def send_command(self, command): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.dc_pin, GPIO.LOW) epdconfig.spi_writebyte([command]) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def send_data(self, data): + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.digital_write(self.dc_pin, GPIO.HIGH) epdconfig.spi_writebyte([data]) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def wait_until_idle(self): print("busy")