change

examples/epd.py

@@ -8,7 +8,7 @@ if os.path.exists(libdir):
     sys.path.append(libdir)
 
 import logging
-from waveshare_epd import epd2in13
+from waveshare_epd import epd2in13bc
 import time
 from PIL import Image,ImageDraw,ImageFont
 import traceback
@@ -16,70 +16,74 @@ import traceback
 logging.basicConfig(level=logging.DEBUG)
 
 try:
-    logging.info("epd2in13 Demo")
+    logging.info("epd2in13bc Demo")
     
-    epd = epd2in13.EPD()
+    epd = epd2in13bc.EPD()
     logging.info("init and Clear")
-    epd.init(epd.lut_full_update)
+    epd.init()
-    epd.Clear(0xFF)
+    epd.Clear()
+    time.sleep(1)
     
     # Drawing on the image
-    font15 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 15)
+    logging.info("Drawing")    
-    font24 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 24)
+    font20 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 20)
+    font18 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 18)
     
-    logging.info("1.Drawing on the image...")
+    # Drawing on the Horizontal image
-    image = Image.new('1', (epd.height, epd.width), 255)  # 255: clear the frame    
+    logging.info("1.Drawing on the Horizontal image...") 
-    draw = ImageDraw.Draw(image)
+    HBlackimage = Image.new('1', (epd.height, epd.width), 255)  # 298*126
-    
+    HRYimage = Image.new('1', (epd.height, epd.width), 255)  # 298*126  ryimage: red or yellow image  
-    draw.rectangle([(0,0),(50,50)],outline = 0)
+    drawblack = ImageDraw.Draw(HBlackimage)
-    draw.rectangle([(55,0),(100,50)],fill = 0)
+    drawry = ImageDraw.Draw(HRYimage)
-    draw.line([(0,0),(50,50)], fill = 0,width = 1)
+    drawblack.text((10, 0), 'hello world', font = font20, fill = 0)
-    draw.line([(0,50),(50,0)], fill = 0,width = 1)
+    drawblack.text((10, 20), '2.13inch e-Paper bc', font = font20, fill = 0)
-    draw.chord((10, 60, 50, 100), 0, 360, fill = 0)
+    drawblack.text((120, 0), u'微雪电子', font = font20, fill = 0)    
-    draw.ellipse((55, 60, 95, 100), outline = 0)
+    drawblack.line((20, 50, 70, 100), fill = 0)
-    draw.pieslice((55, 60, 95, 100), 90, 180, outline = 0)
+    drawblack.line((70, 50, 20, 100), fill = 0)
-    draw.pieslice((55, 60, 95, 100), 270, 360, fill = 0)
+    drawblack.rectangle((20, 50, 70, 100), outline = 0)    
-    draw.polygon([(110,0),(110,50),(150,25)],outline = 0)
+    drawry.line((165, 50, 165, 100), fill = 0)
-    draw.polygon([(190,0),(190,50),(150,25)],fill = 0)
+    drawry.line((140, 75, 190, 75), fill = 0)
-    draw.text((120, 60), 'e-Paper demo', font = font15, fill = 0)
+    drawry.arc((140, 50, 190, 100), 0, 360, fill = 0)
-    draw.text((110, 90), u'微雪电子', font = font24, fill = 0)
+    drawry.rectangle((80, 50, 130, 100), fill = 0)
-    epd.display(epd.getbuffer(image))
+    drawry.chord((85, 55, 125, 95), 0, 360, fill =1)
+    epd.display(epd.getbuffer(HBlackimage), epd.getbuffer(HRYimage))
     time.sleep(2)
     
-    # read bmp file 
+    # Drawing on the Vertical image
-    logging.info("2.read bmp file...")
+    logging.info("2.Drawing on the Vertical image...")
-    image = Image.open(os.path.join(picdir, 'elektrizitat.png'))
+    LBlackimage = Image.new('1', (epd.width, epd.height), 255)  # 126*298
-    epd.display(epd.getbuffer(image))
+    LRYimage = Image.new('1', (epd.width, epd.height), 255)  # 126*298
+    drawblack = ImageDraw.Draw(LBlackimage)
+    drawry = ImageDraw.Draw(LRYimage)
+    
+    drawblack.text((2, 0), 'hello world', font = font18, fill = 0)
+    drawblack.text((2, 20), '2.13 epd b', font = font18, fill = 0)
+    drawblack.text((20, 50), u'微雪电子', font = font18, fill = 0)
+    drawblack.line((10, 90, 60, 140), fill = 0)
+    drawblack.line((60, 90, 10, 140), fill = 0)
+    drawblack.rectangle((10, 90, 60, 140), outline = 0)
+    drawry.rectangle((10, 150, 60, 200), fill = 0)
+    drawry.arc((15, 95, 55, 135), 0, 360, fill = 0)
+    drawry.chord((15, 155, 55, 195), 0, 360, fill =1)
+    epd.display(epd.getbuffer(LBlackimage), epd.getbuffer(LRYimage))
     time.sleep(2)
     
-    # read bmp file on window
+    logging.info("3.read bmp file")
-    logging.info("3.read bmp file on window...")
+    HBlackimage = Image.open(os.path.join(picdir, 'elektrizitat.png'))
-    # epd.Clear(0xFF)
+    HRYimage = Image.open(os.path.join(picdir, '2in13bc-ry.bmp'))
-    image1 = Image.new('1', (epd.height, epd.width), 255)  # 255: clear the frame
+    epd.display(epd.getbuffer(HBlackimage), epd.getbuffer(HRYimage))
-    bmp = Image.open(os.path.join(picdir, '100x100.bmp'))
-    image1.paste(bmp, (2,2))    
-    epd.display(epd.getbuffer(image1))
     time.sleep(2)
     
-    # # partial update
+    logging.info("4.read bmp file on window")
-    logging.info("4.show time...")
+    blackimage1 = Image.new('1', (epd.height, epd.width), 255)  # 298*126
-    epd.init(epd.lut_partial_update)    
+    redimage1 = Image.new('1', (epd.height, epd.width), 255)  # 298*126    
-    epd.Clear(0xFF)
+    newimage = Image.open(os.path.join(picdir, '100x100.bmp'))
-    
+    blackimage1.paste(newimage, (10,10))    
-    time_image = Image.new('1', (epd.height, epd.width), 255)
+    epd.display(epd.getbuffer(blackimage1), epd.getbuffer(redimage1))
-    time_draw = ImageDraw.Draw(time_image)
-    num = 0
-    while (True):
-        time_draw.rectangle((120, 80, 220, 105), fill = 255)
-        time_draw.text((120, 80), time.strftime('%H:%M:%S'), font = font24, fill = 0)
-        epd.display(epd.getbuffer(time_image))
-        num = num + 1
-        if(num == 10):
-            break
     
     logging.info("Clear...")
-    epd.init(epd.lut_full_update)
+    epd.init()
-    epd.Clear(0xFF)
+    epd.Clear()
     
     logging.info("Goto Sleep...")
     epd.sleep()
@@ -89,5 +93,5 @@ except IOError as e:
     
 except KeyboardInterrupt:    
     logging.info("ctrl + c:")
-    epd2in13.epdconfig.module_exit()
+    epd2in13bc.epdconfig.module_exit()
     exit()