adafruit-mirror/Adafruit_Blinka_Raspberry_Pi5_Piomatter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually report errors in pio_sm_xfer_data

Browse source
This commit is contained in:
Jeff Epler 2025-03-17 09:03:44 -05:00
parent b19b6c7cb0
commit fc7295eb74
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/include/piomatter/piomatter.h
View file

@ -26,7 +26,7 @@ struct piomatter_base {
piomatter_base &operator=(const piomatter_base &) = delete; piomatter_base &operator=(const piomatter_base &) = delete;
virtual ~piomatter_base() {} virtual ~piomatter_base() {}
virtual void show() = 0; virtual int show() = 0;
double fps; double fps;
}; };
@ -48,7 +48,11 @@ struct piomatter : piomatter_base {
show(); show();
} }
void show() override { int show() override {
int err = pending_error_errno.exchange(0); // we're handling this error
if (err != 0) {
return err;
}
int buffer_idx = manager.get_free_buffer(); int buffer_idx = manager.get_free_buffer();
auto &bufseq = buffers[buffer_idx]; auto &bufseq = buffers[buffer_idx];
bufseq.resize(geometry.schedules.size()); bufseq.resize(geometry.schedules.size());
@ -61,6 +65,7 @@ struct piomatter : piomatter_base {
old_active_time = geometry.schedules[i].back().active_time; old_active_time = geometry.schedules[i].back().active_time;
} }
manager.put_filled_buffer(buffer_idx); manager.put_filled_buffer(buffer_idx);
return 0;
} }
~piomatter() { ~piomatter() {
@ -174,7 +179,15 @@ struct piomatter : piomatter_base {
const auto &data = cur_buf[seq_idx]; const auto &data = cur_buf[seq_idx];
auto datasize = sizeof(uint32_t) * data.size(); auto datasize = sizeof(uint32_t) * data.size();
auto dataptr = const_cast<uint32_t *>(&data[0]); 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(pio, sm, PIO_DIR_TO_SM, datasize, dataptr); pio_sm_xfer_data(pio, sm, PIO_DIR_TO_SM, datasize, dataptr);
if (r != 0) {
pending_error_errno.store(-r);
printf("xfer_data() returned error %d (%s)\n", r,
strerror(-r));
}
t1 = monotonicns64(); t1 = monotonicns64();
if (t0 != t1) { if (t0 != t1) {
fps = 1e9 / (t1 - t0); fps = 1e9 / (t1 - t0);
@ -194,6 +207,7 @@ struct piomatter : piomatter_base {
matrix_geometry geometry; matrix_geometry geometry;
colorspace converter; colorspace converter;
std::thread blitter_thread; std::thread blitter_thread;
std::atomic<int> pending_error_errno;
}; };
} // namespace piomatter } // namespace piomatter

9
src/pymain.cpp
View file

@ -18,7 +18,14 @@ struct PyPiomatter {
py::buffer buffer; py::buffer buffer;
std::unique_ptr<piomatter::piomatter_base> matter; std::unique_ptr<piomatter::piomatter_base> matter;
void show() { matter->show(); } void show() {
int err = matter->show();
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
throw py::error_already_set();
}
}
double fps() const { return matter->fps; } double fps() const { return matter->fps; }
}; };