diff --git a/adafruit_rgb_display/ssd1331.py b/adafruit_rgb_display/ssd1331.py index d771e83..8512672 100644 --- a/adafruit_rgb_display/ssd1331.py +++ b/adafruit_rgb_display/ssd1331.py @@ -122,9 +122,11 @@ class SSD1331(DisplaySPI): # pylint: disable-msg=useless-super-delegation, too-many-arguments # super required to allow override of default values - # All arguments needed due to driver requiring all the given data to function - def __init__(self, spi, dc, cs, rst=None, width=96, height=64, rotation=0): - super().__init__(spi, dc, cs, rst, width, height, rotation) + def __init__(self, spi, dc, cs, rst=None, width=96, height=64, + baudrate=16000000, polarity=0, phase=0, *, rotation=0): + super().__init__(spi, dc, cs, rst, width, height, + baudrate=baudrate, polarity=polarity, phase=phase, + rotation=rotation) # pylint: disable=no-member def write(self, command=None, data=None): diff --git a/adafruit_rgb_display/ssd1351.py b/adafruit_rgb_display/ssd1351.py index adbb896..6aae3e8 100644 --- a/adafruit_rgb_display/ssd1351.py +++ b/adafruit_rgb_display/ssd1351.py @@ -115,5 +115,10 @@ class SSD1351(DisplaySPI): #pylint: disable-msg=useless-super-delegation, too-many-arguments def __init__(self, spi, dc, cs, rst=None, width=128, height=128, - rotation=0): - super().__init__(spi, dc, cs, rst, width, height, rotation) + baudrate=16000000, polarity=0, phase=0, *, + x_offset=0, y_offset=0, rotation=0): + if baudrate > 16000000: # Limit to Display Max Baudrate + baudrate = 16000000 + super().__init__(spi, dc, cs, rst, width, height, + baudrate=baudrate, polarity=polarity, phase=phase, + x_offset=x_offset, y_offset=y_offset, rotation=rotation) diff --git a/examples/rgb_display_pillow_demo.py b/examples/rgb_display_pillow_demo.py index 7f1f9b4..ddf0cb5 100644 --- a/examples/rgb_display_pillow_demo.py +++ b/examples/rgb_display_pillow_demo.py @@ -5,6 +5,8 @@ import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import # First define some constants to allow easy resizing of shapes. BORDER = 20 @@ -22,13 +24,16 @@ spi = board.SPI() # Create the display: -#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 -#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 -#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 -#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R +#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 +#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 +#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 +#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R #disp = st7735.ST7735R(spi, rotation=270, height=128, x_offset=2, y_offset=3, # 1.44" ST7735R -#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R -disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 +#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R +#disp = ssd1351.SSD1351(spi, rotation=180, # 1.5" SSD1351 +#disp = ssd1351.SSD1351(spi, height=96, y_offset=32, rotation=180, # 1.27" SSD1351 +#disp = ssd1331.SSD1331(spi, rotation=180, # 0.96" SSD1331 +disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 cs=cs_pin, dc=dc_pin, rst=reset_pin, baudrate=BAUDRATE) # Create blank image for drawing. diff --git a/examples/rgb_display_pillow_image.py b/examples/rgb_display_pillow_image.py index a5267e0..c2c00cc 100644 --- a/examples/rgb_display_pillow_image.py +++ b/examples/rgb_display_pillow_image.py @@ -5,6 +5,8 @@ import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import # Configuration for CS and DC pins (these are PiTFT defaults): cs_pin = digitalio.DigitalInOut(board.CE0) @@ -18,13 +20,16 @@ spi = board.SPI() # Create the display: -#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 -#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 -#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 -#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R +#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 +#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 +#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 +#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R #disp = st7735.ST7735R(spi, rotation=270, height=128, x_offset=2, y_offset=3, # 1.44" ST7735R -#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R -disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 +#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R +#disp = ssd1351.SSD1351(spi, rotation=180, # 1.5" SSD1351 +#disp = ssd1351.SSD1351(spi, height=96, y_offset=32, rotation=180, # 1.27" SSD1351 +#disp = ssd1331.SSD1331(spi, rotation=180, # 0.96" SSD1331 +disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 cs=cs_pin, dc=dc_pin, rst=reset_pin, baudrate=BAUDRATE) # Create blank image for drawing. diff --git a/examples/rgb_display_pillow_stats.py b/examples/rgb_display_pillow_stats.py index ac9047b..0ab2f6e 100644 --- a/examples/rgb_display_pillow_stats.py +++ b/examples/rgb_display_pillow_stats.py @@ -7,6 +7,8 @@ import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import +import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import # Configuration for CS and DC pins (these are PiTFT defaults): cs_pin = digitalio.DigitalInOut(board.CE0) @@ -20,13 +22,16 @@ spi = board.SPI() # Create the display: -#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 -#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 -#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 -#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R +#disp = st7789.ST7789(spi, rotation=90 # 2.0" ST7789 +#disp = st7789.ST7789(spi, height=240, y_offset=80, rotation=90 # 1.3", 1.54" ST7789 +#disp = hx8357.HX8357(spi, rotation=180, # 3.5" HX8357 +#disp = st7735.ST7735R(spi, rotation=90, # 1.8" ST7735R #disp = st7735.ST7735R(spi, rotation=270, height=128, x_offset=2, y_offset=3, # 1.44" ST7735R -#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R -disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 +#disp = st7735.ST7735R(spi, rotation=90, bgr=True, # 0.96" MiniTFT ST7735R +#disp = ssd1351.SSD1351(spi, rotation=180, # 1.5" SSD1351 +#disp = ssd1351.SSD1351(spi, height=96, y_offset=32, rotation=180, # 1.27" SSD1351 +#disp = ssd1331.SSD1331(spi, rotation=180, # 0.96" SSD1331 +disp = ili9341.ILI9341(spi, rotation=90, # 2.2", 2.4", 2.8", 3.2" ILI9341 cs=cs_pin, dc=dc_pin, rst=reset_pin, baudrate=BAUDRATE) # Create blank image for drawing.