Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-14 02:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "add Pico-ResTouch-LCD-3.5" (#6098)

Browse source
This commit is contained in:
NP v/d Spek 2024-01-15 07:41:01 +01:00 committed by GitHub
parent 8cd1798674
commit 412c999f14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
esphome/components/ili9xxx/display.py
View file

@ -66,7 +66,6 @@ MODELS = {
"ST7789V": ili9xxx_ns.class_("ILI9XXXST7789V", ILI9XXXDisplay), "ST7789V": ili9xxx_ns.class_("ILI9XXXST7789V", ILI9XXXDisplay),
"S3BOX": ili9xxx_ns.class_("ILI9XXXS3Box", ILI9XXXDisplay), "S3BOX": ili9xxx_ns.class_("ILI9XXXS3Box", ILI9XXXDisplay),
"S3BOX_LITE": ili9xxx_ns.class_("ILI9XXXS3BoxLite", ILI9XXXDisplay), "S3BOX_LITE": ili9xxx_ns.class_("ILI9XXXS3BoxLite", ILI9XXXDisplay),
"WSPICOLCD": ili9xxx_ns.class_("ILI9XXXWSPICOLCD", ILI9XXXDisplay),
} }
COLOR_ORDERS = { COLOR_ORDERS = {
@ -79,7 +78,6 @@ COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
CONF_LED_PIN = "led_pin" CONF_LED_PIN = "led_pin"
CONF_COLOR_PALETTE_IMAGES = "color_palette_images" CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
CONF_INVERT_DISPLAY = "invert_display" CONF_INVERT_DISPLAY = "invert_display"
CONF_18BIT_MODE = "18bit_mode"
def _validate(config): def _validate(config):
@ -141,7 +139,6 @@ CONFIG_SCHEMA = cv.All(
"'invert_display' has been replaced by 'invert_colors'" "'invert_display' has been replaced by 'invert_colors'"
), ),
cv.Optional(CONF_INVERT_COLORS): cv.boolean, cv.Optional(CONF_INVERT_COLORS): cv.boolean,
cv.Optional(CONF_18BIT_MODE): cv.boolean,
cv.Optional(CONF_COLOR_ORDER): cv.one_of(*COLOR_ORDERS.keys(), upper=True), cv.Optional(CONF_COLOR_ORDER): cv.one_of(*COLOR_ORDERS.keys(), upper=True),
cv.Exclusive(CONF_ROTATION, CONF_ROTATION): validate_rotation, cv.Exclusive(CONF_ROTATION, CONF_ROTATION): validate_rotation,
cv.Exclusive(CONF_TRANSFORM, CONF_ROTATION): cv.Schema( cv.Exclusive(CONF_TRANSFORM, CONF_ROTATION): cv.Schema(
@ -244,6 +241,3 @@ async def to_code(config):
if CONF_INVERT_COLORS in config: if CONF_INVERT_COLORS in config:
cg.add(var.invert_colors(config[CONF_INVERT_COLORS])) cg.add(var.invert_colors(config[CONF_INVERT_COLORS]))
if CONF_18BIT_MODE in config:
cg.add(var.set_18bit_mode(config[CONF_18BIT_MODE]))

3
esphome/components/ili9xxx/ili9xxx_display.cpp
View file

@ -34,9 +34,6 @@ void ILI9XXXDisplay::setup() {
mad |= MADCTL_MY; mad |= MADCTL_MY;
this->send_command(ILI9XXX_MADCTL, &mad, 1); this->send_command(ILI9XXX_MADCTL, &mad, 1);
mad = this->is_18bitdisplay_ ? 0x66 : 0x55;
this->send_command(ILI9XXX_PIXFMT, &mad, 1);
this->x_low_ = this->width_; this->x_low_ = this->width_;
this->y_low_ = this->height_; this->y_low_ = this->height_;
this->x_high_ = 0; this->x_high_ = 0;

10
esphome/components/ili9xxx/ili9xxx_display.h
View file

@ -53,9 +53,9 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
addr += num_args; addr += num_args;
} }
} }
float get_setup_priority() const override;
void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; } void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
float get_setup_priority() const override;
void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; } void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
void set_palette(const uint8_t *palette) { this->palette_ = palette; } void set_palette(const uint8_t *palette) { this->palette_ = palette; }
void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; } void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
@ -67,10 +67,7 @@ class ILI9XXXDisplay : public display::DisplayBuffer,
this->offset_x_ = offset_x; this->offset_x_ = offset_x;
this->offset_y_ = offset_y; this->offset_y_ = offset_y;
} }
void set_18bit_mode(bool mode) { this->is_18bitdisplay_ = mode; };
void invert_colors(bool invert); void invert_colors(bool invert);
void command(uint8_t value); void command(uint8_t value);
void data(uint8_t value); void data(uint8_t value);
void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes); void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
@ -212,10 +209,5 @@ class ILI9XXXS3BoxLite : public ILI9XXXDisplay {
ILI9XXXS3BoxLite() : ILI9XXXDisplay(INITCMD_S3BOXLITE, 320, 240, true) {} ILI9XXXS3BoxLite() : ILI9XXXDisplay(INITCMD_S3BOXLITE, 320, 240, true) {}
}; };
class ILI9XXXWSPICOLCD : public ILI9XXXDisplay {
public:
ILI9XXXWSPICOLCD() : ILI9XXXDisplay(INITCMD_WSPICOLCD, 320, 480, true) {}
};
} // namespace ili9xxx } // namespace ili9xxx
} // namespace esphome } // namespace esphome

22
esphome/components/ili9xxx/ili9xxx_init.h
View file

@ -316,28 +316,6 @@ static const uint8_t PROGMEM INITCMD_ST7789V[] = {
0x00 // End of list 0x00 // End of list
}; };
static const uint8_t PROGMEM INITCMD_WSPICOLCD[] = {
ILI9XXX_SLPOUT, 0x80,
ILI9XXX_PIXFMT, 1, 0x66,
ILI9XXX_PWCTR1, 2, 0x17, 0x15, // VRH1 VRH2 -ok
ILI9XXX_PWCTR2, 1, 0x41, // VGH, VGL - ok
ILI9XXX_PWCTR3, 1, 0x44,
//ILI9XXX_VMCTR1, 4, 0x00, 0x00, 0x00, 0x00,
ILI9XXX_VMCTR1, 3, 0x00, 0x12, 0x80, // nVM VCM_REG VCM_REG_EN - not ok?
ILI9XXX_IFMODE, 1, 0x00, // -ok
ILI9XXX_FRMCTR1, 1, 0xA0, // Frame rate = 60Hz -- seems to help the background! -ok
ILI9XXX_INVCTR, 1, 0x02, // Display Inversion Control = 2dot - ok
ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan -ok
ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82, // Adjust Control 3
ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
ILI9XXX_INVON, 0x80,
ILI9XXX_MADCTL, 1, 0x48,
ILI9XXX_DISPON, 0x80,
0x00 // End of list
};
// clang-format on // clang-format on
} // namespace ili9xxx } // namespace ili9xxx
} // namespace esphome } // namespace esphome