Skip to content

Commit

Permalink
HUB75 - Add SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 panel mapping
Browse files Browse the repository at this point in the history
- Thanks @alamo!
  • Loading branch information
Louis Beaudoin committed Mar 11, 2021
1 parent 6e1a8ca commit 184e0e9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/MatrixCommonHub75.h
Expand Up @@ -39,6 +39,7 @@
#define SM_PANELTYPE_HUB75_16ROW_32COL_MOD4SCAN_V2 9
#define SM_PANELTYPE_HUB75_32ROW_64COL_MOD8SCAN 10
#define SM_PANELTYPE_HUB75_64ROW_64COL_MOD16SCAN 11
#define SM_PANELTYPE_HUB75_16ROW_32COL_MOD4SCAN_V3 12

#define SMARTMATRIX_HUB75_32ROW_MOD16SCAN SM_PANELTYPE_HUB75_32ROW_MOD16SCAN
#define SMARTMATRIX_HUB75_16ROW_MOD8SCAN SM_PANELTYPE_HUB75_16ROW_MOD8SCAN
Expand All @@ -52,6 +53,7 @@
#define SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2 SM_PANELTYPE_HUB75_16ROW_32COL_MOD4SCAN_V2
#define SMARTMATRIX_HUB75_32ROW_64COL_MOD8SCAN SM_PANELTYPE_HUB75_32ROW_64COL_MOD8SCAN
#define SMARTMATRIX_HUB75_64ROW_64COL_MOD16SCAN SM_PANELTYPE_HUB75_64ROW_64COL_MOD16SCAN
#define SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 SM_PANELTYPE_HUB75_16ROW_32COL_MOD4SCAN_V3

#define CONVERT_PANELTYPE_TO_MATRIXPANELHEIGHT(x) ((x == SMARTMATRIX_HUB75_32ROW_MOD16SCAN ? 32 : 0) | \
(x == SMARTMATRIX_HUB75_64ROW_64COL_MOD16SCAN ? 64 : 0) | \
Expand All @@ -63,6 +65,7 @@
(x == SMARTMATRIX_HUB75_32ROW_64COL_MOD8SCAN ? 32 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN ? 16 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2 ? 16 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 ? 16 : 0) | \
(x == SMARTMATRIX_HUB75_2ROW_MOD1SCAN ? 2 : 0) | \
(x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 64 : 0))

Expand All @@ -76,6 +79,7 @@
(x == SMARTMATRIX_HUB12_16ROW_32COL_MOD4SCAN ? 8*2 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN ? 8 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2 ? 8 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 ? 8 : 0) | \
(x == SMARTMATRIX_HUB75_2ROW_MOD1SCAN ? 1 : 0) | \
(x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 32 : 0))

Expand All @@ -88,6 +92,7 @@
(x == SMARTMATRIX_HUB12_16ROW_32COL_MOD4SCAN ? 4 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN ? 4 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2 ? 4 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 ? 4 : 0) | \
(x == SMARTMATRIX_HUB75_32ROW_64COL_MOD8SCAN ? 8 : 0) | \
(x == SMARTMATRIX_HUB75_2ROW_MOD1SCAN ? 1 : 0) | \
(x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 32 : 0))
Expand All @@ -102,6 +107,7 @@
(x == SMARTMATRIX_HUB75_32ROW_64COL_MOD8SCAN ? 64 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN ? 32 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2 ? 32 : 0) | \
(x == SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3 ? 32 : 0) | \
(x == SMARTMATRIX_HUB75_2ROW_MOD1SCAN ? DEFAULT_PANEL_WIDTH_FOR_LINEAR_PANELS : 0) | \
(x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? DEFAULT_PANEL_WIDTH_FOR_LINEAR_PANELS : 0))

Expand Down
15 changes: 15 additions & 0 deletions src/MatrixPanelMaps.cpp
Expand Up @@ -99,6 +99,19 @@ const PanelMappingEntry panelMap32x16Mod4V2[] =
{0, 0, 0} // last entry is all zeros
};

const PanelMappingEntry panelMap32x16Mod4V3[] =
{
{0, 8, 8},
{0, 24, 8},
{0, 40, 8},
{0, 56, 8},
{4, 0, 8},
{4, 16, 8},
{4, 32, 8},
{4, 48, 8},
{0, 0, 0} // last entry is all zeros
};

const PanelMappingEntry panelMap64x32Mod8[] =
{
{0, 64, 64},
Expand Down Expand Up @@ -127,6 +140,8 @@ const PanelMappingEntry * getMultiRowRefreshPanelMap(unsigned char panelType) {
return panelMap32x16Mod4;
case SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V2:
return panelMap32x16Mod4V2;
case SMARTMATRIX_HUB75_16ROW_32COL_MOD4SCAN_V3:
return panelMap32x16Mod4V3;
default:
return defaultPanelMap;
}
Expand Down

0 comments on commit 184e0e9

Please sign in to comment.