summaryrefslogtreecommitdiff
path: root/quantum/painter
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/painter')
-rw-r--r--quantum/painter/qp.h6
-rw-r--r--quantum/painter/qp_draw.h5
-rw-r--r--quantum/painter/qp_draw_codec.c40
-rw-r--r--quantum/painter/qp_draw_image.c29
-rw-r--r--quantum/painter/qp_draw_text.c11
-rw-r--r--quantum/painter/qp_internal.c1
-rw-r--r--quantum/painter/rules.mk12
7 files changed, 68 insertions, 36 deletions
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index 873a9d9f32..02acbf589a 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -509,6 +509,12 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
# define ILI9341_NUM_DEVICES 0
#endif // QUANTUM_PAINTER_ILI9341_ENABLE
+#ifdef QUANTUM_PAINTER_ILI9486_ENABLE
+# include "qp_ili9486.h"
+#else // QUANTUM_PAINTER_ILI9486_ENABLE
+# define ILI9486_NUM_DEVICES 0
+#endif // QUANTUM_PAINTER_ILI9486_ENABLE
+
#ifdef QUANTUM_PAINTER_ILI9488_ENABLE
# include "qp_ili9488.h"
#else // QUANTUM_PAINTER_ILI9488_ENABLE
diff --git a/quantum/painter/qp_draw.h b/quantum/painter/qp_draw.h
index 3d073efe8c..7546c061a7 100644
--- a/quantum/painter/qp_draw.h
+++ b/quantum/painter/qp_draw.h
@@ -92,4 +92,9 @@ typedef struct qp_internal_byte_output_state_t {
bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg);
+// Helper shared between image and font rendering, sends pixels to the display using:
+// - qp_internal_decode_palette + qp_internal_pixel_appender (bpp <= 8)
+// - qp_internal_send_bytes (bpp > 8)
+bool qp_internal_appender(painter_device_t device, uint8_t bpp, uint32_t pixel_count, qp_internal_byte_input_callback input_callback, void* input_state);
+
qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression);
diff --git a/quantum/painter/qp_draw_codec.c b/quantum/painter/qp_draw_codec.c
index cee2e32e28..4ff41d0650 100644
--- a/quantum/painter/qp_draw_codec.c
+++ b/quantum/painter/qp_draw_codec.c
@@ -1,4 +1,5 @@
// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
// SPDX-License-Identifier: GPL-2.0-or-later
#include "qp_internal.h"
@@ -164,6 +165,45 @@ bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg) {
return true;
}
+// Helper shared between image and font rendering -- uses either (qp_internal_decode_palette + qp_internal_pixel_appender) or (qp_internal_send_bytes) to send data data to the display based on the asset's native-ness
+bool qp_internal_appender(painter_device_t device, uint8_t bpp, uint32_t pixel_count, qp_internal_byte_input_callback input_callback, void* input_state) {
+ painter_driver_t* driver = (painter_driver_t*)device;
+
+ bool ret = false;
+
+ // Non-native pixel format
+ if (bpp <= 8) {
+ // Set up the output state
+ qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
+
+ // Decode the pixel data and stream to the display
+ ret = qp_internal_decode_palette(device, pixel_count, bpp, input_callback, input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, &output_state);
+ // Any leftovers need transmission as well.
+ if (ret && output_state.pixel_write_pos > 0) {
+ ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
+ }
+ }
+
+ // Native pixel format
+ else if (bpp != driver->native_bits_per_pixel) {
+ qp_dprintf("Asset's bpp (%d) doesn't match the target display's native_bits_per_pixel (%d)\n", bpp, driver->native_bits_per_pixel);
+ return false;
+ } else {
+ // Set up the output state
+ qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
+
+ // Stream the raw pixel data to the display
+ uint32_t byte_count = pixel_count * bpp / 8;
+ ret = qp_internal_send_bytes(device, byte_count, input_callback, input_state, qp_internal_byte_appender, &output_state);
+ // Any leftovers need transmission as well.
+ if (ret && output_state.byte_write_pos > 0) {
+ ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.byte_write_pos * 8 / driver->native_bits_per_pixel);
+ }
+ }
+
+ return ret;
+}
+
qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression) {
switch (compression) {
case IMAGE_UNCOMPRESSED:
diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c
index 87c59148c2..18fa38cb19 100644
--- a/quantum/painter/qp_draw_image.c
+++ b/quantum/painter/qp_draw_image.c
@@ -263,33 +263,8 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
return false;
}
- bool ret = false;
- if (!frame_info->is_panel_native) {
- // Set up the output state
- qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
-
- // Decode the pixel data and stream to the display
- ret = qp_internal_decode_palette(device, pixel_count, frame_info->bpp, input_callback, &input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, &output_state);
- // Any leftovers need transmission as well.
- if (ret && output_state.pixel_write_pos > 0) {
- ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
- }
- } else if (frame_info->bpp != driver->native_bits_per_pixel) {
- // Prevent stuff like drawing 24bpp images on 16bpp displays
- qp_dprintf("Image's bpp doesn't match the target display's native_bits_per_pixel\n");
- return false;
- } else {
- // Set up the output state
- qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
-
- // Stream the raw pixel data to the display
- uint32_t byte_count = pixel_count * frame_info->bpp / 8;
- ret = qp_internal_send_bytes(device, byte_count, input_callback, &input_state, qp_internal_byte_appender, &output_state);
- // Any leftovers need transmission as well.
- if (ret && output_state.byte_write_pos > 0) {
- ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.byte_write_pos * 8 / driver->native_bits_per_pixel);
- }
- }
+ // Decode and stream pixels
+ bool ret = qp_internal_appender(device, frame_info->bpp, pixel_count, input_callback, &input_state);
qp_dprintf("qp_drawimage_recolor: %s\n", ret ? "ok" : "fail");
qp_comms_stop(device);
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c
index 1ac5cab646..664c89c6e5 100644
--- a/quantum/painter/qp_draw_text.c
+++ b/quantum/painter/qp_draw_text.c
@@ -364,16 +364,9 @@ static inline bool qp_font_code_point_handler_drawglyph(qff_font_handle_t *qff_f
// Move the x-position for the next glyph
state->xpos += width;
- // Decode the pixel data for the glyph
+ // Decode the pixel data for the glyph, and stream it
uint32_t pixel_count = ((uint32_t)width) * height;
- bool ret = qp_internal_decode_palette(state->device, pixel_count, qff_font->bpp, state->input_callback, state->input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, state->output_state);
-
- // Any leftovers need transmission as well.
- if (ret && state->output_state->pixel_write_pos > 0) {
- ret &= driver->driver_vtable->pixdata(state->device, qp_internal_global_pixdata_buffer, state->output_state->pixel_write_pos);
- }
-
- return ret;
+ return qp_internal_appender(state->device, qff_font->bpp, pixel_count, state->input_callback, state->input_state);
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/quantum/painter/qp_internal.c b/quantum/painter/qp_internal.c
index 0e81467e26..1f0f981796 100644
--- a/quantum/painter/qp_internal.c
+++ b/quantum/painter/qp_internal.c
@@ -11,6 +11,7 @@ enum {
// NOTE: We intentionally do not include surfaces here, despite them conforming to the same API.
QP_NUM_DEVICES = (ILI9163_NUM_DEVICES) // ILI9163
+ (ILI9341_NUM_DEVICES) // ILI9341
+ + (ILI9486_NUM_DEVICES) // ILI9486
+ (ILI9488_NUM_DEVICES) // ILI9488
+ (ST7789_NUM_DEVICES) // ST7789
+ (ST7735_NUM_DEVICES) // ST7735
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index ca81cffb03..d991a6d742 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -9,6 +9,7 @@ VALID_QUANTUM_PAINTER_DRIVERS := \
surface \
ili9163_spi \
ili9341_spi \
+ ili9486_spi \
ili9488_spi \
st7735_spi \
st7789_spi \
@@ -80,6 +81,17 @@ define handle_quantum_painter_driver
$(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
$(DRIVER_PATH)/painter/ili9xxx/qp_ili9341.c \
+ else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9486_spi)
+ QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+ QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+ OPT_DEFS += -DQUANTUM_PAINTER_ILI9486_ENABLE -DQUANTUM_PAINTER_ILI9486_SPI_ENABLE
+ COMMON_VPATH += \
+ $(DRIVER_PATH)/painter/tft_panel \
+ $(DRIVER_PATH)/painter/ili9xxx
+ SRC += \
+ $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
+ $(DRIVER_PATH)/painter/ili9xxx/qp_ili9486.c \
+
else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9488_spi)
QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 09:21:14 +0000