From e299d9b52be2cacf66f213402e4a9df12e892298 Mon Sep 17 00:00:00 2001 From: Antoine Weill--Duflos Date: Sun, 1 Dec 2024 16:47:54 -0500 Subject: [PATCH] renames flip to mirror --- esphome/components/inkplate6/display.py | 18 ++++++++++++------ esphome/components/inkplate6/inkplate.cpp | 4 ++-- esphome/components/inkplate6/inkplate.h | 8 ++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/esphome/components/inkplate6/display.py b/esphome/components/inkplate6/display.py index dc0106f2b6..8971e62e8d 100644 --- a/esphome/components/inkplate6/display.py +++ b/esphome/components/inkplate6/display.py @@ -10,6 +10,9 @@ from esphome.const import ( CONF_OE_PIN, CONF_PAGES, CONF_WAKEUP_PIN, + CONF_TRANSFORM, + CONF_MIRROR_X, + CONF_MIRROR_Y ) DEPENDENCIES = ["i2c", "esp32"] @@ -35,8 +38,6 @@ CONF_POWERUP_PIN = "powerup_pin" CONF_SPH_PIN = "sph_pin" CONF_SPV_PIN = "spv_pin" CONF_VCOM_PIN = "vcom_pin" -CONF_FLIP_Y = "flip_y" -CONF_FLIP_X = "flip_x" inkplate6_ns = cg.esphome_ns.namespace("inkplate6") Inkplate6 = inkplate6_ns.class_( @@ -63,8 +64,12 @@ CONFIG_SCHEMA = cv.All( { cv.GenerateID(): cv.declare_id(Inkplate6), cv.Optional(CONF_GREYSCALE, default=False): cv.boolean, - cv.Optional(CONF_FLIP_Y, default=False): cv.boolean, - cv.Optional(CONF_FLIP_X, default=False): cv.boolean, + cv.Optional(CONF_TRANSFORM): cv.Schema( + { + cv.Optional(CONF_MIRROR_X, default=False): cv.boolean, + cv.Optional(CONF_MIRROR_Y, default=False): cv.boolean, + } + ), cv.Optional(CONF_PARTIAL_UPDATING, default=True): cv.boolean, cv.Optional(CONF_FULL_UPDATE_EVERY, default=10): cv.uint32_t, cv.Optional(CONF_MODEL, default="inkplate_6"): cv.enum( @@ -129,8 +134,9 @@ async def to_code(config): cg.add(var.set_writer(lambda_)) cg.add(var.set_greyscale(config[CONF_GREYSCALE])) - cg.add(var.set_flip_y(config[CONF_FLIP_Y])) - cg.add(var.set_flip_x(config[CONF_FLIP_X])) + if transform := config.get(CONF_TRANSFORM): + cg.add(var.set_mirror_x(transform[CONF_MIRROR_X])) + cg.add(var.set_mirror_y(transform[CONF_MIRROR_Y])) cg.add(var.set_partial_updating(config[CONF_PARTIAL_UPDATING])) cg.add(var.set_full_update_every(config[CONF_FULL_UPDATE_EVERY])) diff --git a/esphome/components/inkplate6/inkplate.cpp b/esphome/components/inkplate6/inkplate.cpp index eae0077f2f..8178ed0812 100644 --- a/esphome/components/inkplate6/inkplate.cpp +++ b/esphome/components/inkplate6/inkplate.cpp @@ -156,10 +156,10 @@ void HOT Inkplate6::draw_absolute_pixel_internal(int x, int y, Color color) { if (x >= this->get_width_internal() || y >= this->get_height_internal() || x < 0 || y < 0) return; - if (this->flip_y_) + if (this->mirror_y_) y = this->get_height_internal() - y - 1; - if (this->flip_x_) + if (this->mirror_x_) x = this->get_width_internal() - x - 1; if (this->greyscale_) { diff --git a/esphome/components/inkplate6/inkplate.h b/esphome/components/inkplate6/inkplate.h index e629a13df8..e0a4a4b78d 100644 --- a/esphome/components/inkplate6/inkplate.h +++ b/esphome/components/inkplate6/inkplate.h @@ -92,8 +92,8 @@ class Inkplate6 : public display::DisplayBuffer, public i2c::I2CDevice { if (this->is_ready()) this->initialize_(); } - void set_flip_y(bool flip_y) { this->flip_y_ = flip_y; } - void set_flip_x(bool flip_x) { this->flip_x_ = flip_x; } + void set_mirror_y(bool mirror_y) { this->mirror_y_ = mirror_y; } + void set_mirror_x(bool mirror_x) { this->mirror_x_ = mirror_x; } void set_partial_updating(bool partial_updating) { this->partial_updating_ = partial_updating; } void set_full_update_every(uint32_t full_update_every) { this->full_update_every_ = full_update_every; } @@ -224,8 +224,8 @@ class Inkplate6 : public display::DisplayBuffer, public i2c::I2CDevice { bool block_partial_{true}; bool greyscale_; - bool flip_y_; - bool flip_x_; + bool mirror_y_; + bool mirror_x_; bool partial_updating_; InkplateModel model_;