Update drivers with project setup, new python

diff --git a/.gitignore b/.gitignore
index 56aab81bb1c682a21559471a8ea31302c03ca337..133872a30d4343435441f367f89ef1f67fa5b47b 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/src/drivers/epd12in48b.py b/src/drivers/epd12in48b.py
index 0ab2ccb2db0e2b979623d3c438077a4f17b88965..e4035a4f180131fc90b0b6260ed2ff78975dc30e 100644 (file)
--- a/src/drivers/epd12in48b.py
+++ b/src/drivers/epd12in48b.py
@@ -27,7 +27,7 @@
 # THE SOFTWARE.\r
 #\r
 import time\r
-import epdconfig\r
+from . import epdconfig\r
 \r
 EPD_WIDTH       = 1304\r
 EPD_HEIGHT      = 984\r
@@ -153,8 +153,6 @@ class EPD(object):
         self.SetLut()\r
         \r
     def display(self, BlackImage, RedImage):\r
-        start = time.clock()\r
-        \r
         Blackbuf = [0x00] * int(self.width * self.height / 8)\r
         blackconvert = BlackImage.convert('1')       \r
         bimwidth, bimheight = blackconvert.size \r
@@ -225,14 +223,10 @@ class EPD(object):
             for x in  range(81, 163):\r
                 self.S1_SendData(~Redbuf[y*163 + x])\r
                 \r
-        end = time.clock()\r
-        print("use time: %f"%(end - start))\r
         self.TurnOnDisplay()\r
 \r
     def clear(self):\r
         """Clear contents of image buffer"""\r
-        start = time.clock()\r
-        \r
         self.S2_SendCommand(0x10)\r
         for y in  range(0, 492):\r
             for x in  range(0, 81):\r
@@ -269,11 +263,6 @@ class EPD(object):
             for x in  range(81, 163):\r
                 self.S1_SendData(0x00)\r
                 \r
-        end = time.clock()\r
-        print (end)\r
-        print (start)\r
-        print("use time: %f" %(end - start))\r
-        \r
         self.TurnOnDisplay()\r
         \r
     def Reset(self):\r

diff --git a/src/drivers/epdconfig.py b/src/drivers/epdconfig.py
index c321f395bc584b0361d03801f2ee5ce03b964b4f..c70a1f14036ca288ff4bcc1028298ec47bcaa1df 100644 (file)
--- 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())\r
     logging.debug("System is %d bit"%val)\r
     if val == 64:\r
-        so_filename = os.path.join(find_dir, 'DEV_Config_64.so')\r
+        so_filename = os.path.join(find_dir, 'epd_12_in_48_lib_64bit.so')\r
     else:\r
-        so_filename = os.path.join(find_dir, 'DEV_Config_32.so')\r
+        so_filename = os.path.join(find_dir, 'epd_12_in_48_lib_32bit.so')\r
     if os.path.exists(so_filename):\r
         spi = CDLL(so_filename)\r
         break\r
@@ -96,4 +96,4 @@ def spi_readbyte(Reg):
 def delay_ms(delaytime):\r
     time.sleep(delaytime / 1000.0)\r
 \r
-  
\ No newline at end of file
+  \r