Commit Graph

1038 Commits

Author SHA1 Message Date
Dan Halbert
2c4e3aa880
Merge pull request #5786 from prplz/fix-busdevice-stub-path
Fix busdevice stub path
2021-12-28 10:43:54 -05:00
Michael Himing
fe71ee0812 Fix busdevice stub path 2021-12-28 19:31:40 +11:00
Dan Halbert
41d494df0b go into safe mode if not CIRCUITPY available 2021-12-27 18:58:24 -05:00
foamyguy
2ce9dc7680 Merge branch 'adafruit_main' into tilegrid_size_props 2021-12-20 07:31:08 -06:00
George Waters
c615daff30
Explicitly cast float to mp_int_t
Not sure why this is necessary, but it prevents an off-by-one error in
some (rare?) circumstances.
2021-12-17 16:23:58 -05:00
Scott Shawcroft
01f8cffdae
Support 32 bit color with vectorio
Fixes #5639
2021-12-14 17:13:11 -08:00
foamyguy
c4be8a5c94 tilegrid size properties 2021-12-13 09:44:08 -06:00
Kenny
17b53c7ebe vectorio: Add width and height properties to rectangle
Closes: https://github.com/adafruit/circuitpython/issues/5695
2021-12-12 19:50:00 -08:00
Jeff Epler
bc9ef87d05
print addl debug message 2021-12-08 21:03:06 -06:00
Jeff Epler
11c573ef95
sdcardio: Don't require reaching idle state during early init
.. which is what the addition of cmd25 made happen. We still signal
an error when failing to reach the idle state at any other time,
which _is_ different than adafruit_sdcard but I think that it is
correct.

This fixed #5600 according to Dan's testing on a GCM4 on the internal
SD card slot. There are still some ambiguous results on the MM4 with
external SD card slot on 6" jumper wires.
2021-12-08 21:03:03 -06:00
Scott Shawcroft
ee5536386d
Merge remote-tracking branch 'adafruit/main' into rpi 2021-11-24 14:23:23 -08:00
Scott Shawcroft
153ff6031e
Merge pull request #5616 from jepler/bitmaptools-bugfixes
Bitmaptools bugfixes
2021-11-24 11:50:29 -08:00
Scott Shawcroft
b09c777d0a
Merge pull request #5584 from gamblor21/is31
IS31FL3741 Framebuffer Driver
2021-11-24 11:41:51 -08:00
Jeff Epler
30c07a772f
bitmaptools: dither: get rid of shifts
this happens to make the occasional FS dither artifact disappear.
I guess `a * b >> 8` and `(a * b) / 256` are not identical.  I'm not
sure if it was just the parens or not, but write the clearer code and
rely on the compiler to substitute an appropriate shift if possible.
2021-11-24 09:51:24 -06:00
Jeff Epler
9af76a2f03
bitmaptools dither: Fix off-by-one error filling row data 2021-11-24 09:51:23 -06:00
Scott Shawcroft
927a720de9
Fix I2C and feedback from Dan 2021-11-23 17:23:13 -08:00
gamblor21
97032fdbd0 Renaming files 2021-11-23 17:21:13 -06:00
gamblor21
9f2660f6ac Capitalization changes 2021-11-23 17:06:39 -06:00
gamblor21
fc3b0340b5 Remove hard coded mapping of LEDs 2021-11-23 13:21:09 -06:00
Timon
a1052d5f73
Initial broadcom port for Raspberry Pi
This targets the 64-bit CPU Raspberry Pis. The BCM2711 on the Pi 4
and the BCM2837 on the Pi 3 and Zero 2W. There are 64-bit fixes
outside of the ports directory for it.

There are a couple other cleanups that were incidental:
* Use const mcu_pin_obj_t instead of omitting the const. The structs
  themselves are const because they are in ROM.
* Use PTR <-> OBJ conversions in more places. They were found when
  mp_obj_t was set to an integer type rather than pointer.
* Optimize submodule checkout because the Pi submodules are heavy
  and unnecessary for the vast majority of builds.

