From a3423021140a0c9fd17adec0e826304fd8c6d112 Mon Sep 17 00:00:00 2001
From: SenexCrenshaw <35600301+SenexCrenshaw@users.noreply.github.com>
Date: Sun, 14 Feb 2021 00:21:43 -0500
Subject: [PATCH] st7735_conf_fixes (#1530)

---
 esphome/components/st7735/display.py | 97 +++++++++++++++++-----------
 tests/test1.yaml                     |  8 +--
 2 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/esphome/components/st7735/display.py b/esphome/components/st7735/display.py
index 902f9c8beb..f1e7d37d51 100644
--- a/esphome/components/st7735/display.py
+++ b/esphome/components/st7735/display.py
@@ -4,50 +4,67 @@ from esphome import pins
 from esphome.components import spi
 from esphome.components import display
 from esphome.core import coroutine
-from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN, CONF_PAGES
+from esphome.const import (
+    CONF_DC_PIN,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_RESET_PIN,
+    CONF_PAGES,
+)
 from . import st7735_ns
 
-CODEOWNERS = ['@SenexCrenshaw']
+CODEOWNERS = ["@SenexCrenshaw"]
 
-DEPENDENCIES = ['spi']
+DEPENDENCIES = ["spi"]
 
-CONF_DEVICEWIDTH = 'devicewidth'
-CONF_DEVICEHEIGHT = 'deviceheight'
-CONF_ROWSTART = 'rowstart'
-CONF_COLSTART = 'colstart'
-CONF_EIGHTBITCOLOR = 'eightbitcolor'
-CONF_USEBGR = 'usebgr'
+CONF_DEVICE_WIDTH = "device_width"
+CONF_DEVICE_HEIGHT = "device_height"
+CONF_ROW_START = "row_start"
+CONF_COL_START = "col_start"
+CONF_EIGHT_BIT_COLOR = "eight_bit_color"
+CONF_USE_BGR = "use_bgr"
 
-SPIST7735 = st7735_ns.class_('ST7735', cg.PollingComponent, display.DisplayBuffer, spi.SPIDevice)
-ST7735Model = st7735_ns.enum('ST7735Model')
+SPIST7735 = st7735_ns.class_(
+    "ST7735", cg.PollingComponent, display.DisplayBuffer, spi.SPIDevice
+)
+ST7735Model = st7735_ns.enum("ST7735Model")
 
 MODELS = {
-    'INITR_GREENTAB': ST7735Model.ST7735_INITR_GREENTAB,
-    'INITR_REDTAB': ST7735Model.ST7735_INITR_REDTAB,
-    'INITR_BLACKTAB': ST7735Model.ST7735_INITR_BLACKTAB,
-    'INITR_MINI160X80': ST7735Model.ST7735_INITR_MINI_160X80,
-    'INITR_18BLACKTAB':  ST7735Model.ST7735_INITR_18BLACKTAB,
-    'INITR_18REDTAB': ST7735Model.ST7735_INITR_18REDTAB
+    "INITR_GREENTAB": ST7735Model.ST7735_INITR_GREENTAB,
+    "INITR_REDTAB": ST7735Model.ST7735_INITR_REDTAB,
+    "INITR_BLACKTAB": ST7735Model.ST7735_INITR_BLACKTAB,
+    "INITR_MINI160X80": ST7735Model.ST7735_INITR_MINI_160X80,
+    "INITR_18BLACKTAB": ST7735Model.ST7735_INITR_18BLACKTAB,
+    "INITR_18REDTAB": ST7735Model.ST7735_INITR_18REDTAB,
 }
 ST7735_MODEL = cv.enum(MODELS, upper=True, space="_")
 
 
-ST7735_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
-    cv.Required(CONF_MODEL): ST7735_MODEL,
-    cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema
-}).extend(cv.polling_component_schema('1s'))
+ST7735_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
+    {
+        cv.Required(CONF_MODEL): ST7735_MODEL,
+        cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    }
+).extend(cv.polling_component_schema("1s"))
 
-CONFIG_SCHEMA = cv.All(ST7735_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_id(SPIST7735),
-    cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-    cv.Required(CONF_DEVICEWIDTH): cv.int_,
-    cv.Required(CONF_DEVICEHEIGHT):  cv.int_,
-    cv.Required(CONF_COLSTART):  cv.int_,
-    cv.Required(CONF_ROWSTART):  cv.int_,
-    cv.Optional(CONF_EIGHTBITCOLOR, default=False): cv.boolean,
-    cv.Optional(CONF_USEBGR, default=False):  cv.boolean,
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema()),
-                       cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
+CONFIG_SCHEMA = cv.All(
+    ST7735_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(SPIST7735),
+            cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+            cv.Required(CONF_DEVICE_WIDTH): cv.int_,
+            cv.Required(CONF_DEVICE_HEIGHT): cv.int_,
+            cv.Required(CONF_COL_START): cv.int_,
+            cv.Required(CONF_ROW_START): cv.int_,
+            cv.Optional(CONF_EIGHT_BIT_COLOR, default=False): cv.boolean,
+            cv.Optional(CONF_USE_BGR, default=False): cv.boolean,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(spi.spi_device_schema()),
+    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
+)
 
 
 @coroutine
@@ -60,14 +77,22 @@ def setup_st7735(var, config):
         cg.add(var.set_reset_pin(reset))
     if CONF_LAMBDA in config:
         lambda_ = yield cg.process_lambda(
-            config[CONF_LAMBDA], [(display.DisplayBufferRef, 'it')], return_type=cg.void)
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
+        )
         cg.add(var.set_writer(lambda_))
 
 
 def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID], config[CONF_MODEL], config[CONF_DEVICEWIDTH],
-                           config[CONF_DEVICEHEIGHT], config[CONF_COLSTART], config[CONF_ROWSTART],
-                           config[CONF_EIGHTBITCOLOR], config[CONF_USEBGR])
+    var = cg.new_Pvariable(
+        config[CONF_ID],
+        config[CONF_MODEL],
+        config[CONF_DEVICE_WIDTH],
+        config[CONF_DEVICE_HEIGHT],
+        config[CONF_COL_START],
+        config[CONF_ROW_START],
+        config[CONF_EIGHT_BIT_COLOR],
+        config[CONF_USE_BGR],
+    )
     yield setup_st7735(var, config)
     yield spi.register_spi_device(var, config)
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 84dd8eeaf4..102c3ac703 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1825,10 +1825,10 @@ display:
     dc_pin: GPIO16
     reset_pin: GPIO23
     rotation: 0
-    devicewidth: 128
-    deviceheight: 160
-    colstart: 0
-    rowstart: 0
+    device_width: 128
+    device_height: 160
+    col_start: 0
+    row_start: 0
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
 tm1651: