From ed3bfe4287dbdfce469d71343a54c383199149b0 Mon Sep 17 00:00:00 2001 From: missionfloyd Date: Thu, 30 Mar 2023 19:00:15 -0600 Subject: [PATCH] Revert epd7in5_V2.py --- .../python/lib/waveshare_epd/epd7in5_V2.py | 138 +++--------------- 1 file changed, 18 insertions(+), 120 deletions(-) diff --git a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py index 2d77178..e4a366c 100644 --- a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py +++ b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py @@ -46,60 +46,6 @@ class EPD: self.width = EPD_WIDTH self.height = EPD_HEIGHT - Voltage_Frame_7IN5_V2 = [ - 0x6, 0x3F, 0x3F, 0x11, 0x24, 0x7, 0x17, - ] - - LUT_VCOM_7IN5_V2 = [ - 0x0, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0xF, 0x1, 0xF, 0x1, 0x2, - 0x0, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - ] - - LUT_WW_7IN5_V2 = [ - 0x10, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x84, 0xF, 0x1, 0xF, 0x1, 0x2, - 0x20, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - ] - - LUT_BW_7IN5_V2 = [ - 0x10, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x84, 0xF, 0x1, 0xF, 0x1, 0x2, - 0x20, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - ] - - LUT_WB_7IN5_V2 = [ - 0x80, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x84, 0xF, 0x1, 0xF, 0x1, 0x2, - 0x40, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - ] - - LUT_BB_7IN5_V2 = [ - 0x80, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x84, 0xF, 0x1, 0xF, 0x1, 0x2, - 0x40, 0xF, 0xF, 0x0, 0x0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - ] - # Hardware reset def reset(self): epdconfig.digital_write(self.reset_pin, 1) @@ -124,7 +70,7 @@ class EPD: def send_data2(self, data): epdconfig.digital_write(self.dc_pin, 1) epdconfig.digital_write(self.cs_pin, 0) - epdconfig.spi_writebyte2(data) + epdconfig.SPI.writebytes2(data) epdconfig.digital_write(self.cs_pin, 1) def ReadBusy(self): @@ -137,94 +83,47 @@ class EPD: epdconfig.delay_ms(20) logger.debug("e-Paper busy release") - def SetLut(self, lut_vcom, lut_ww, lut_bw, lut_wb, lut_bb): - self.send_command(0x20) - for count in range(0, 42): - self.send_data(lut_vcom[count]) - - self.send_command(0x21) - for count in range(0, 42): - self.send_data(lut_ww[count]) - - self.send_command(0x22) - for count in range(0, 42): - self.send_data(lut_bw[count]) - - self.send_command(0x23) - for count in range(0, 42): - self.send_data(lut_wb[count]) - - self.send_command(0x24) - for count in range(0, 42): - self.send_data(lut_bb[count]) - def init(self): if (epdconfig.module_init() != 0): return -1 # EPD hardware init start self.reset() - # self.send_command(0x06) # btst - # self.send_data(0x17) - # self.send_data(0x17) - # self.send_data(0x28) # If an exception is displayed, try using 0x38 - # self.send_data(0x17) - - # self.send_command(0x01) #POWER SETTING - # self.send_data(0x07) - # self.send_data(0x07) #VGH=20V,VGL=-20V - # self.send_data(0x3f) #VDH=15V - # self.send_data(0x3f) #VDL=-15V - - self.send_command(0x01) # power setting - self.send_data(0x17) # 1-0=11: internal power - self.send_data(self.Voltage_Frame_7IN5_V2[6]) # VGH&VGL - self.send_data(self.Voltage_Frame_7IN5_V2[1]) # VSH - self.send_data(self.Voltage_Frame_7IN5_V2[2]) # VSL - self.send_data(self.Voltage_Frame_7IN5_V2[3]) # VSHR - - self.send_command(0x82) # VCOM DC Setting - self.send_data(self.Voltage_Frame_7IN5_V2[4]) # VCOM - - self.send_command(0x06) # Booster Setting - self.send_data(0x27) - self.send_data(0x27) - self.send_data(0x2F) + self.send_command(0x06) # btst + self.send_data(0x17) + self.send_data(0x17) + self.send_data(0x28) # If an exception is displayed, try using 0x38 self.send_data(0x17) - self.send_command(0x30) # OSC Setting - self.send_data(self.Voltage_Frame_7IN5_V2[0]) # 3C=50Hz, 3A=100HZ + self.send_command(0x01) #POWER SETTING + self.send_data(0x07) + self.send_data(0x07) #VGH=20V,VGL=-20V + self.send_data(0x3f) #VDH=15V + self.send_data(0x3f) #VDL=-15V - self.send_command(0x04) # POWER ON + self.send_command(0x04) #POWER ON epdconfig.delay_ms(100) self.ReadBusy() - self.send_command(0X00) # PANNEL SETTING - self.send_data(0x3F) # KW-3f KWR-2F BWROTP-0f BWOTP-1f + self.send_command(0X00) #PANNEL SETTING + self.send_data(0x1F) #KW-3f KWR-2F BWROTP 0f BWOTP 1f - self.send_command(0x61) # tres - self.send_data(0x03) # source 800 + self.send_command(0x61) #tres + self.send_data(0x03) #source 800 self.send_data(0x20) - self.send_data(0x01) # gate 480 + self.send_data(0x01) #gate 480 self.send_data(0xE0) self.send_command(0X15) self.send_data(0x00) - self.send_command(0X50) # VCOM AND DATA INTERVAL SETTING + self.send_command(0X50) #VCOM AND DATA INTERVAL SETTING self.send_data(0x10) self.send_data(0x07) - self.send_command(0X60) # TCON SETTING + self.send_command(0X60) #TCON SETTING self.send_data(0x22) - self.send_command(0x65) # Resolution setting - self.send_data(0x00) - self.send_data(0x00) # 800*480 - self.send_data(0x00) - self.send_data(0x00) - - self.SetLut(self.LUT_VCOM_7IN5_V2, self.LUT_WW_7IN5_V2, self.LUT_BW_7IN5_V2, self.LUT_WB_7IN5_V2, self.LUT_BB_7IN5_V2) # EPD hardware init end return 0 @@ -276,4 +175,3 @@ class EPD: epdconfig.delay_ms(2000) epdconfig.module_exit() ### END OF FILE ### -