diff --git a/src/lib/adafruit_bitmap_font/bdf.mpy b/src/lib/adafruit_bitmap_font/bdf.mpy deleted file mode 100644 index 36a7f56..0000000 Binary files a/src/lib/adafruit_bitmap_font/bdf.mpy and /dev/null differ diff --git a/src/lib/adafruit_bitmap_font/bdf.py b/src/lib/adafruit_bitmap_font/bdf.py index 777fadf..4ff14f0 100644 --- a/src/lib/adafruit_bitmap_font/bdf.py +++ b/src/lib/adafruit_bitmap_font/bdf.py @@ -33,15 +33,7 @@ from fontio import Glyph from .glyph_cache import GlyphCache -<<<<<<< HEAD -__version__ = "2.1.1" -======= -<<<<<<< HEAD __version__ = "2.1.3" -======= -__version__ = "2.1.1" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git" diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.mpy b/src/lib/adafruit_bitmap_font/bitmap_font.mpy deleted file mode 100644 index fe65729..0000000 Binary files a/src/lib/adafruit_bitmap_font/bitmap_font.mpy and /dev/null differ diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.py b/src/lib/adafruit_bitmap_font/bitmap_font.py index bf169fd..640b041 100644 --- a/src/lib/adafruit_bitmap_font/bitmap_font.py +++ b/src/lib/adafruit_bitmap_font/bitmap_font.py @@ -31,15 +31,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "2.1.1" -======= -<<<<<<< HEAD __version__ = "2.1.3" -======= -__version__ = "2.1.1" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git" diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.mpy b/src/lib/adafruit_bitmap_font/glyph_cache.mpy deleted file mode 100644 index 1a401cf..0000000 Binary files a/src/lib/adafruit_bitmap_font/glyph_cache.mpy and /dev/null differ diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.py b/src/lib/adafruit_bitmap_font/glyph_cache.py index 1a8cc62..2933f89 100644 --- a/src/lib/adafruit_bitmap_font/glyph_cache.py +++ b/src/lib/adafruit_bitmap_font/glyph_cache.py @@ -30,15 +30,7 @@ import gc -<<<<<<< HEAD -__version__ = "2.1.1" -======= -<<<<<<< HEAD __version__ = "2.1.3" -======= -__version__ = "2.1.1" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git" diff --git a/src/lib/adafruit_bitmap_font/pcf.mpy b/src/lib/adafruit_bitmap_font/pcf.mpy deleted file mode 100644 index fea3049..0000000 Binary files a/src/lib/adafruit_bitmap_font/pcf.mpy and /dev/null differ diff --git a/src/lib/adafruit_bitmap_font/pcf.py b/src/lib/adafruit_bitmap_font/pcf.py new file mode 100644 index 0000000..860ca09 --- /dev/null +++ b/src/lib/adafruit_bitmap_font/pcf.py @@ -0,0 +1,412 @@ +# SPDX-FileCopyrightText: 2020 Jeff Epler for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +""" +`adafruit_bitmap_font.pcf` +==================================================== + +Loads PCF format fonts. + +* Author(s): Jeff Epler + +Implementation Notes +-------------------- + +**Hardware:** + +**Software and Dependencies:** + +* Adafruit CircuitPython firmware for the supported boards: + https://github.com/adafruit/circuitpython/releases + +""" + +try: + from typing import Union, Tuple, Iterator, Iterable + from io import FileIO + from displayio import Bitmap as displayioBitmap +except ImportError: + pass + +from collections import namedtuple +import gc +import struct +from micropython import const +from fontio import Glyph +from .glyph_cache import GlyphCache + +try: + from bitmaptools import readinto as _bitmap_readinto +except ImportError: + _bitmap_readinto = None # pylint: disable=invalid-name + +_PCF_PROPERTIES = const(1 << 0) +_PCF_ACCELERATORS = const(1 << 1) +_PCF_METRICS = const(1 << 2) +_PCF_BITMAPS = const(1 << 3) +_PCF_INK_METRICS = const(1 << 4) +_PCF_BDF_ENCODINGS = const(1 << 5) +_PCF_SWIDTHS = const(1 << 6) +_PCF_GLYPH_NAMES = const(1 << 7) +_PCF_BDF_ACCELERATORS = const(1 << 8) + +_PCF_DEFAULT_FORMAT = const(0x00000000) +_PCF_ACCEL_W_INKBOUNDS = const(0x00000100) +_PCF_COMPRESSED_METRICS = const(0x00000100) + +_PCF_GLYPH_PAD_MASK = const(3 << 0) # See the bitmap table for explanation */ +_PCF_BYTE_MASK = const(1 << 2) # If set then Most Sig Byte First */ +_PCF_BIT_MASK = const(1 << 3) # If set then Most Sig Bit First */ +_PCF_SCAN_UNIT_MASK = const(3 << 4) + +# https://fontforge.org/docs/techref/pcf-format.html + +Table = namedtuple("Table", ("format", "size", "offset")) +Metrics = namedtuple( + "Metrics", + ( + "left_side_bearing", + "right_side_bearing", + "character_width", + "character_ascent", + "character_descent", + "character_attributes", + ), +) +Accelerators = namedtuple( + "Accelerators", + ( + "no_overlap", + "constant_metrics", + "terminal_font", + "constant_width", + "ink_inside", + "ink_metrics", + "draw_direction", + "font_ascent", + "font_descent", + "max_overlap", + "minbounds", + "maxbounds", + "ink_minbounds", + "ink_maxbounds", + ), +) +Encoding = namedtuple( + "Encoding", ("min_byte2", "max_byte2", "min_byte1", "max_byte1", "default_char") +) +Bitmap = namedtuple("Bitmap", ("glyph_count", "bitmap_sizes")) + + +class PCF(GlyphCache): + """Loads glyphs from a PCF file in the given bitmap_class.""" + + def __init__(self, f: FileIO, bitmap_class: displayioBitmap) -> None: + super().__init__() + self.file = f + self.name = f + f.seek(0) + self.buffer = bytearray(1) + self.bitmap_class = bitmap_class + _, table_count = self._read("<4sI") + self.tables = {} + for _ in range(table_count): + type_, format_, size, offset = self._read(" int: + """The number of pixels above the baseline of a typical ascender""" + return self._ascent + + @property + def descent(self) -> int: + """The number of pixels below the baseline of a typical descender""" + return self._descent + + def get_bounding_box(self) -> Tuple[int, int, int, int]: + """Return the maximum glyph size as a 4-tuple of: width, height, x_offset, y_offset""" + return self._bounding_box + + def _read(self, format_: str) -> Tuple: + size = struct.calcsize(format_) + if size != len(self.buffer): + self.buffer = bytearray(size) + self.file.readinto(self.buffer) + return struct.unpack_from(format_, self.buffer) + + def _seek_table(self, table: Table) -> int: + self.file.seek(table.offset) + (format_,) = self._read(" Encoding: + encoding = self.tables[_PCF_BDF_ENCODINGS] + self._seek_table(encoding) + + return Encoding(*self._read(">hhhhh")) + + def _read_bitmap_table(self) -> Bitmap: + bitmaps = self.tables[_PCF_BITMAPS] + format_ = self._seek_table(bitmaps) + + (glyph_count,) = self._read(">I") + self.file.seek(bitmaps.offset + 8 + 4 * glyph_count) + bitmap_sizes = self._read(">4I") + return Bitmap(glyph_count, bitmap_sizes[format_ & 3]) + + def _read_metrics(self, compressed_metrics: bool) -> Metrics: + if compressed_metrics: + ( + left_side_bearing, + right_side_bearing, + character_width, + character_ascent, + character_descent, + ) = self._read("5B") + left_side_bearing -= 0x80 + right_side_bearing -= 0x80 + character_width -= 0x80 + character_ascent -= 0x80 + character_descent -= 0x80 + attributes = 0 + else: + ( + left_side_bearing, + right_side_bearing, + character_width, + character_ascent, + character_descent, + attributes, + ) = self._read(">5hH") + return Metrics( + left_side_bearing, + right_side_bearing, + character_width, + character_ascent, + character_descent, + attributes, + ) + + def _read_accelerator_tables(self) -> Accelerators: + # pylint: disable=too-many-locals + accelerators = self.tables.get(_PCF_BDF_ACCELERATORS) + if not accelerators: + accelerators = self.tables.get(_PCF_ACCELERATORS) + if not accelerators: + raise RuntimeError("Accelerator table missing") + + format_ = self._seek_table(accelerators) + has_inkbounds = format_ & _PCF_ACCEL_W_INKBOUNDS + + ( + no_overlap, + constant_metrics, + terminal_font, + constant_width, + ink_inside, + ink_metrics, + draw_direction, + _, + font_ascent, + font_descent, + max_overlap, + ) = self._read(">BBBBBBBBIII") + minbounds = self._read_metrics(False) + maxbounds = self._read_metrics(False) + if has_inkbounds: + ink_minbounds = self._read_metrics(False) + ink_maxbounds = self._read_metrics(False) + else: + ink_minbounds = minbounds + ink_maxbounds = maxbounds + + return Accelerators( + no_overlap, + constant_metrics, + terminal_font, + constant_width, + ink_inside, + ink_metrics, + draw_direction, + font_ascent, + font_descent, + max_overlap, + minbounds, + maxbounds, + ink_minbounds, + ink_maxbounds, + ) + + def _read_properties(self) -> Iterator[Tuple[bytes, Union[bytes, int]]]: + property_table_offset = self.tables[_PCF_PROPERTIES]["offset"] + self.file.seek(property_table_offset) + (format_,) = self._read("I") + self.file.seek(property_table_offset + 8 + 9 * nprops) + + pos = self.file.tell() + if pos % 4 > 0: + self.file.read(4 - pos % 4) + (string_size,) = self._read(">I") + + strings = self.file.read(string_size) + string_map = {} + i = 0 + for value in strings.split(b"\x00"): + string_map[i] = value + i += len(value) + 1 + + self.file.seek(property_table_offset + 8) + for _ in range(nprops): + name_offset, is_string_prop, value = self._read(">IBI") + + if is_string_prop: + yield (string_map[name_offset], string_map[value]) + else: + yield (string_map[name_offset], value) + + def load_glyphs(self, code_points: Union[int, str, Iterable[int]]) -> None: + # pylint: disable=too-many-statements,too-many-branches,too-many-nested-blocks,too-many-locals + if isinstance(code_points, int): + code_points = (code_points,) + elif isinstance(code_points, str): + code_points = [ord(c) for c in code_points] + + code_points = sorted( + c for c in code_points if self._glyphs.get(c, None) is None + ) + if not code_points: + return + + indices_offset = self.tables[_PCF_BDF_ENCODINGS].offset + 14 + bitmap_offset_offsets = self.tables[_PCF_BITMAPS].offset + 8 + first_bitmap_offset = self.tables[_PCF_BITMAPS].offset + 4 * ( + 6 + self._bitmaps.glyph_count + ) + metrics_compressed = self.tables[_PCF_METRICS].format & _PCF_COMPRESSED_METRICS + first_metric_offset = self.tables[_PCF_METRICS].offset + ( + 6 if metrics_compressed else 8 + ) + metrics_size = 5 if metrics_compressed else 12 + + # These will each _tend to be_ forward reads in the file, at least + # sometimes we'll benefit from oofatfs's 512 byte cache and avoid + # excess reads + indices = [None] * len(code_points) + for i, code_point in enumerate(code_points): + enc1 = (code_point >> 8) & 0xFF + enc2 = code_point & 0xFF + + if enc1 < self._encoding.min_byte1 or enc1 > self._encoding.max_byte1: + continue + if enc2 < self._encoding.min_byte2 or enc2 > self._encoding.max_byte2: + continue + + encoding_idx = ( + (enc1 - self._encoding.min_byte1) + * (self._encoding.max_byte2 - self._encoding.min_byte2 + 1) + + enc2 + - self._encoding.min_byte2 + ) + self.file.seek(indices_offset + 2 * encoding_idx) + (glyph_idx,) = self._read(">H") + if glyph_idx != 65535: + indices[i] = glyph_idx + + all_metrics = [None] * len(code_points) + for i, code_point in enumerate(code_points): + index = indices[i] + if index is None: + continue + self.file.seek(first_metric_offset + metrics_size * index) + all_metrics[i] = self._read_metrics(metrics_compressed) + bitmap_offsets = [None] * len(code_points) + for i, code_point in enumerate(code_points): + index = indices[i] + if index is None: + continue + self.file.seek(bitmap_offset_offsets + 4 * index) + (bitmap_offset,) = self._read(">I") + bitmap_offsets[i] = bitmap_offset + + # Batch creation of glyphs and bitmaps so that we need only gc.collect + # once + gc.collect() + bitmaps = [None] * len(code_points) + for i in range(len(all_metrics)): # pylint: disable=consider-using-enumerate + metrics = all_metrics[i] + if metrics is not None: + width = metrics.right_side_bearing - metrics.left_side_bearing + height = metrics.character_ascent + metrics.character_descent + bitmap = bitmaps[i] = self.bitmap_class(width, height, 2) + self._glyphs[code_points[i]] = Glyph( + bitmap, + 0, + width, + height, + metrics.left_side_bearing, + -metrics.character_descent, + metrics.character_width, + 0, + ) + + for i, code_point in enumerate(code_points): + metrics = all_metrics[i] + if metrics is None: + continue + self.file.seek(first_bitmap_offset + bitmap_offsets[i]) + width = metrics.right_side_bearing - metrics.left_side_bearing + height = metrics.character_ascent + metrics.character_descent + + bitmap = bitmaps[i] + + if _bitmap_readinto: + _bitmap_readinto( + bitmap, + self.file, + bits_per_pixel=1, + element_size=4, + reverse_pixels_in_element=True, + ) + else: + words_per_row = (width + 31) // 32 + buf = bytearray(4 * words_per_row) + start = 0 + for _ in range(height): + self.file.readinto(buf) + for k in range(width): + if buf[k // 8] & (128 >> (k % 8)): + bitmap[start + k] = 1 + start += width diff --git a/src/lib/adafruit_bitmap_font/ttf.mpy b/src/lib/adafruit_bitmap_font/ttf.mpy deleted file mode 100644 index a70cfea..0000000 Binary files a/src/lib/adafruit_bitmap_font/ttf.mpy and /dev/null differ diff --git a/src/lib/adafruit_bitmap_font/ttf.py b/src/lib/adafruit_bitmap_font/ttf.py new file mode 100644 index 0000000..807ac79 --- /dev/null +++ b/src/lib/adafruit_bitmap_font/ttf.py @@ -0,0 +1,65 @@ +# SPDX-FileCopyrightText: 2019 Scott Shawcroft for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +# pylint: skip-file +# Remove the above when TTF is actually supported. + +try: + from typing import Tuple + from io import FileIO + from displayio import Bitmap +except ImportError: + pass + +import struct + +# https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html + + +class TTF: + def __init__(self, f: FileIO, bitmap: Bitmap) -> None: + f.seek(0) + self.file = f + + self.characters = {} + + def read(format: str) -> Tuple: + s = struct.calcsize(format) + return struct.unpack_from(format, f.read(s)) + + scalar_type = read(">I") + numTables, searchRange, entrySelector, rangeShift = read(">HHHH") + + print(numTables) + table_info = {} + for _ in range(numTables): + tag, checkSum, offset, length = read(">4sIII") + print(tag.decode("utf-8"), hex(checkSum), offset, length) + table_info[tag] = (offset, length) + + head_offset, head_length = table_info[b"head"] + f.seek(head_offset) + version, fontRevision, checkSumAdjustment, magicNumber = read(">IIII") + flags, unitsPerEm, created, modified = read(">HHQQ") + xMin, yMin, xMax, yMax = read(">hhhh") + print(xMin, yMin, xMax, yMax) + macStyle, lowestRecPPEM, fontDirectionHint = read(">HHh") + indexToLocFormat, glyphDataFormat = read(">hh") + + glyf_offset, glyf_length = table_info[b"glyf"] + f.seek(glyf_offset) + while f.tell() < glyf_offset + glyf_length: + numberOfContours, xMin, yMin, xMax, yMax = read(">hhhhh") + + if numberOfContours > 0: # Simple + print(numberOfContours) + ends = [] + for _ in range(numberOfContours): + ends.append(read(">H")) + instructionLength = read(">h")[0] + instructions = read(">{}s".format(instructionLength))[0] + print(instructions) + break + else: + raise RuntimeError("Unsupported font") diff --git a/src/lib/adafruit_bus_device/i2c_device.mpy b/src/lib/adafruit_bus_device/i2c_device.mpy deleted file mode 100644 index fa5174c..0000000 Binary files a/src/lib/adafruit_bus_device/i2c_device.mpy and /dev/null differ diff --git a/src/lib/adafruit_bus_device/i2c_device.py b/src/lib/adafruit_bus_device/i2c_device.py index 2b29b6e..c605290 100644 --- a/src/lib/adafruit_bus_device/i2c_device.py +++ b/src/lib/adafruit_bus_device/i2c_device.py @@ -20,15 +20,7 @@ pass -<<<<<<< HEAD -__version__ = "5.2.8" -======= -<<<<<<< HEAD __version__ = "5.2.10" -======= -__version__ = "5.2.8" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" diff --git a/src/lib/adafruit_bus_device/spi_device.mpy b/src/lib/adafruit_bus_device/spi_device.mpy deleted file mode 100644 index 7d696ae..0000000 Binary files a/src/lib/adafruit_bus_device/spi_device.mpy and /dev/null differ diff --git a/src/lib/adafruit_bus_device/spi_device.py b/src/lib/adafruit_bus_device/spi_device.py index 9f0c85b..60954e0 100644 --- a/src/lib/adafruit_bus_device/spi_device.py +++ b/src/lib/adafruit_bus_device/spi_device.py @@ -22,15 +22,7 @@ pass -<<<<<<< HEAD -__version__ = "5.2.8" -======= -<<<<<<< HEAD __version__ = "5.2.10" -======= -__version__ = "5.2.8" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" diff --git a/src/lib/adafruit_connection_manager.mpy b/src/lib/adafruit_connection_manager.mpy index f858122..002d5cd 100644 Binary files a/src/lib/adafruit_connection_manager.mpy and b/src/lib/adafruit_connection_manager.mpy differ diff --git a/src/lib/adafruit_display_text/__init__.mpy b/src/lib/adafruit_display_text/__init__.mpy deleted file mode 100644 index 254b3b6..0000000 Binary files a/src/lib/adafruit_display_text/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_display_text/__init__.py b/src/lib/adafruit_display_text/__init__.py index 6f34206..7a46cba 100644 --- a/src/lib/adafruit_display_text/__init__.py +++ b/src/lib/adafruit_display_text/__init__.py @@ -7,15 +7,7 @@ ======================= """ -<<<<<<< HEAD -__version__ = "3.1.0" -======= -<<<<<<< HEAD __version__ = "3.2.0" -======= -__version__ = "3.1.0" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git" from displayio import Group, Palette diff --git a/src/lib/adafruit_display_text/bitmap_label.mpy b/src/lib/adafruit_display_text/bitmap_label.mpy deleted file mode 100644 index ef1ce62..0000000 Binary files a/src/lib/adafruit_display_text/bitmap_label.mpy and /dev/null differ diff --git a/src/lib/adafruit_display_text/bitmap_label.py b/src/lib/adafruit_display_text/bitmap_label.py index 7caa9f4..514ae69 100644 --- a/src/lib/adafruit_display_text/bitmap_label.py +++ b/src/lib/adafruit_display_text/bitmap_label.py @@ -23,15 +23,7 @@ """ -<<<<<<< HEAD -__version__ = "3.1.0" -======= -<<<<<<< HEAD __version__ = "3.2.0" -======= -__version__ = "3.1.0" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git" import displayio diff --git a/src/lib/adafruit_display_text/label.mpy b/src/lib/adafruit_display_text/label.mpy deleted file mode 100644 index 2f829b6..0000000 Binary files a/src/lib/adafruit_display_text/label.mpy and /dev/null differ diff --git a/src/lib/adafruit_display_text/label.py b/src/lib/adafruit_display_text/label.py index 0a3f255..7dd64a2 100644 --- a/src/lib/adafruit_display_text/label.py +++ b/src/lib/adafruit_display_text/label.py @@ -22,15 +22,7 @@ """ -<<<<<<< HEAD -__version__ = "3.1.0" -======= -<<<<<<< HEAD __version__ = "3.2.0" -======= -__version__ = "3.1.0" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git" diff --git a/src/lib/adafruit_display_text/outlined_label.py b/src/lib/adafruit_display_text/outlined_label.py index 6540fba..050ceb9 100644 --- a/src/lib/adafruit_display_text/outlined_label.py +++ b/src/lib/adafruit_display_text/outlined_label.py @@ -22,15 +22,7 @@ https://circuitpython.org/downloads """ -<<<<<<< HEAD -__version__ = "3.1.0" -======= -<<<<<<< HEAD __version__ = "3.2.0" -======= -__version__ = "3.1.0" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git" import bitmaptools diff --git a/src/lib/adafruit_display_text/scrolling_label.mpy b/src/lib/adafruit_display_text/scrolling_label.mpy deleted file mode 100644 index 6a62a3c..0000000 Binary files a/src/lib/adafruit_display_text/scrolling_label.mpy and /dev/null differ diff --git a/src/lib/adafruit_display_text/scrolling_label.py b/src/lib/adafruit_display_text/scrolling_label.py index 38423a9..b4e4e0a 100644 --- a/src/lib/adafruit_display_text/scrolling_label.py +++ b/src/lib/adafruit_display_text/scrolling_label.py @@ -23,15 +23,7 @@ """ -<<<<<<< HEAD -__version__ = "3.1.0" -======= -<<<<<<< HEAD __version__ = "3.2.0" -======= -__version__ = "3.1.0" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Display_Text.git" import adafruit_ticks diff --git a/src/lib/adafruit_ds3231.mpy b/src/lib/adafruit_ds3231.mpy index 474be37..215d53d 100644 Binary files a/src/lib/adafruit_ds3231.mpy and b/src/lib/adafruit_ds3231.mpy differ diff --git a/src/lib/adafruit_imageload/__init__.mpy b/src/lib/adafruit_imageload/__init__.mpy deleted file mode 100644 index d2e160a..0000000 Binary files a/src/lib/adafruit_imageload/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/__init__.py b/src/lib/adafruit_imageload/__init__.py index 02c9cca..1abb630 100644 --- a/src/lib/adafruit_imageload/__init__.py +++ b/src/lib/adafruit_imageload/__init__.py @@ -30,15 +30,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/bmp/__init__.mpy b/src/lib/adafruit_imageload/bmp/__init__.mpy deleted file mode 100644 index c44a6e7..0000000 Binary files a/src/lib/adafruit_imageload/bmp/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/bmp/__init__.py b/src/lib/adafruit_imageload/bmp/__init__.py index 4d33b08..00487b2 100644 --- a/src/lib/adafruit_imageload/bmp/__init__.py +++ b/src/lib/adafruit_imageload/bmp/__init__.py @@ -23,15 +23,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/bmp/indexed.mpy b/src/lib/adafruit_imageload/bmp/indexed.mpy deleted file mode 100644 index 68afcda..0000000 Binary files a/src/lib/adafruit_imageload/bmp/indexed.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/bmp/indexed.py b/src/lib/adafruit_imageload/bmp/indexed.py index 15ab361..044cd51 100644 --- a/src/lib/adafruit_imageload/bmp/indexed.py +++ b/src/lib/adafruit_imageload/bmp/indexed.py @@ -31,15 +31,7 @@ _bitmap_readinto = None -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/bmp/negative_height_check.mpy b/src/lib/adafruit_imageload/bmp/negative_height_check.mpy deleted file mode 100644 index f04525b..0000000 Binary files a/src/lib/adafruit_imageload/bmp/negative_height_check.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/bmp/negative_height_check.py b/src/lib/adafruit_imageload/bmp/negative_height_check.py new file mode 100644 index 0000000..f16b79e --- /dev/null +++ b/src/lib/adafruit_imageload/bmp/negative_height_check.py @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: 2018 Scott Shawcroft for Adafruit Industries +# SPDX-FileCopyrightText: 2022 Matt Land +# +# SPDX-License-Identifier: MIT + +""" +Check for negative height on the BMP. +Seperated into it's own file to support builds +without longint. + +* Author(s): Tim Cocks, Matt Land +""" + + +def negative_height_check(height: int) -> int: + """Check the height return modified if negative.""" + if height > 0x7FFFFFFF: + return height - 4294967296 + return height diff --git a/src/lib/adafruit_imageload/bmp/truecolor.mpy b/src/lib/adafruit_imageload/bmp/truecolor.mpy deleted file mode 100644 index 69597cc..0000000 Binary files a/src/lib/adafruit_imageload/bmp/truecolor.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/bmp/truecolor.py b/src/lib/adafruit_imageload/bmp/truecolor.py index ecce3c1..8f17b79 100644 --- a/src/lib/adafruit_imageload/bmp/truecolor.py +++ b/src/lib/adafruit_imageload/bmp/truecolor.py @@ -25,15 +25,7 @@ from displayio import Bitmap, ColorConverter, Colorspace -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" bitfield_colorspaces = ( diff --git a/src/lib/adafruit_imageload/displayio_types.mpy b/src/lib/adafruit_imageload/displayio_types.mpy deleted file mode 100644 index 24ab0e5..0000000 Binary files a/src/lib/adafruit_imageload/displayio_types.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/displayio_types.py b/src/lib/adafruit_imageload/displayio_types.py index e8a0228..bed5efe 100644 --- a/src/lib/adafruit_imageload/displayio_types.py +++ b/src/lib/adafruit_imageload/displayio_types.py @@ -24,13 +24,5 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/gif.mpy b/src/lib/adafruit_imageload/gif.mpy deleted file mode 100644 index 3b2c1a3..0000000 Binary files a/src/lib/adafruit_imageload/gif.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/gif.py b/src/lib/adafruit_imageload/gif.py index 79029a8..c3099fe 100644 --- a/src/lib/adafruit_imageload/gif.py +++ b/src/lib/adafruit_imageload/gif.py @@ -26,15 +26,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/png.mpy b/src/lib/adafruit_imageload/png.mpy deleted file mode 100644 index 76f0cb7..0000000 Binary files a/src/lib/adafruit_imageload/png.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/png.py b/src/lib/adafruit_imageload/png.py index ebf9bf1..55f6226 100644 --- a/src/lib/adafruit_imageload/png.py +++ b/src/lib/adafruit_imageload/png.py @@ -28,15 +28,7 @@ import struct import zlib -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/pnm/__init__.mpy b/src/lib/adafruit_imageload/pnm/__init__.mpy deleted file mode 100644 index d372fff..0000000 Binary files a/src/lib/adafruit_imageload/pnm/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/__init__.py b/src/lib/adafruit_imageload/pnm/__init__.py index a3736a0..971da14 100644 --- a/src/lib/adafruit_imageload/pnm/__init__.py +++ b/src/lib/adafruit_imageload/pnm/__init__.py @@ -33,15 +33,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/pnm/pbm_ascii.mpy b/src/lib/adafruit_imageload/pnm/pbm_ascii.mpy deleted file mode 100644 index b5aa972..0000000 Binary files a/src/lib/adafruit_imageload/pnm/pbm_ascii.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/pbm_ascii.py b/src/lib/adafruit_imageload/pnm/pbm_ascii.py index 33ad3de..72eefd4 100644 --- a/src/lib/adafruit_imageload/pnm/pbm_ascii.py +++ b/src/lib/adafruit_imageload/pnm/pbm_ascii.py @@ -24,15 +24,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/pnm/pbm_binary.mpy b/src/lib/adafruit_imageload/pnm/pbm_binary.mpy deleted file mode 100644 index 40bf2d0..0000000 Binary files a/src/lib/adafruit_imageload/pnm/pbm_binary.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/pbm_binary.py b/src/lib/adafruit_imageload/pnm/pbm_binary.py index 27c136f..1d52a8e 100644 --- a/src/lib/adafruit_imageload/pnm/pbm_binary.py +++ b/src/lib/adafruit_imageload/pnm/pbm_binary.py @@ -24,15 +24,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/pnm/pgm/__init__.mpy b/src/lib/adafruit_imageload/pnm/pgm/__init__.mpy deleted file mode 100644 index d0e9e6b..0000000 Binary files a/src/lib/adafruit_imageload/pnm/pgm/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/pgm/ascii.mpy b/src/lib/adafruit_imageload/pnm/pgm/ascii.mpy deleted file mode 100644 index fc6293c..0000000 Binary files a/src/lib/adafruit_imageload/pnm/pgm/ascii.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/pgm/binary.mpy b/src/lib/adafruit_imageload/pnm/pgm/binary.mpy deleted file mode 100644 index 99ffd7c..0000000 Binary files a/src/lib/adafruit_imageload/pnm/pgm/binary.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/ppm_ascii.mpy b/src/lib/adafruit_imageload/pnm/ppm_ascii.mpy deleted file mode 100644 index fa95ee3..0000000 Binary files a/src/lib/adafruit_imageload/pnm/ppm_ascii.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/ppm_ascii.py b/src/lib/adafruit_imageload/pnm/ppm_ascii.py index dc711c4..ac8ea8a 100644 --- a/src/lib/adafruit_imageload/pnm/ppm_ascii.py +++ b/src/lib/adafruit_imageload/pnm/ppm_ascii.py @@ -16,15 +16,7 @@ """ -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" try: diff --git a/src/lib/adafruit_imageload/pnm/ppm_binary.mpy b/src/lib/adafruit_imageload/pnm/ppm_binary.mpy deleted file mode 100644 index af20203..0000000 Binary files a/src/lib/adafruit_imageload/pnm/ppm_binary.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/pnm/ppm_binary.py b/src/lib/adafruit_imageload/pnm/ppm_binary.py index ca09c0c..cada568 100644 --- a/src/lib/adafruit_imageload/pnm/ppm_binary.py +++ b/src/lib/adafruit_imageload/pnm/ppm_binary.py @@ -26,15 +26,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_imageload/tilegrid_inflator.mpy b/src/lib/adafruit_imageload/tilegrid_inflator.mpy deleted file mode 100644 index ccaec35..0000000 Binary files a/src/lib/adafruit_imageload/tilegrid_inflator.mpy and /dev/null differ diff --git a/src/lib/adafruit_imageload/tilegrid_inflator.py b/src/lib/adafruit_imageload/tilegrid_inflator.py index ea931a8..8df1a22 100644 --- a/src/lib/adafruit_imageload/tilegrid_inflator.py +++ b/src/lib/adafruit_imageload/tilegrid_inflator.py @@ -25,15 +25,7 @@ except ImportError: pass -<<<<<<< HEAD -__version__ = "1.20.2" -======= -<<<<<<< HEAD __version__ = "1.23.5" -======= -__version__ = "1.20.2" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" diff --git a/src/lib/adafruit_irremote.mpy b/src/lib/adafruit_irremote.mpy index dc06539..4f1634a 100644 Binary files a/src/lib/adafruit_irremote.mpy and b/src/lib/adafruit_irremote.mpy differ diff --git a/src/lib/adafruit_ntp.mpy b/src/lib/adafruit_ntp.mpy index a74f6f7..95130dc 100644 Binary files a/src/lib/adafruit_ntp.mpy and b/src/lib/adafruit_ntp.mpy differ diff --git a/src/lib/adafruit_register/i2c_bcd_alarm.mpy b/src/lib/adafruit_register/i2c_bcd_alarm.mpy deleted file mode 100644 index 882b011..0000000 Binary files a/src/lib/adafruit_register/i2c_bcd_alarm.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_bcd_alarm.py b/src/lib/adafruit_register/i2c_bcd_alarm.py index 00f245d..178d8e1 100644 --- a/src/lib/adafruit_register/i2c_bcd_alarm.py +++ b/src/lib/adafruit_register/i2c_bcd_alarm.py @@ -13,15 +13,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" import time diff --git a/src/lib/adafruit_register/i2c_bcd_datetime.mpy b/src/lib/adafruit_register/i2c_bcd_datetime.mpy deleted file mode 100644 index 4ca5d75..0000000 Binary files a/src/lib/adafruit_register/i2c_bcd_datetime.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_bcd_datetime.py b/src/lib/adafruit_register/i2c_bcd_datetime.py index 215f274..0a23ffe 100644 --- a/src/lib/adafruit_register/i2c_bcd_datetime.py +++ b/src/lib/adafruit_register/i2c_bcd_datetime.py @@ -12,15 +12,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" import time diff --git a/src/lib/adafruit_register/i2c_bit.mpy b/src/lib/adafruit_register/i2c_bit.mpy deleted file mode 100644 index 53762b9..0000000 Binary files a/src/lib/adafruit_register/i2c_bit.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_bit.py b/src/lib/adafruit_register/i2c_bit.py index 8d76c97..e518957 100644 --- a/src/lib/adafruit_register/i2c_bit.py +++ b/src/lib/adafruit_register/i2c_bit.py @@ -12,15 +12,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" try: diff --git a/src/lib/adafruit_register/i2c_bits.mpy b/src/lib/adafruit_register/i2c_bits.mpy deleted file mode 100644 index a9846d6..0000000 Binary files a/src/lib/adafruit_register/i2c_bits.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_bits.py b/src/lib/adafruit_register/i2c_bits.py index 8a85396..08bf5be 100644 --- a/src/lib/adafruit_register/i2c_bits.py +++ b/src/lib/adafruit_register/i2c_bits.py @@ -12,15 +12,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" try: diff --git a/src/lib/adafruit_register/i2c_struct.mpy b/src/lib/adafruit_register/i2c_struct.mpy deleted file mode 100644 index 21b3800..0000000 Binary files a/src/lib/adafruit_register/i2c_struct.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_struct.py b/src/lib/adafruit_register/i2c_struct.py index fc4762c..a097e3c 100644 --- a/src/lib/adafruit_register/i2c_struct.py +++ b/src/lib/adafruit_register/i2c_struct.py @@ -12,15 +12,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" import struct diff --git a/src/lib/adafruit_register/i2c_struct_array.mpy b/src/lib/adafruit_register/i2c_struct_array.mpy deleted file mode 100644 index 8871367..0000000 Binary files a/src/lib/adafruit_register/i2c_struct_array.mpy and /dev/null differ diff --git a/src/lib/adafruit_register/i2c_struct_array.py b/src/lib/adafruit_register/i2c_struct_array.py index 0dfee57..65470c6 100644 --- a/src/lib/adafruit_register/i2c_struct_array.py +++ b/src/lib/adafruit_register/i2c_struct_array.py @@ -12,15 +12,7 @@ * Author(s): Scott Shawcroft """ -<<<<<<< HEAD -__version__ = "1.9.18" -======= -<<<<<<< HEAD __version__ = "1.10.1" -======= -__version__ = "1.9.18" ->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff ->>>>>>> origin/update_dependencies __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Register.git" import struct diff --git a/src/lib/adafruit_requests.mpy b/src/lib/adafruit_requests.mpy index bf5ab31..c2a1cc2 100644 Binary files a/src/lib/adafruit_requests.mpy and b/src/lib/adafruit_requests.mpy differ