ScStw/ESP32-HUB75-MatrixPanel-DMA
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update ESP32-HUB75-MatrixPanel-I2S-DMA.cpp

Browse source
This commit is contained in:
Kouzerumatsu / Bananafox 2023-02-08 22:51:51 +08:00
parent d87ffe3be4
commit 5a12ff59a2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ESP32-HUB75-MatrixPanel-I2S-DMA.cpp
View file

@ -27,14 +27,14 @@
* However, if the library is to be used with lower colour depth (i.e. 6 bit colour), then we need to ensure the 8-bit value passed to the colour masking * However, if the library is to be used with lower colour depth (i.e. 6 bit colour), then we need to ensure the 8-bit value passed to the colour masking
* is adjusted accordingly to ensure the LSB's are shifted left to MSB, by the difference. Otherwise the colours will be all screwed up. * is adjusted accordingly to ensure the LSB's are shifted left to MSB, by the difference. Otherwise the colours will be all screwed up.
*/ */
#if PIXEL_COLOUR_DEPTH_BITS > 12 #if PIXEL_COLOR_DEPTH_BITS > 12
#error "Color depth bits cannot be greater than 12." #error "Color depth bits cannot be greater than 12."
#elif PIXEL_COLOUR_DEPTH_BITS < 2 #elif PIXEL_COLOR_DEPTH_BITS < 2
#error "Colour depth bits cannot be less than 2." #error "Color depth bits cannot be less than 2."
#endif #endif
#define MASK_OFFSET (16 - PIXEL_COLOUR_DEPTH_BITS) #define MASK_OFFSET (16 - PIXEL_COLOR_DEPTH_BITS)
#define PIXEL_COLOUR_MASK_BIT(colour_depth_index) (1 << (colour_depth_index + MASK_OFFSET)) #define PIXEL_COLOR_MASK_BIT(color_depth_index) (1 << (color_depth_index + MASK_OFFSET))
//static constexpr uint8_t const MASK_OFFSET = 8-PIXEL_COLOUR_DEPTH_BITS; //static constexpr uint8_t const MASK_OFFSET = 8-PIXEL_COLOUR_DEPTH_BITS;
/* /*
@ -363,7 +363,7 @@ uint16_t red16, green16, blue16;
uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit color (8 bits per RGB subpixel) uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit color (8 bits per RGB subpixel)
#endif #endif
*/ */
uint16_t mask = PIXEL_COLOUR_MASK_BIT(colour_depth_idx); uint16_t mask = PIXEL_COLOR_MASK_BIT(colour_depth_idx);
uint16_t RGB_output_bits = 0; uint16_t RGB_output_bits = 0;
/* Per the .h file, the order of the output RGB bits is: /* Per the .h file, the order of the output RGB bits is:
@ -421,7 +421,7 @@ uint16_t red16, green16, blue16;
// uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel) // uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel)
// #endif // #endif
uint16_t mask = PIXEL_COLOUR_MASK_BIT(colour_depth_idx); uint16_t mask = PIXEL_COLOR_MASK_BIT(colour_depth_idx);
/* Per the .h file, the order of the output RGB bits is: /* Per the .h file, the order of the output RGB bits is:
* BIT_B2, BIT_G2, BIT_R2, BIT_B1, BIT_G1, BIT_R1 */ * BIT_B2, BIT_G2, BIT_R2, BIT_B1, BIT_G1, BIT_R1 */
@ -872,7 +872,7 @@ uint16_t red16, green16, blue16;
// #else // #else
// uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel) // uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel)
// #endif // #endif
uint16_t mask = PIXEL_COLOUR_MASK_BIT(colour_depth_idx); uint16_t mask = PIXEL_COLOR_MASK_BIT(colour_depth_idx);
/* Per the .h file, the order of the output RGB bits is: /* Per the .h file, the order of the output RGB bits is:
* BIT_B2, BIT_G2, BIT_R2, BIT_B1, BIT_G1, BIT_R1 */ * BIT_B2, BIT_G2, BIT_R2, BIT_B1, BIT_G1, BIT_R1 */
@ -962,7 +962,7 @@ uint16_t red16, green16, blue16;
// uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel) // uint8_t mask = (1 << (colour_depth_idx)); // expect 24 bit colour (8 bits per RGB subpixel)
// #endif // #endif
uint16_t mask = PIXEL_COLOUR_MASK_BIT(colour_depth_idx); uint16_t mask = PIXEL_COLOR_MASK_BIT(colour_depth_idx);
uint16_t RGB_output_bits = 0; uint16_t RGB_output_bits = 0;
/* Per the .h file, the order of the output RGB bits is: /* Per the .h file, the order of the output RGB bits is: