fixes requested for reviewer

Author: mrmcwethy

adafruit_rgb_display/hx8353.py

@@ -30,7 +30,7 @@ class HX8353(DisplaySPI):
     >>> import adafruit_rgb_display.hx8353 as hx8353
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = hx8353.HX8383(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15))
     >>> display.fill(0x7521)
     >>> display.pixel(64, 64, 0)
     """

adafruit_rgb_display/ili9341.py

@@ -22,7 +22,7 @@ class ILI9341(DisplaySPI):
     >>> import adafruit_rgb_display.ili9341 as ili9341
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = ili9341.ILI9341(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15))
     >>> display.fill(color565(0xff, 0x11, 0x22))
     >>> display.pixel(120, 160, 0)
     """
@@ -68,10 +68,10 @@ def __init__(self, spi, dc, cs, rst=None, width=240, height=320,
         self._scroll = 0
     #pylint: enable-msg=too-many-arguments
 
-    def scroll(self, delta_y=None):
+    def scroll(self, dy=None): #pylint: disable-msg=invalid-name
         """Scroll the display by delta y"""
-        if delta_y is None:
+        if dy is None:
             return self._scroll
-        self._scroll = (self._scroll + delta_y) % self.height
+        self._scroll = (self._scroll + dy) % self.height
         self.write(0x37, struct.pack('>H', self._scroll))
         return None

adafruit_rgb_display/rgb.py

@@ -70,9 +70,9 @@ def _block(self, xpos0, ypos0, xpos1, ypos1, data=None):
         return None
     #pylint: enable-msg=too-many-arguments
 
-    def _encode_pos(self, avalue, bvalue):
+    def _encode_pos(self, x, y): #pylint: disable-msg=invalid-name
         """Encode a postion into bytes."""
-        return struct.pack(self._ENCODE_POS, avalue, bvalue)
+        return struct.pack(self._ENCODE_POS, x, y)
 
     def _encode_pixel(self, color):
         """Encode a pixel color into bytes."""
@@ -82,23 +82,23 @@ def _decode_pixel(self, data):
         """Decode bytes into a pixel color."""
         return color565(*struct.unpack(self._DECODE_PIXEL, data))
 
-    def pixel(self, xpos, ypos, color=None):
+    def pixel(self, x, y, color=None): #pylint: disable-msg=invalid-name
         """Read or write a pixel."""
         if color is None:
-            return self._decode_pixel(self._block(xpos, ypos, xpos, ypos))
+            return self._decode_pixel(self._block(x, y, x, y))
 
-        if 0 <= xpos < self.width and 0 <= ypos < self.height:
-            self._block(xpos, ypos, xpos, ypos, self._encode_pixel(color))
+        if 0 <= x < self.width and 0 <= y < self.height:
+            self._block(x, y, x, y, self._encode_pixel(color))
         return None
 
     #pylint: disable-msg=too-many-arguments
-    def fill_rectangle(self, xpos, ypos, width, height, color):
+    def fill_rectangle(self, x, y, width, height, color):  #pylint: disable-msg=invalid-name
         """Draw a filled rectangle."""
-        xpos = min(self.width - 1, max(0, xpos))
-        ypos = min(self.height - 1, max(0, ypos))
-        width = min(self.width - xpos, max(1, width))
-        height = min(self.height - ypos, max(1, height))
-        self._block(xpos, ypos, xpos + width - 1, ypos + height - 1, b'')
+        x = min(self.width - 1, max(0, x))
+        y = min(self.height - 1, max(0, y))
+        width = min(self.width - x, max(1, width))
+        height = min(self.height - y, max(1, height))
+        self._block(x, y, x + width - 1, y + height - 1, b'')
         chunks, rest = divmod(width * height, _BUFFER_SIZE)
         pixel = self._encode_pixel(color)
         if chunks:
@@ -112,13 +112,13 @@ def fill(self, color=0):
         """Fill whole screen."""
         self.fill_rectangle(0, 0, self.width, self.height, color)
 
-    def hline(self, xpos, ypos, width, color):
+    def hline(self, x, y, width, color): #pylint: disable-msg=invalid-name
         """Draw a horizontal line."""
-        self.fill_rectangle(xpos, ypos, width, 1, color)
+        self.fill_rectangle(x, y, width, 1, color)
 
-    def vline(self, xpos, ypos, height, color):
+    def vline(self, x, y, height, color): #pylint: disable-msg=invalid-name
         """Draw a vertical line."""
-        self.fill_rectangle(xpos, ypos, 1, height, color)
+        self.fill_rectangle(x, y, 1, height, color)
 
     def write(self, command, data):
         """Derived class must implement this"""
@@ -135,9 +135,9 @@ def __init__(self, spi, dc, cs, rst=None, width=1, height=1, baudrate=1000000,
                  polarity=0, phase=0):
         self.spi_device = spi_device.SPIDevice(spi, cs, baudrate=baudrate,
                                                polarity=polarity, phase=phase)
-        self.d_or_c = dc
+        self.dc_pin = dc
         self.rst = rst
-        self.d_or_c.switch_to_output(value=0)
+        self.dc_pin.switch_to_output(value=0)
         if self.rst:
             self.rst.switch_to_output(value=0)
             self.reset()
@@ -154,18 +154,18 @@ def reset(self):
     def write(self, command=None, data=None):
         """SPI write to the device: commands and data"""
         if command is not None:
-            self.d_or_c.value = 0
+            self.dc_pin.value = 0
             with self.spi_device as spi:
                 spi.write(bytearray([command]))
         if data is not None:
-            self.d_or_c.value = 1
+            self.dc_pin.value = 1
             with self.spi_device as spi:
                 spi.write(data)
 
     def read(self, command=None, count=0):
         """SPI read from device with optional command"""
         data = bytearray(count)
-        self.d_or_c.value = 0
+        self.dc_pin.value = 0
         with self.spi_device as spi:
             if command is not None:
                 spi.write(bytearray([command]))

adafruit_rgb_display/s6d02a1.py

@@ -27,7 +27,7 @@ class S6D02A1(DisplaySPI):
     >>> import adafruit_rgb_display.s6d02a1 as s6d02a1
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = s6d02a1.S6D02A1(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
     >>> display.fill(0x7521)
     >>> display.pixel(64, 64, 0)
     """

adafruit_rgb_display/ssd1331.py

@@ -49,7 +49,7 @@ class SSD1331(DisplaySPI):
     >>> import adafruit_rgb_display.ssd1331 as ssd1331
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = ssd1331.SSD1331(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
     >>> display.fill(0x7521)
     >>> display.pixel(32, 32, 0)
 >>>
@@ -88,7 +88,7 @@ class SSD1331(DisplaySPI):
         # (_CONTRASTA, b'\x91'), #//0xEF - 0x91
         # (_CONTRASTB, b'\x50'), #;//0x11 - 0x50
         # (_CONTRASTC, b'\x7d'), #;//0x48 - 0x7D
-        # (_DISPLAYON, b''),
+        (_DISPLAYON, b''),
     )
     _ENCODE_PIXEL = ">H"
     _ENCODE_POS = ">BB"

adafruit_rgb_display/ssd1351.py

@@ -49,7 +49,7 @@ class SSD1351(DisplaySPI):
     >>> import adafruit_rgb_display.ssd1351 as ssd1351
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = ssd1351.SSD1351(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
     >>> display.fill(0x7521)
     >>> display.pixel(32, 32, 0)
     """

adafruit_rgb_display/st7735.py

@@ -68,7 +68,7 @@ class ST7735(DisplaySPI):
     >>> import adafruit_rgb_display.st7735 as st7735
     >>> spi = busio.SPI(clock=board.SCK, MOSI=board.MOSI, MISO=board.MISO)
     >>> display = st7735.ST7735(spi, cs=digitalio.DigitalInOut(board.GPIO0),
-        dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
+    ...    dc=digitalio.DigitalInOut(board.GPIO15), rst=digitalio.DigitalInOut(board.GPIO16))
     >>> display.fill(0x7521)
     >>> display.pixel(64, 64, 0)
     """