Fixes #4314
2021-11-22 14:54:44 -08:00
gamblor21
5243a33584 Check map to display size 2021-11-20 14:04:49 -06:00
gamblor21
6b2d43d3c8 Mapping for LEDs to diplay 2021-11-20 14:04:49 -06:00
gamblor21
9fa3feffb1 Cleanup 2021-11-20 13:46:12 -06:00
gamblor21
2f277eba3e Cleanup and i2c fix 2021-11-20 13:46:12 -06:00
gamblor21
e877449ae0 Cleanup 2021-11-20 13:46:12 -06:00
gamblor21
aa92d3a476 Cleanup and scaling addition 2021-11-20 13:46:11 -06:00
gamblor21
29c58575b0 Removed prints updated brightness 2021-11-20 13:46:11 -06:00
gamblor21
d063bf2675 Initial commit for IS31 2021-11-20 13:46:11 -06:00
Jeff Epler
f4e68e8fae
use mp_get_stream_raise, it's more specific 2021-11-20 08:53:04 -05:00
Jeff Epler
ee5e7161af
bitmaptools: use stream API
this allows `readinto` to succeed in the unix port, where the VFS
is not FAT
2021-11-20 08:51:40 -05:00
Jeff Epler
edac675c48
rainbowio: optimize for code size
.. this saves 76 bytes on trinket_m0
2021-11-12 17:31:22 -06:00
Jeff Epler
c91901dc37
rainbowio: Fix some things the unix build errors about 2021-11-12 17:31:13 -06:00
Jeff Epler
d55388a17d
Add bitmaptools to unix build 2021-11-12 10:47:18 -06:00
Jeff Epler
c6dbc7df3a
Add displayio bitmaps to unix build 2021-11-12 10:47:17 -06:00
Jeff Epler
340d6b9213
more missing-prototypes fixes 2021-11-10 21:00:17 -06:00
Jeff Epler
c9475adb00
Enable -Werror=missing-prototypes on espressif port 2021-11-10 11:07:45 -06:00
Jeff Epler
621953c960
Additional missing-prototypes fixes
I think this correctly enables missing-prototypes in atmel-samd
and raspberrypi ports.
2021-11-10 10:55:53 -06:00
Jeff Epler
63fbf98186
Enable -Wmissing-prototypes for atmel-samd 2021-11-09 20:05:00 -06:00
Jeff Epler
cbfa41f238 Merge remote-tracking branch 'origin/main' into dither3 2021-11-08 16:46:36 -06:00
Jeff Epler
eaf8bc0abe bitmaptools: add dither
This can convert a BGR565_SWAPPED bitmap to B&W in about 82ms on
esp32-s2.
2021-11-08 10:35:44 -06:00
Jeff Epler
dfafab675f Enable L8 mode for alphablend 2021-11-05 11:26:07 -05:00
Jeff Epler
8e8c44afea Merge remote-tracking branch 'origin/main' into alphablend 2021-11-05 11:24:51 -05:00
Jeff Epler
2ec2761ce0 bitmaptools: add alphablend
This blends two "565"-format bitmaps, including byteswapped ones. All
the bitmaps have to have the same memory format.

The routine takes about 63ms on a Kaluga when operating on 320x240 bitmaps.
Of course, displaying the bitmap also takes time.

There's untested code for the L8 (8-bit greyscale) case. This can be
enabled once gifio is merged.
2021-11-05 08:16:48 -05:00
Jeff Epler
334a9c85ce Merge remote-tracking branch 'origin/main' into gifio 2021-11-04 20:22:00 -05:00
Jeff Epler
a8614a61dc ParallelImageCapture: Add continuous capture on espressif
By having a pair of buffers, the capture hardware can fill one buffer while
Python code (including displayio, etc) operates on the other buffer.  This
increases the responsiveness of camera-using code.

On the Kaluga it makes the following improvements:
 * 320x240 viewfinder at 30fps instead of 15fps using directio
 * 240x240 animated gif capture at 10fps instead of 7.5fps

