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

working dual matrix setup

Browse source
This commit is contained in:
Jeff Epler 2024-12-18 08:41:36 -06:00
parent 56c0cc0cb2
commit 5792d45f73
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,5 +1,7 @@
protodemo: protodemo.c piolib/*.c | protomatter.pio.h
g++ -Og -ggdb -x c++ -Ipiolib/include -o $@ $^ -Wno-narrowing
protodemo: protodemo.c piolib/*.c protomatter.pio.h matrixmap.h include/*.h
g++ -Og -ggdb -x c++ -Iinclude -Ipiolib/include -o $@ $(filter %.c, $^) -Wno-narrowing
matrixmap.h:
protomatter.pio.h: protomatter.pio assemble.py
python assemble.py $< $@

2
matrixmap.h
View file

@ -61,7 +61,7 @@ MatrixMap make_matrixmap(
MatrixMap result;
result.reserve(width*height);
printf("width=%d across=%d panel_height=%d v_panels=%d\n", width, across, panel_height, v_panels);
printf("width=%d across=%d height=%d panel_height=%d v_panels=%d\n", width, across, height, panel_height, v_panels);
for(int i=0; i<half_panel_height; i++) {
for(int j=0; j<across; j++) {
int panel_no = j / width;

27
protodemo.c
View file

@ -227,8 +227,8 @@ uint32_t rgb(unsigned r, unsigned g, unsigned b) {
}
#define ACROSS (32)
#define DOWN (16)
#define ACROSS (128)
#define DOWN (32)
#define N_PLANES (10)
#define _ (0)
#define r (1023 << 20)
@ -239,7 +239,7 @@ uint32_t rgb(unsigned r, unsigned g, unsigned b) {
#define m (r|b)
#define w (r|g|b)
constexpr int width = 32, height = 16;
constexpr int width = 64, height = 64;
uint32_t pixels[height][width] = {
{_,w,_,_,r,r,_,_,_,g,_,_,b,b,b,_,c,c,_,_,y,_,y,_,m,m,m,_,w,w,w,_}, // 0
@ -290,6 +290,9 @@ void test_pattern(std::vector<uint32_t> &result, int offs) {
pixels[height-2][i] = colorwheel(2*i+128 + offs / 2);
pixels[height-1][i] = colorwheel(2*i+192 + offs / 7);
}
for(int i=0; i<height; i++) {
pixels[i][i] = rgb(0xff,0xff,0xff);
}
protomatter_convert(result, matrixmap, &pixels[0][0], ACROSS, DOWN, N_PLANES);
}
@ -301,6 +304,20 @@ static uint64_t monotonicns64() {
}
static void dump_matrixmap() {
FILE *f = fopen("matrixmap.txt", "w");
bool first = true;
fprintf(f, "[\n");
for(auto i : matrixmap) {
if (!first) { fprintf(f, ",\n"); }
first=false;
fprintf(f, "%u", i);
}
fprintf(f, "]\n");
fclose(f);
}
static void dump_test_pattern() {
FILE *f = fopen("pattern.txt", "w");
std::vector<uint32_t> data;
@ -336,9 +353,11 @@ static_assert(!(DOWN & (DOWN-1))); // is a power of two
int main(int argc, char **argv) {
int n = argc > 1 ? atoi(argv[1]) : 0;
matrixmap = make_matrixmap(width, height, 3, false, orientation_r180);
// matrixmap = make_matrixmap(width, height, 3, false, orientation_r180);
matrixmap = make_matrixmap(width, height, 4, true, orientation_normal);
if(n == 0) {
dump_matrixmap();
dump_test_pattern();
exit(0);
}