Merge branch 'main' into dev/switch-bus-device

# Conflicts:
#	adafruit_sharpmemorydisplay.py

Author: FoamyGuy

.gitignore

@@ -1,15 +1,47 @@
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
+# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
 #
-# SPDX-License-Identifier: Unlicense
+# SPDX-License-Identifier: MIT
 
+# Do not include files and directories created by your personal work environment, such as the IDE
+# you use, except for those already listed here. Pull requests including changes to this file will
+# not be accepted.
+
+# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
+# including building Sphinx, testing with pip, and creating a virual environment, as well as the
+# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.
+
+# If you find that there are files being generated on your machine that should not be included in
+# your git commit, you should create a .gitignore_global file on your computer to include the
+# files created by your personal setup. To do so, follow the two steps below.
+
+# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
+# the files you want to exclude from git commits.
+
+# Second, configure Git to use the exclude file for all Git repositories by running the
+# following via commandline, replacing "path/to/your/" with the actual path to your newly created
+# .gitignore_global file:
+# git config --global core.excludesfile path/to/your/.gitignore_global
+
+# CircuitPython-specific files
 *.mpy
-.idea
+
+# Python-specific files
 __pycache__
-_build
 *.pyc
+
+# Sphinx build-specific files
+_build
+
+# This file results from running `pip -e install .` in a local repository
+*.egg-info
+
+# Virtual environment-specific files
 .env
-bundles
+
+# MacOS-specific files
 *.DS_Store
-.eggs
-dist
-**/*.egg-info
+
+# IDE-specific files
+.idea
+.vscode
+*~

.pre-commit-config.yaml

@@ -4,7 +4,7 @@
 
 repos:
 -   repo: https://github.com/python/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     - id: black
 -   repo: https://github.com/fsfe/reuse-tool

README.rst

@@ -5,7 +5,7 @@ Introduction
     :target: https://docs.circuitpython.org/projects/sharpmemorydisplay/en/latest/
     :alt: Documentation Status
 
-.. image:: https://img.shields.io/discord/327254708534116352.svg
+.. image:: https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_Bundle/main/badges/adafruit_discord.svg
     :target: https://adafru.it/discord
     :alt: Discord
 

adafruit_sharpmemorydisplay.py

@@ -32,6 +32,11 @@
 import adafruit_framebuf
 from adafruit_bus_device.spi_device import SPIDevice
 
+try:
+    import numpy
+except ImportError:
+    numpy = None
+
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SharpMemoryDisplay.git"
 
@@ -97,3 +102,41 @@ def show(self):
                 self._buf[0] = 0
                 spi.write(self._buf)
             spi.write(self._buf)  # we send one last 0 byte
+
+    def image(self, img):
+        """Set buffer to value of Python Imaging Library image.  The image should
+        be in 1 bit mode and a size equal to the display size."""
+        # determine our effective width/height, taking rotation into account
+        width = self.width
+        height = self.height
+        if self.rotation in (1, 3):
+            width, height = height, width
+
+        if img.mode != "1":
+            raise ValueError("Image must be in mode 1.")
+
+        imwidth, imheight = img.size
+        if imwidth != width or imheight != height:
+            raise ValueError(
+                "Image must be same dimensions as display ({0}x{1}).".format(
+                    width, height
+                )
+            )
+
+        if numpy:
+            self.buffer = bytearray(
+                numpy.packbits(numpy.asarray(img), axis=1).flatten().tolist()
+            )
+        else:
+            # Grab all the pixels from the image, faster than getpixel.
+            pixels = img.load()
+            # Clear buffer
+            for i in range(len(self.buf)):  # pylint: disable=consider-using-enumerate
+                self.buf[i] = 0
+            # Iterate through the pixels
+            for x in range(width):  # yes this double loop is slow,
+                for y in range(height):  #  but these displays are small!
+                    if img.mode == "RGB":
+                        self.pixel(x, y, pixels[(x, y)])
+                    elif pixels[(x, y)]:
+                        self.pixel(x, y, 1)  # only write if pixel is true