From 43dea743b645f9184a302ab10e51cad346391dd1 Mon Sep 17 00:00:00 2001 From: Louis Beaudoin Date: Sat, 17 Feb 2018 23:08:19 +0000 Subject: [PATCH] Added support for 64-row /32 scan with SmartMatrix Shield V4 --- src/SmartMatrix3.h | 14 +++++++++----- src/SmartMatrix_Impl.h | 12 ++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/SmartMatrix3.h b/src/SmartMatrix3.h index 7c21a39..ed641cf 100644 --- a/src/SmartMatrix3.h +++ b/src/SmartMatrix3.h @@ -129,17 +129,21 @@ class SmartMatrix3 { static SmartMatrix3* globalinstance; }; -#define SMARTMATRIX_HUB75_32ROW_MOD16SCAN 0 -#define SMARTMATRIX_HUB75_16ROW_MOD8SCAN 1 +#define SMARTMATRIX_HUB75_32ROW_MOD16SCAN 0 +#define SMARTMATRIX_HUB75_16ROW_MOD8SCAN 1 +#define SMARTMATRIX_HUB75_64ROW_MOD32SCAN 2 #define CONVERT_PANELTYPE_TO_MATRIXPANELHEIGHT(x) ((x == SMARTMATRIX_HUB75_32ROW_MOD16SCAN ? 32 : 0) | \ - (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 16 : 0)) + (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 16 : 0) | \ + (x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 64 : 0)) #define CONVERT_PANELTYPE_TO_MATRIXROWPAIROFFSET(x) ((x == SMARTMATRIX_HUB75_32ROW_MOD16SCAN ? 16 : 0) | \ - (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 8 : 0)) + (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 8 : 0) | \ + (x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 32 : 0)) #define CONVERT_PANELTYPE_TO_MATRIXROWSPERFRAME(x) ((x == SMARTMATRIX_HUB75_32ROW_MOD16SCAN ? 16 : 0) | \ - (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 8 : 0)) + (x == SMARTMATRIX_HUB75_16ROW_MOD8SCAN ? 8 : 0) | \ + (x == SMARTMATRIX_HUB75_64ROW_MOD32SCAN ? 32 : 0)) #define SMARTMATRIX_OPTIONS_NONE 0 #define SMARTMATRIX_OPTIONS_C_SHAPE_STACKING (1 << 0) diff --git a/src/SmartMatrix_Impl.h b/src/SmartMatrix_Impl.h index aa9abff..69107ba 100644 --- a/src/SmartMatrix_Impl.h +++ b/src/SmartMatrix_Impl.h @@ -957,21 +957,25 @@ INLINE void SmartMatrix3