Compare commits
No commits in common. "main" and "reduce-post-addr-delay" have entirely different histories.
main
...
reduce-pos
9 changed files with 36 additions and 158 deletions
|
|
@ -44,7 +44,7 @@ def main(xoffset, yoffset, width, height, serpentine, rotation, pinout, n_planes
|
|||
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines, n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
|
||||
else:
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines, n_temporal_planes=n_temporal_planes, rotation=rotation, serpentine=serpentine)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines, n_temporal_planes=n_temporal_planes, rotation=rotation)
|
||||
framebuffer = np.zeros(shape=(geometry.height, geometry.width), dtype=dtype)
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB565, pinout=pinout, framebuffer=framebuffer, geometry=geometry)
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ def main(xoffset, yoffset, scale, width, height, serpentine, rotation, pinout, n
|
|||
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines, n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
|
||||
else:
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_temporal_planes=n_temporal_planes, n_addr_lines=n_addr_lines, rotation=rotation, serpentine=serpentine)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_temporal_planes=n_temporal_planes, n_addr_lines=n_addr_lines, rotation=rotation)
|
||||
matrix_framebuffer = np.zeros(shape=(geometry.height, geometry.width, 3), dtype=np.uint8)
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=pinout, framebuffer=matrix_framebuffer, geometry=geometry)
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
|||
geometry = piomatter.Geometry(width=width, height=height, n_addr_lines=n_addr_lines, n_planes=10, n_temporal_planes=4, map=pixelmap, n_lanes=n_lanes)
|
||||
framebuffer = np.asarray(canvas) + 0 # Make a mutable copy
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed,
|
||||
pinout=piomatter.Pinout.Active3BGR,
|
||||
pinout=piomatter.Pinout.Active3,
|
||||
framebuffer=framebuffer,
|
||||
geometry=geometry)
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ def darken_color(hex_color, darkness_factor):
|
|||
|
||||
return darkened_hex_color
|
||||
|
||||
step_count = 8
|
||||
step_count = 4
|
||||
darkness_factor = 0.5
|
||||
|
||||
clearing = False
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
#!/usr/bin/python3
|
||||
# SPDX-FileCopyrightText: 2025 Tim Cocks for Adafruit Industries
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
"""
|
||||
Display a simple test pattern of 3 shapes on three 64x64 matrix panels
|
||||
using Active3 compatible connections.
|
||||
|
||||
Run like this:
|
||||
|
||||
$ python triple_matrix_active3_simpletest.py
|
||||
|
||||
"""
|
||||
|
||||
import numpy as np
|
||||
from PIL import Image, ImageDraw
|
||||
|
||||
import adafruit_blinka_raspberry_pi5_piomatter as piomatter
|
||||
from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
|
||||
|
||||
width = 64
|
||||
n_lanes = 6
|
||||
n_addr_lines = 5
|
||||
height = n_lanes << n_addr_lines
|
||||
pen_radius = 1
|
||||
|
||||
canvas = Image.new('RGB', (width, height), (0, 0, 0))
|
||||
draw = ImageDraw.Draw(canvas)
|
||||
|
||||
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_addr_lines=n_addr_lines, n_planes=10, n_temporal_planes=4, map=pixelmap, n_lanes=n_lanes)
|
||||
framebuffer = np.asarray(canvas) + 0 # Make a mutable copy
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed,
|
||||
pinout=piomatter.Pinout.Active3,
|
||||
framebuffer=framebuffer,
|
||||
geometry=geometry)
|
||||
|
||||
|
||||
draw.rectangle((8, 8, width-8, width-8), fill=0x008800)
|
||||
draw.circle((32, 64+32), 22, fill=0x880000)
|
||||
draw.polygon([(32, 136), (54, 180), (10, 180)], fill=0x000088)
|
||||
|
||||
framebuffer[:] = np.asarray(canvas)
|
||||
matrix.show()
|
||||
|
||||
input("Press enter to exit")
|
||||
|
|
@ -20,12 +20,14 @@ Here's an example for running an emulator using a rom stored in "/tmp/snesrom.sm
|
|||
$ python virtualdisplay.py --pinout AdafruitMatrixHatBGR --scale 2 --backend xvfb --width 128 --height 128 --serpentine --num-address-lines 5 --num-planes 4 -- mednafen -snes.xscalefs 1 -snes.yscalefs 1 -snes.xres 128 -video.fs 1 -video.driver softfb /tmp/snesrom.smc
|
||||
"""
|
||||
|
||||
# To run a nice emulator:
|
||||
|
||||
|
||||
import shlex
|
||||
from subprocess import Popen
|
||||
|
||||
import click
|
||||
import numpy as np
|
||||
from PIL import ImageEnhance
|
||||
from pyvirtualdisplay.smartdisplay import SmartDisplay
|
||||
|
||||
import adafruit_blinka_raspberry_pi5_piomatter as piomatter
|
||||
|
|
@ -38,12 +40,10 @@ from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilan
|
|||
@click.option("--backend", help="The pyvirtualdisplay backend to use", default="xvfb")
|
||||
@click.option("--extra-args", help="Extra arguments to pass to the backend server", default="")
|
||||
@click.option("--rfbport", help="The port number for the --backend xvnc", default=None, type=int)
|
||||
@click.option("--brightness", help="The brightness factor of the image output to the matrix",
|
||||
default=1.0, type=click.FloatRange(min=0.1, max=1.0))
|
||||
@click.option("--use-xauth/--no-use-xauth", help="If a Xauthority file should be created", default=False)
|
||||
@piomatter_click.standard_options
|
||||
@click.argument("command", nargs=-1)
|
||||
def main(scale, backend, use_xauth, extra_args, rfbport, brightness, width, height, serpentine, rotation, pinout,
|
||||
def main(scale, backend, use_xauth, extra_args, rfbport, width, height, serpentine, rotation, pinout,
|
||||
n_planes, n_temporal_planes, n_addr_lines, n_lanes, command):
|
||||
kwargs = {}
|
||||
if backend == "xvnc":
|
||||
|
|
@ -57,19 +57,15 @@ def main(scale, backend, use_xauth, extra_args, rfbport, brightness, width, heig
|
|||
n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
|
||||
else:
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
|
||||
n_temporal_planes=n_temporal_planes, rotation=rotation, serpentine=serpentine)
|
||||
n_temporal_planes=n_temporal_planes, rotation=rotation)
|
||||
framebuffer = np.zeros(shape=(geometry.height, geometry.width, 3), dtype=np.uint8)
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=pinout, framebuffer=framebuffer, geometry=geometry)
|
||||
|
||||
with SmartDisplay(backend=backend, use_xauth=use_xauth, size=(round(width*scale),round(height*scale)), manage_global_env=False, **kwargs) as disp, Popen(command, env=disp.env()) as proc:
|
||||
while proc.poll() is None:
|
||||
img = disp.grab(autocrop=False)
|
||||
|
||||
if img is None:
|
||||
continue
|
||||
if brightness != 1.0:
|
||||
darkener = ImageEnhance.Brightness(img)
|
||||
img = darkener.enhance(brightness)
|
||||
img = img.resize((width, height))
|
||||
framebuffer[:, :] = np.array(img)
|
||||
matrix.show()
|
||||
|
|
|
|||
|
|
@ -20,39 +20,27 @@ This example command will mirror a 128x128 pixel square from the top left of the
|
|||
|
||||
import click
|
||||
import numpy as np
|
||||
from PIL import Image, ImageEnhance, ImageGrab
|
||||
from PIL import ImageGrab
|
||||
|
||||
import adafruit_blinka_raspberry_pi5_piomatter as piomatter
|
||||
import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click
|
||||
from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
|
||||
|
||||
RESAMPLE_MAP = {
|
||||
"nearest": Image.NEAREST,
|
||||
"bilinear": Image.BILINEAR,
|
||||
"lanczos": Image.LANCZOS,
|
||||
"bicubic": Image.BICUBIC
|
||||
}
|
||||
|
||||
|
||||
@click.command
|
||||
@click.option("--mirror-region", help="Region of X display to mirror. Comma seperated x,y,w,h. "
|
||||
"Default will mirror entire display.", default="")
|
||||
@click.option("--x-display", help="The X display to mirror. Default is :0", default=":0")
|
||||
@click.option("--brightness", help="The brightness factor of the image output to the matrix",
|
||||
default=1.0, type=click.FloatRange(min=0.1, max=1.0))
|
||||
@click.option("--resample-method", type=click.Choice(RESAMPLE_MAP), default="nearest",
|
||||
help="The resample method for PIL to use when resizing the screen image. Default is nearest")
|
||||
@piomatter_click.standard_options(n_lanes=2, n_temporal_planes=0)
|
||||
def main(width, height, serpentine, rotation, pinout, n_planes,
|
||||
n_temporal_planes, n_addr_lines, n_lanes, mirror_region, x_display, resample_method, brightness):
|
||||
|
||||
n_temporal_planes, n_addr_lines, n_lanes, mirror_region, x_display):
|
||||
if n_lanes != 2:
|
||||
pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
|
||||
n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
|
||||
else:
|
||||
geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
|
||||
n_temporal_planes=n_temporal_planes, rotation=rotation, serpentine=serpentine)
|
||||
n_temporal_planes=n_temporal_planes, rotation=rotation)
|
||||
|
||||
framebuffer = np.zeros(shape=(geometry.height, geometry.width, 3), dtype=np.uint8)
|
||||
matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=pinout, framebuffer=framebuffer,
|
||||
|
|
@ -71,10 +59,7 @@ def main(width, height, serpentine, rotation, pinout, n_planes,
|
|||
img = img.crop((mirror_region[0], mirror_region[1], # left,top
|
||||
mirror_region[0] + mirror_region[2], # right
|
||||
mirror_region[1] + mirror_region[3])) # bottom
|
||||
if brightness != 1.0:
|
||||
darkener = ImageEnhance.Brightness(img)
|
||||
img = darkener.enhance(brightness)
|
||||
img = img.resize((width, height), RESAMPLE_MAP[resample_method])
|
||||
img = img.resize((width, height))
|
||||
|
||||
framebuffer[:, :] = np.array(img)
|
||||
matrix.show()
|
||||
|
|
|
|||
|
|
@ -41,25 +41,6 @@ struct adafruit_matrix_bonnet_pinout_bgr {
|
|||
};
|
||||
|
||||
struct active3_pinout {
|
||||
static constexpr pin_t PIN_RGB[] = {11, 27, 7, 8, 9, 10, 12, 5, 6,
|
||||
19, 13, 20, 14, 2, 3, 26, 16, 21};
|
||||
static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
|
||||
static constexpr pin_t PIN_OE = 18; // /OE: output enable when LOW
|
||||
static constexpr pin_t PIN_CLK = 17; // SRCLK: clocks on RISING edge
|
||||
static constexpr pin_t PIN_LAT = 4; // RCLK: latches on RISING edge
|
||||
|
||||
static constexpr uint32_t clk_bit = 1u << PIN_CLK;
|
||||
static constexpr uint32_t lat_bit = 1u << PIN_LAT;
|
||||
static constexpr uint32_t oe_bit = 1u << PIN_OE;
|
||||
static constexpr uint32_t oe_active = 0;
|
||||
static constexpr uint32_t oe_inactive = oe_bit;
|
||||
|
||||
static constexpr uint32_t post_oe_delay = 0;
|
||||
static constexpr uint32_t post_latch_delay = 0;
|
||||
static constexpr uint32_t post_addr_delay = 5;
|
||||
};
|
||||
|
||||
struct active3_pinout_bgr {
|
||||
static constexpr pin_t PIN_RGB[] = {7, 27, 11, 10, 9, 8, 6, 5, 12,
|
||||
20, 13, 19, 3, 2, 14, 21, 16, 26};
|
||||
static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
|
||||
|
|
@ -78,4 +59,23 @@ struct active3_pinout_bgr {
|
|||
static constexpr uint32_t post_addr_delay = 5;
|
||||
};
|
||||
|
||||
struct active3_pinout_bgr {
|
||||
static constexpr pin_t PIN_RGB[] = {11, 27, 7, 8, 9, 10, 12, 5, 6,
|
||||
19, 13, 20, 14, 2, 3, 26, 16, 21};
|
||||
static constexpr pin_t PIN_ADDR[] = {22, 23, 24, 25, 15};
|
||||
static constexpr pin_t PIN_OE = 18; // /OE: output enable when LOW
|
||||
static constexpr pin_t PIN_CLK = 17; // SRCLK: clocks on RISING edge
|
||||
static constexpr pin_t PIN_LAT = 4; // RCLK: latches on RISING edge
|
||||
|
||||
static constexpr uint32_t clk_bit = 1u << PIN_CLK;
|
||||
static constexpr uint32_t lat_bit = 1u << PIN_LAT;
|
||||
static constexpr uint32_t oe_bit = 1u << PIN_OE;
|
||||
static constexpr uint32_t oe_active = 0;
|
||||
static constexpr uint32_t oe_inactive = oe_bit;
|
||||
|
||||
static constexpr uint32_t post_oe_delay = 0;
|
||||
static constexpr uint32_t post_latch_delay = 0;
|
||||
static constexpr uint32_t post_addr_delay = 5;
|
||||
};
|
||||
|
||||
} // namespace piomatter
|
||||
|
|
|
|||
|
|
@ -12,42 +12,6 @@
|
|||
|
||||
namespace piomatter {
|
||||
|
||||
static int pio_sm_xfer_data_large(PIO pio, int sm, int direction, size_t size,
|
||||
uint32_t *databuf) {
|
||||
#if 0
|
||||
// it would be NICE to gracefully fall back to blocked transfer, but sadly
|
||||
// once the large xfer ioctl fails, future small xfers fail too.
|
||||
static enum { UNKNOWN, OK, BAD } large_xfer_status = UNKNOWN;
|
||||
printf("large_xfer_status=%d\n", large_xfer_status);
|
||||
if (large_xfer_status != BAD) {
|
||||
int r = pio_sm_xfer_data(pio, sm, direction, size, databuf);
|
||||
if (large_xfer_status == UNKNOWN && r != 0) {
|
||||
large_xfer_status = BAD;
|
||||
fprintf(stderr,
|
||||
"Transmission limit workaround engaged. May reduce quality of "
|
||||
"output.\nSee https://github.com/raspberrypi/utils/issues/123 "
|
||||
"for details.\n");
|
||||
} else {
|
||||
if (large_xfer_status == UNKNOWN && r == 0) {
|
||||
large_xfer_status = OK;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
constexpr size_t MAX_XFER = 65532;
|
||||
while (size) {
|
||||
size_t xfersize = std::min(size_t{MAX_XFER}, size);
|
||||
int r = pio_sm_xfer_data(pio, sm, direction, xfersize, databuf);
|
||||
if (r != 0) {
|
||||
return r;
|
||||
}
|
||||
size -= xfersize;
|
||||
databuf += xfersize / sizeof(*databuf);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static uint64_t monotonicns64() {
|
||||
struct timespec tp;
|
||||
clock_gettime(CLOCK_MONOTONIC, &tp);
|
||||
|
|
@ -62,7 +26,7 @@ struct piomatter_base {
|
|||
piomatter_base &operator=(const piomatter_base &) = delete;
|
||||
|
||||
virtual ~piomatter_base() {}
|
||||
virtual int show() = 0;
|
||||
virtual void show() = 0;
|
||||
|
||||
double fps;
|
||||
};
|
||||
|
|
@ -84,11 +48,7 @@ struct piomatter : piomatter_base {
|
|||
show();
|
||||
}
|
||||
|
||||
int show() override {
|
||||
int err = pending_error_errno.exchange(0); // we're handling this error
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
void show() override {
|
||||
int buffer_idx = manager.get_free_buffer();
|
||||
auto &bufseq = buffers[buffer_idx];
|
||||
bufseq.resize(geometry.schedules.size());
|
||||
|
|
@ -101,7 +61,6 @@ struct piomatter : piomatter_base {
|
|||
old_active_time = geometry.schedules[i].back().active_time;
|
||||
}
|
||||
manager.put_filled_buffer(buffer_idx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
~piomatter() {
|
||||
|
|
@ -215,15 +174,7 @@ struct piomatter : piomatter_base {
|
|||
const auto &data = cur_buf[seq_idx];
|
||||
auto datasize = sizeof(uint32_t) * data.size();
|
||||
auto dataptr = const_cast<uint32_t *>(&data[0]);
|
||||
// returns err = rp1_ioctl.... which seems to be a negative
|
||||
// errno value
|
||||
int r = pio_sm_xfer_data_large(pio, sm, PIO_DIR_TO_SM, datasize,
|
||||
dataptr);
|
||||
if (r != 0) {
|
||||
pending_error_errno.store(errno);
|
||||
printf("xfer_data() returned error %d (errno=%s)\n", r,
|
||||
strerror(errno));
|
||||
}
|
||||
pio_sm_xfer_data(pio, sm, PIO_DIR_TO_SM, datasize, dataptr);
|
||||
t1 = monotonicns64();
|
||||
if (t0 != t1) {
|
||||
fps = 1e9 / (t1 - t0);
|
||||
|
|
@ -243,7 +194,6 @@ struct piomatter : piomatter_base {
|
|||
matrix_geometry geometry;
|
||||
colorspace converter;
|
||||
std::thread blitter_thread;
|
||||
std::atomic<int> pending_error_errno;
|
||||
};
|
||||
|
||||
} // namespace piomatter
|
||||
|
|
|
|||
|
|
@ -18,14 +18,7 @@ struct PyPiomatter {
|
|||
py::buffer buffer;
|
||||
std::unique_ptr<piomatter::piomatter_base> matter;
|
||||
|
||||
void show() {
|
||||
int err = matter->show();
|
||||
if (err != 0) {
|
||||
errno = err;
|
||||
PyErr_SetFromErrno(PyExc_OSError);
|
||||
throw py::error_already_set();
|
||||
}
|
||||
}
|
||||
void show() { matter->show(); }
|
||||
double fps() const { return matter->fps; }
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue