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

tidy some build errors

Browse source
This commit is contained in:
Jeff Epler 2025-03-09 19:36:50 -05:00
parent 7c7569236b
commit a5f505241d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/include/piomatter/matrixmap.h
View file

@ -88,12 +88,12 @@ struct schedule_entry {
using schedule = std::vector<schedule_entry>; using schedule = std::vector<schedule_entry>;
using schedule_sequence = std::vector<schedule>; using schedule_sequence = std::vector<schedule>;
schedule_sequence make_simple_schedule(int n_planes, int pixels_across) { schedule_sequence make_simple_schedule(int n_planes, size_t pixels_across) {
if (n_planes < 1 || n_planes > 10) { if (n_planes < 1 || n_planes > 10) {
throw std::range_error("n_planes out of range"); throw std::range_error("n_planes out of range");
} }
schedule result; schedule result;
uint32_t max_count = 1 << n_planes; size_t max_count = 1 << n_planes;
while (max_count < pixels_across) while (max_count < pixels_across)
max_count <<= 1; max_count <<= 1;
@ -106,7 +106,8 @@ schedule_sequence make_simple_schedule(int n_planes, int pixels_across) {
// Make a temporal dither schedule. All the top `n_planes` are shown everytime, // Make a temporal dither schedule. All the top `n_planes` are shown everytime,
// but the lowest frames are done in a cycle of `n_temporal_frames`: // but the lowest frames are done in a cycle of `n_temporal_frames`:
// 2: {0, 1}; 4: {0, 1, 2, 3} // 2: {0, 1}; 4: {0, 1, 2, 3}
schedule_sequence make_temporal_dither_schedule(int n_planes, int pixels_across, schedule_sequence make_temporal_dither_schedule(int n_planes,
size_t pixels_across,
int n_temporal_planes) { int n_temporal_planes) {
if (n_planes < 1 || n_planes > 10) { if (n_planes < 1 || n_planes > 10) {
throw std::range_error("n_planes out of range"); throw std::range_error("n_planes out of range");
@ -181,8 +182,8 @@ struct matrix_geometry {
} }
size_t pixels_across, n_addr_lines, n_lanes; size_t pixels_across, n_addr_lines, n_lanes;
schedule_sequence schedules;
size_t width, height; size_t width, height;
matrix_map map; matrix_map map;
schedule_sequence schedules;
}; };
} // namespace piomatter } // namespace piomatter

1
src/include/piomatter/render.h
View file

@ -187,7 +187,6 @@ void protomatter_render_rgb10(std::vector<uint32_t> &result,
// address) // address)
const size_t n_addr = 1u << matrixmap.n_addr_lines; const size_t n_addr = 1u << matrixmap.n_addr_lines;
constexpr size_t n_bits = 10u;
const size_t pixels_across = matrixmap.pixels_across; const size_t pixels_across = matrixmap.pixels_across;
size_t prev_addr = n_addr - 1; size_t prev_addr = n_addr - 1;