From: Dustin Walde <redacted>
Date: Wed, 1 Jan 2025 18:41:51 +0000 (-0800)
Subject: Update drivers with project setup, new python
X-Git-Url: https://git.walde.dev/?a=commitdiff_plain;h=f1fa2205b33204125cd022f7c982591f5afbd4d0;p=epaper_display

Update drivers with project setup, new python
---

diff --git a/.gitignore b/.gitignore
index 56aab81..133872a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 reference/
 build/
 .venv/
+__pycache__/
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/drivers/epd12in48b.py b/src/drivers/epd12in48b.py
index 0ab2ccb..e4035a4 100644
--- a/src/drivers/epd12in48b.py
+++ b/src/drivers/epd12in48b.py
@@ -27,7 +27,7 @@
 # THE SOFTWARE.
 #
 import time
-import epdconfig
+from . import epdconfig
 
 EPD_WIDTH       = 1304
 EPD_HEIGHT      = 984
@@ -153,8 +153,6 @@ class EPD(object):
         self.SetLut()
         
     def display(self, BlackImage, RedImage):
-        start = time.clock()
-        
         Blackbuf = [0x00] * int(self.width * self.height / 8)
         blackconvert = BlackImage.convert('1')       
         bimwidth, bimheight = blackconvert.size 
@@ -225,14 +223,10 @@ class EPD(object):
             for x in  range(81, 163):
                 self.S1_SendData(~Redbuf[y*163 + x])
                 
-        end = time.clock()
-        print("use time: %f"%(end - start))
         self.TurnOnDisplay()
 
     def clear(self):
         """Clear contents of image buffer"""
-        start = time.clock()
-        
         self.S2_SendCommand(0x10)
         for y in  range(0, 492):
             for x in  range(0, 81):
@@ -269,11 +263,6 @@ class EPD(object):
             for x in  range(81, 163):
                 self.S1_SendData(0x00)
                 
-        end = time.clock()
-        print (end)
-        print (start)
-        print("use time: %f" %(end - start))
-        
         self.TurnOnDisplay()
         
     def Reset(self):
diff --git a/src/drivers/epdconfig.py b/src/drivers/epdconfig.py
index c321f39..c70a1f1 100644
--- a/src/drivers/epdconfig.py
+++ b/src/drivers/epdconfig.py
@@ -62,9 +62,9 @@ for find_dir in find_dirs:
     val = int(os.popen('getconf LONG_BIT').read())
     logging.debug("System is %d bit"%val)
     if val == 64:
-        so_filename = os.path.join(find_dir, 'DEV_Config_64.so')
+        so_filename = os.path.join(find_dir, 'epd_12_in_48_lib_64bit.so')
     else:
-        so_filename = os.path.join(find_dir, 'DEV_Config_32.so')
+        so_filename = os.path.join(find_dir, 'epd_12_in_48_lib_32bit.so')
     if os.path.exists(so_filename):
         spi = CDLL(so_filename)
         break
@@ -96,4 +96,4 @@ def spi_readbyte(Reg):
 def delay_ms(delaytime):
     time.sleep(delaytime / 1000.0)
 
-  
\ No newline at end of file
+