As discussed at length on Discord, the "usual end user" code will look like
this:

    camera = ...

    with camera.continuous_capture(buffer1, buffer2) as capture:
        for frame in capture:
            # Do something with frame

However, rather than presenting a context manager, the core code consists of
three new functions to start & stop continuous capture, and to get the next
frame.  The reason is twofold.  First, it's simply easier to implement the
context manager object in pure Python.  Second, for more advanced usage, the
context manager may be too limiting, and it's easier to iterate on the right
design in Python code.  In particular, I noticed that adapting the
JPEG-capturing programs to use continuous capture mode needed a change in
program structure.

The camera app was structured as
```python
while True:
    if shutter button was just pressed:
        capture a jpeg frame
    else:
        update the viewfinder
```

However, "capture a jpeg frame" needs to (A) switch the camera settings and (B)
capture into a different, larger buffer then (C) return to the earlier
settings. This can't be done during continuous capture mode. So just
restructuring it as follows isn't going to work:

```python
with camera.continuous_capture(buffer1, buffer2) as capture:
    for frame in capture:
        if shutter button was just pressed:
            capture a jpeg frame, without disturbing continuous capture mode
        else:
            update the viewfinder
```

The continuous mode is only implemented in the espressif port; others
will throw an exception if the associated methods are invoked.  It's not
impossible to implement there, just not a priority, since these micros don't
have enough RAM for two framebuffer copies at any resonable sizes.

The capture code, including single-shot capture, now take mp_obj_t in the
common-hal layer, instead of a buffer & length.  This was done for the
continuous capture mode because it has to identify & return to the user the
proper Python object representing the original buffer.  In the Espressif port,
it was convenient to implement single capture in terms of a multi-capture,
which is why I changed the singleshot routine's signature too.
2021-11-03 11:02:46 -05:00
Jeff Epler
e733876574 dither in x/y, not i/j
The easiest thing to implement was to use the i/j numbers, but they were not
directly related to image x/y coordinates.  This may slow things down a tiny
little bit, but it looks much better.
2021-10-27 16:52:56 -05:00
Jeff Epler
ef4623dfae gifio: Add dithered output
It's not a great dither, but we're low on CPU time sooo
2021-10-27 10:54:31 -05:00
Jeff Epler
dc00226143 gifio: write block data directly into output buffer 2021-10-27 09:38:07 -05:00
Jeff Epler
7d6ac96001 GifWriter: improve efficiency
* Increase colorspace conversion efficiency.
   This not only avoids a function call, it avoids the time-consuming
   switch statement in conver_pixel (replacing it with a single
   conditional on the byteswap flag + accounting for BGR/RGB during
   palette creation)

 * Buffer all the bytes of a single frame together.  By reducing
   low level write calls we get a decent speed increase even though
   it increases data-shuffling a bit.

Together with some other changes that enable "double buffered" camera
capture, this gets me to 8.8fps capturing QVGA (320x240) gifs and
11fps capturing 240x240 square gifs.
2021-10-26 11:11:28 -05:00
Jeff Epler
c34b6f757f Implement gifio.GifWriter
This involves:
 * Adding a new "L8" colorspace for colorconverters
 * factoring out displayio_colorconverter_convert_pixel
 * Making a minimal "colorspace only" version of displayio for the
   unix port (testing purposes)
 * fixing an error message

I only tested writing B&W animated images, with the following script:
```python
import displayio
import gifio

with gifio.GifWriter("foo.gif", 64, 64, displayio.Colorspace.L8) as g:
    for i in range(0, 256, 14):
        data = bytes([i, 255-i] * 32 + [255-i, i] * 32) * 32
        print("add_frame")
        g.add_frame(data)

# expected to raise an error, buffer is not big enough
with gifio.GifWriter("/dev/null", 64, 64, displayio.Colorspace.L8) as g:
    g.add_frame(bytes([3,3,3]))
```
2021-10-26 08:54:18 -05:00