Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated ZStripeMultiplexMapper to support variable tile sizes #1590

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated ZStripeMultiplexMapper to support variable tile sizes #1590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71b7776
Updated ZStripeMultiplexMapper to suport variable tile sizes
andytheengineerguy Sep 8, 2023
17532ac
Added a new multiplexing mapping P4Outdoor80x40, which apparently wor…
andytheengineerguy Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions lib/multiplex-mappers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,16 @@ class SpiralMultiplexMapper : public MultiplexMapperBase {

class ZStripeMultiplexMapper : public MultiplexMapperBase {
public:
ZStripeMultiplexMapper(const char *name, int even_vblock_offset, int odd_vblock_offset)
ZStripeMultiplexMapper(const char *name, int even_vblock_offset, int odd_vblock_offset, int width, int height)
: MultiplexMapperBase(name, 2),
even_vblock_offset_(even_vblock_offset),
odd_vblock_offset_(odd_vblock_offset) {}
odd_vblock_offset_(odd_vblock_offset),
width_(width),
height_(height) {}

void MapSinglePanel(int x, int y, int *matrix_x, int *matrix_y) const {
static const int tile_width = 8;
static const int tile_height = 4;
static const int tile_width = width_;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you use width_ and height_ member variables, you can't assign this to static variables here, as they are global and override them with whoever ran last.

Just replace all uses of tile_height, and tile_width with the new members height_ and width_.

static const int tile_height = height_;

const int vert_block_is_odd = ((y / tile_height) % 2);

Expand All @@ -174,6 +176,8 @@ class ZStripeMultiplexMapper : public MultiplexMapperBase {
private:
const int even_vblock_offset_;
const int odd_vblock_offset_;
const int width_;
const int height_;
};

class CoremanMapper : public MultiplexMapperBase {
Expand Down Expand Up @@ -454,6 +458,17 @@ class P10Outdoor32x16HalfScanMapper : public MultiplexMapperBase {
}
};

class P4Outdoor80x40 : public MultiplexMapperBase {
public:
P4Outdoor80x40() : MultiplexMapperBase("P4Outdoor80x40", 2) {}

void MapSinglePanel(int x, int y, int *matrix_x, int *matrix_y) const {
int shift = (y / (panel_rows_ / 4)) % 2;
*matrix_y = ((y / (panel_rows_/2)) * (panel_rows_/4) + y % (panel_rows_/4));
*matrix_x = ((x * 2) + (shift ? 0 : 1));
}
};

/*
* Here is where the registration happens.
* If you add an instance of the mapper here, it will automatically be
Expand All @@ -466,11 +481,11 @@ static MuxMapperList *CreateMultiplexMapperList() {
result->push_back(new StripeMultiplexMapper());
result->push_back(new CheckeredMultiplexMapper());
result->push_back(new SpiralMultiplexMapper());
result->push_back(new ZStripeMultiplexMapper("ZStripe", 0, 8));
result->push_back(new ZStripeMultiplexMapper("ZnMirrorZStripe", 4, 4));
result->push_back(new ZStripeMultiplexMapper("ZStripe", 0, 8, 8, 4));
result->push_back(new ZStripeMultiplexMapper("ZnMirrorZStripe", 4, 4, 8, 4));
result->push_back(new CoremanMapper());
result->push_back(new Kaler2ScanMapper());
result->push_back(new ZStripeMultiplexMapper("ZStripeUneven", 8, 0));
result->push_back(new ZStripeMultiplexMapper("ZStripeUneven", 8, 0, 8, 4));
result->push_back(new P10MapperZ());
result->push_back(new QiangLiQ8());
result->push_back(new InversedZStripe());
Expand All @@ -481,6 +496,8 @@ static MuxMapperList *CreateMultiplexMapperList() {
result->push_back(new P8Outdoor1R1G1BMultiplexMapper());
result->push_back(new FlippedStripeMultiplexMapper());
result->push_back(new P10Outdoor32x16HalfScanMapper());
result->push_back(new ZStripeMultiplexMapper("P3Outdoor104x52", 4, 4, 8, 13)); //note: 13 tile height needed for this
result->push_back(new P4Outdoor80x40()); //this mapping also worked with a version of the 104*52 panels!
return result;
}

Expand Down