diff options
| author | Jagoda Estera Ślązak <jslazak@jslazak.com> | 2025-02-08 14:48:07 +0100 |
|---|---|---|
| committer | Jagoda Estera Ślązak <jslazak@jslazak.com> | 2025-02-08 14:48:07 +0100 |
| commit | 6f7d1839c832609bbf4294bf4bcfdee15f11c1cf (patch) | |
| tree | af42d77a3755a00ade467a81d60e5672d26a70d4 /src | |
| parent | 79ab7e76f82978b4afca19916e9116a416a8b066 (diff) | |
| parent | 7d2ed7936ddcc9202341351e97b45d0e8edced2c (diff) | |
Merge branch 'use_uint8_t_for_panel_resolutions' of https://github.com/j-g00da/ESP32-HUB75-MatrixPanel-DMA into scan_rate_pixel_base
# Conflicts:
# src/ESP32-VirtualMatrixPanel-I2S-DMA.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/ESP32-VirtualMatrixPanel-I2S-DMA.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ESP32-VirtualMatrixPanel-I2S-DMA.h b/src/ESP32-VirtualMatrixPanel-I2S-DMA.h index ac4c1f9..a38f0e9 100644 --- a/src/ESP32-VirtualMatrixPanel-I2S-DMA.h +++ b/src/ESP32-VirtualMatrixPanel-I2S-DMA.h @@ -136,8 +136,8 @@ public: #endif #ifdef NO_GFX - inline int16_t width() const { return _virtualResX; } - inline int16_t height() const { return _virtualResY; } + inline uint16_t width() const { return _virtualResX; } + inline uint16_t height() const { return _virtualResY; } #endif uint16_t color444(uint8_t r, uint8_t g, uint8_t b) @@ -156,8 +156,8 @@ public: virtual VirtualCoords getCoords(int16_t x, int16_t y); VirtualCoords coords; - int16_t panelResX; - int16_t panelResY; + uint8_t panelResX; + uint8_t panelResY; int16_t panel_pixel_base; private: @@ -166,17 +166,17 @@ private: PANEL_CHAIN_TYPE panel_chain_type; PANEL_SCAN_RATE panel_scan_rate = NORMAL_TWO_SCAN; - int16_t virtualResX; ///< Display width as combination of panels - int16_t virtualResY; ///< Display height as combination of panels + uint16_t virtualResX; ///< Display width as combination of panels + uint16_t virtualResY; ///< Display height as combination of panels - int16_t _virtualResX; ///< Display width as modified by current rotation - int16_t _virtualResY; ///< Display height as modified by current rotation + uint16_t _virtualResX; ///< Display width as modified by current rotation + uint16_t _virtualResY; ///< Display height as modified by current rotation - int16_t vmodule_rows; - int16_t vmodule_cols; + uint8_t vmodule_rows; + uint8_t vmodule_cols; - int16_t dmaResX; // The width of the chain in pixels (as the DMA engine sees it) + uint16_t dmaResX; // The width of the chain in pixels (as the DMA engine sees it) int _rotate = 0; |