Skip to content

Commit db23a9c

Browse files
committed
Disable floppyio for feather m4 express + update docstring
1 parent 78d1ebb commit db23a9c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
14+
CIRCUITPY_FLOPPYIO = 0
1415
CIRCUITPY_SYNTHIO = 0
1516

1617
# We don't have room for the fonts for terminalio for certain languages,

shared-bindings/bitmaptools/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ MAKE_ENUM_TYPE(bitmaptools, BlendMode, bitmaptools_blendmode);
320320
//| :param float factor2: The proportion of bitmap 2 to mix in. If specified as `None`, ``1-factor1`` is used. Usually the proportions should sum to 1.
321321
//| :param displayio.Colorspace colorspace: The colorspace of the bitmaps. They must all have the same colorspace. Only the following colorspaces are permitted: ``L8``, ``RGB565``, ``RGB565_SWAPPED``, ``BGR565`` and ``BGR565_SWAPPED``.
322322
//| :param bitmaptools.BlendMode blendmode: The blend mode to use. Default is Normal.
323-
//| :param int skip_source1_index: bitmap palette index in source_bitmap_1 that will not be blended, set to None to blend all pixels
324-
//| :param int skip_source2_index: bitmap palette index in source_bitmap_2 that will not be blended, set to None to blend all pixels
323+
//| :param int skip_source1_index: Bitmap palette or luminance index in source_bitmap_1 that will not be blended, set to None to blend all pixels
324+
//| :param int skip_source2_index: Bitmap palette or luminance index in source_bitmap_2 that will not be blended, set to None to blend all pixels
325325
//|
326326
//| For the L8 colorspace, the bitmaps must have a bits-per-value of 8.
327327
//| For the RGB colorspaces, they must have a bits-per-value of 16."""

0 commit comments

Comments
 (0)