Best practices & code cleanup
This commit is contained in:
		| @@ -1,37 +1,35 @@ | ||||
| # ***************************************************************************** | ||||
| # * | File        :	  epd4in2.py | ||||
| # * | Author      :   Waveshare team | ||||
| # * | Function    :   Electronic paper driver | ||||
| # * | Info        : | ||||
| # *---------------- | ||||
| # * | This version:   V4.0 | ||||
| # * | Date        :   2019-06-20 | ||||
| # # | Info        :   python demo | ||||
| # ----------------------------------------------------------------------------- | ||||
| # Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| # of this software and associated documnetation files (the "Software"), to deal | ||||
| # in the Software without restriction, including without limitation the rights | ||||
| # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| # copies of the Software, and to permit persons to  whom the Software is | ||||
| # furished to do so, subject to the following conditions: | ||||
| # | ||||
| # The above copyright notice and this permission notice shall be included in | ||||
| # all copies or substantial portions of the Software. | ||||
| # | ||||
| # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| # FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| # LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||||
| # THE SOFTWARE. | ||||
| # | ||||
| """ | ||||
| * | File        :	  epd4in2.py | ||||
| * | Author      :   Waveshare team | ||||
| * | Function    :   Electronic paper driver | ||||
| * | Info        : | ||||
| *---------------- | ||||
| * | This version:   V4.0 | ||||
| * | Date        :   2019-06-20 | ||||
| # | Info        :   python demo | ||||
| ----------------------------------------------------------------------------- | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documnetation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to  whom the Software is | ||||
| furished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in | ||||
| all copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||||
| THE SOFTWARE. | ||||
| """ | ||||
|  | ||||
| import logging | ||||
|  | ||||
| from inkycal.display.drivers import epdconfig | ||||
| from PIL import Image | ||||
| import RPi.GPIO as GPIO | ||||
|  | ||||
| # Display resolution | ||||
| EPD_WIDTH = 400 | ||||
| @@ -354,8 +352,8 @@ class EPD: | ||||
|                     i = i + 1 | ||||
|                     if (i % 4 == 0): | ||||
|                         buf[int((x + (y * self.width)) / 4)] = ( | ||||
|                                     (pixels[x - 3, y] & 0xc0) | (pixels[x - 2, y] & 0xc0) >> 2 | ( | ||||
|                                         pixels[x - 1, y] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6) | ||||
|                                 (pixels[x - 3, y] & 0xc0) | (pixels[x - 2, y] & 0xc0) >> 2 | ( | ||||
|                                 pixels[x - 1, y] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6) | ||||
|  | ||||
|         elif (imwidth == self.height and imheight == self.width): | ||||
|             logging.debug("Horizontal") | ||||
| @@ -370,8 +368,8 @@ class EPD: | ||||
|                     i = i + 1 | ||||
|                     if (i % 4 == 0): | ||||
|                         buf[int((newx + (newy * self.width)) / 4)] = ( | ||||
|                                     (pixels[x, y - 3] & 0xc0) | (pixels[x, y - 2] & 0xc0) >> 2 | ( | ||||
|                                         pixels[x, y - 1] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6) | ||||
|                                 (pixels[x, y - 3] & 0xc0) | (pixels[x, y - 2] & 0xc0) >> 2 | ( | ||||
|                                 pixels[x, y - 1] & 0xc0) >> 4 | (pixels[x, y] & 0xc0) >> 6) | ||||
|  | ||||
|         return buf | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user