Browse Source

Merge pull request #281 from SSYYL/master

Fixed the problem of "fading" when displaying images with high loads
Wilson 2 năm trước cách đây
mục cha
commit
a8235ce194

+ 3 - 3
Arduino/epd7in3f/epd7in3f.cpp

@@ -92,8 +92,8 @@ int Epd::Init(void) {
     SendCommand(0x06);
     SendData(0x6F);
     SendData(0x1F);
-    SendData(0x16);
-    SendData(0x25);
+    SendData(0x1F);
+    SendData(0x22);
 
     SendCommand(0x08);
     SendData(0x6F);
@@ -106,7 +106,7 @@ int Epd::Init(void) {
     SendData(0x04);
 
     SendCommand(0x30);
-    SendData(0x02);
+    SendData(0x3C);
 
     SendCommand(0x41);     // TSE
     SendData(0x00);

+ 3 - 3
RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_7in3f.c

@@ -147,8 +147,8 @@ void EPD_7IN3F_Init(void)
     EPD_7IN3F_SendCommand(0x06);
     EPD_7IN3F_SendData(0x6F);
     EPD_7IN3F_SendData(0x1F);
-    EPD_7IN3F_SendData(0x16);
-    EPD_7IN3F_SendData(0x25);
+    EPD_7IN3F_SendData(0x1F);
+    EPD_7IN3F_SendData(0x22);
 
     EPD_7IN3F_SendCommand(0x08);
     EPD_7IN3F_SendData(0x6F);
@@ -161,7 +161,7 @@ void EPD_7IN3F_Init(void)
     EPD_7IN3F_SendData(0x04);
 
     EPD_7IN3F_SendCommand(0x30);
-    EPD_7IN3F_SendData(0x02);
+    EPD_7IN3F_SendData(0x3C);
 
     EPD_7IN3F_SendCommand(0x41);     // TSE
     EPD_7IN3F_SendData(0x00);

+ 3 - 3
RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in3f.py

@@ -146,8 +146,8 @@ class EPD:
         self.send_command(0x06)
         self.send_data(0x6F)
         self.send_data(0x1F)
-        self.send_data(0x16)
-        self.send_data(0x25)
+        self.send_data(0x1F)
+        self.send_data(0x22)
 
         self.send_command(0x08)
         self.send_data(0x6F)
@@ -160,7 +160,7 @@ class EPD:
         self.send_data(0x04)
 
         self.send_command(0x30)
-        self.send_data(0x02)
+        self.send_data(0x3C)
 
         self.send_command(0x41)     # TSE
         self.send_data(0x00)

+ 31 - 31
RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py

@@ -170,59 +170,59 @@ class EPD:
         # self.send_data(0x28)        # If an exception is displayed, try using 0x38
         # self.send_data(0x17)
         
-        # self.send_command(0x01)			#POWER SETTING
+        # self.send_command(0x01)   #POWER SETTING
         # self.send_data(0x07)
-        # self.send_data(0x07)    #VGH=20V,VGL=-20V
+        # 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(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_data(0x17);
+        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_data(0x17)
         
-        self.send_command(0x30);   # OSC Setting
-        self.send_data(self.Voltage_Frame_7IN5_V2[0]);  # 2-0=100: N=4  ; 5-3=111: M=7  ;  3C=50Hz     3A=100HZ
+        self.send_command(0x30)     # OSC Setting
+        self.send_data(self.Voltage_Frame_7IN5_V2[0])   # 3C=50Hz, 3A=100HZ
 
-        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(0x3F)        # 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.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

+ 29 - 29
RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5b_V2.py

@@ -89,46 +89,46 @@ class EPD:
             
         self.reset()
         
-        # self.send_command(0x06)     # btst
+        # self.send_command(0x06)   # btst
         # self.send_data(0x17)
         # self.send_data(0x17)
-        # self.send_data(0x38)        # If an exception is displayed, try using 0x38
+        # self.send_data(0x38)      # 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(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
-        epdconfig.delay_ms(100);
-        self.ReadBusy();
+        self.send_command(0x04)     # POWER ON
+        epdconfig.delay_ms(100)
+        self.ReadBusy()
 
-        self.send_command(0X00);			#PANNEL SETTING
-        self.send_data(0x0F);   #KW-3f   KWR-2F	BWROTP 0f	BWOTP 1f
+        self.send_command(0X00)     # PANNEL SETTING
+        self.send_data(0x0F)        # KW-3f KWR-2F BWROTP-0f BWOTP-1f
 
-        self.send_command(0x61);        	#tres
-        self.send_data(0x03);		#source 800
-        self.send_data(0x20);
-        self.send_data(0x01);		#gate 480
-        self.send_data(0xE0);
+        self.send_command(0x61)     # tres
+        self.send_data(0x03)        # source 800
+        self.send_data(0x20)
+        self.send_data(0x01)        # gate 480
+        self.send_data(0xE0)
 
-        self.send_command(0X15);
-        self.send_data(0x00);
+        self.send_command(0X15)
+        self.send_data(0x00)
 
-        self.send_command(0X50);			#VCOM AND DATA INTERVAL SETTING
-        self.send_data(0x11);
-        self.send_data(0x07);
+        self.send_command(0X50)     # VCOM AND DATA INTERVAL SETTING
+        self.send_data(0x11)
+        self.send_data(0x07)
 
-        self.send_command(0X60);			#TCON SETTING
-        self.send_data(0x22);
+        self.send_command(0X60)     # TCON SETTING
+        self.send_data(0x22)
 
-        self.send_command(0x65);
-        self.send_data(0x00);
-        self.send_data(0x00);
-        self.send_data(0x00);
-        self.send_data(0x00);
+        self.send_command(0x65)
+        self.send_data(0x00)
+        self.send_data(0x00)
+        self.send_data(0x00)
+        self.send_data(0x00)
     
         return 0
 

+ 3 - 3
STM32/STM32-F103ZET6/User/e-Paper/EPD_7in3f.c

@@ -147,8 +147,8 @@ void EPD_7IN3F_Init(void)
 	EPD_7IN3F_SendCommand(0x06);
 	EPD_7IN3F_SendData(0x6F);
 	EPD_7IN3F_SendData(0x1F);
-	EPD_7IN3F_SendData(0x16);
-	EPD_7IN3F_SendData(0x25);
+	EPD_7IN3F_SendData(0x1F);
+	EPD_7IN3F_SendData(0x22);
 
 	EPD_7IN3F_SendCommand(0x08);
 	EPD_7IN3F_SendData(0x6F);
@@ -161,7 +161,7 @@ void EPD_7IN3F_Init(void)
 	EPD_7IN3F_SendData(0x04);
 
 	EPD_7IN3F_SendCommand(0x30);
-	EPD_7IN3F_SendData(0x02);
+	EPD_7IN3F_SendData(0x3C);
 
 	EPD_7IN3F_SendCommand(0x41);     // TSE
 	EPD_7IN3F_SendData(0x00);