scratch/esphome-axp2101
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from geiseri/1_15_changes

Browse Source 
Changes to support ESPHome 1.15
This commit is contained in:
Airy André
2020-10-20 11:12:37 +02:00
committed by GitHub
parent d1edf14b5e 5e31e93afa
commit 42bb5e58b2
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/st7735/display.py
View File

@@ -19,7 +19,7 @@ CONFIG_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema, cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema, cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage, cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA) }).extend(cv.polling_component_schema('1s')).extend(spi.spi_device_schema())
def to_code(config): def to_code(config):

18
components/st7735/st7735.cpp
View File

@@ -162,10 +162,7 @@ void ST7735::setup() {
this->displayInit(Rcmd3); this->displayInit(Rcmd3);
this->writecommand(ST7735_INVON); this->writecommand(ST7735_INVON);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//this->disable();
delay(120); delay(120);
//this->enable();
this->writecommand(ST7735_DISPON); //Display on this->writecommand(ST7735_DISPON); //Display on
delay(120); delay(120);
@@ -270,18 +267,15 @@ size_t ST7735::get_buffer_length_() {
return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) * 2; return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) * 2;
} }
void HOT ST7735::draw_absolute_pixel_internal(int x, int y, int color) {
void HOT ST7735::draw_absolute_pixel_internal(int x, int y, Color color) {
if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
return; return;
if (color == display::COLOR_ON) { auto color565 = color.to_rgb_565();
color = ST7735_WHITE; uint16_t pos = (x + y * this->get_width_internal()) * 2;
} else if (color == display::COLOR_OFF) { this->buffer_[pos++] = (color565 >> 8) & 0xff;
color = ST7735_BLACK; this->buffer_[pos] = color565 & 0xff;
}
uint16_t pos = (x + y * this->get_width_internal())*2;
this->buffer_[pos++] = (color>>8) & 0xff;
this->buffer_[pos] = color & 0xff;
} }
void ST7735::displayInit(const uint8_t *addr) { void ST7735::displayInit(const uint8_t *addr) {

36
components/st7735/st7735.h
View File

@@ -80,16 +80,30 @@
#define ST7735_NVMSET 0xFC // NVM setting #define ST7735_NVMSET 0xFC // NVM setting
#define ST7735_PROMACT 0xFE // Program action #define ST7735_PROMACT 0xFE // Program action
namespace esphome {
namespace st7735 {
template <int N>
struct Color565 {
operator Color () const
{
return Color((((N)&0xF800) >> 8), (((N)&0x07E0) >> 3), (((N)&0x001F) << 3));
}
};
} // namespace st7735
} // namespace esphome
// Some ready-made 16-bit ('565') color settings: // Some ready-made 16-bit ('565') color settings:
#define ST77XX_BLACK 0x0000 #define ST77XX_BLACK esphome::st7735::Color565<0x0000>{} /* 0, 0, 0 */
#define ST77XX_WHITE 0xFFFF #define ST77XX_WHITE esphome::st7735::Color565<0xFFFF>{} /* 255, 255, 255 */
#define ST77XX_RED 0xF800 #define ST77XX_RED esphome::st7735::Color565<0xF800>{} /* 255, 0, 0 */
#define ST77XX_GREEN 0x07E0 #define ST77XX_GREEN esphome::st7735::Color565<0x07E0>{} /* 0, 255, 0 */
#define ST77XX_BLUE 0x001F #define ST77XX_BLUE esphome::st7735::Color565<0x001F>{} /* 0, 0, 255 */
#define ST77XX_CYAN 0x07FF #define ST77XX_CYAN esphome::st7735::Color565<0x07FF>{} /* 0, 255, 255 */
#define ST77XX_MAGENTA 0xF81F #define ST77XX_MAGENTA esphome::st7735::Color565<0xF81F>{} /* 255, 0, 255 */
#define ST77XX_YELLOW 0xFFE0 #define ST77XX_YELLOW esphome::st7735::Color565<0xFFE0>{} /* 255, 255, 0 */
#define ST77XX_ORANGE 0xFC00 #define ST77XX_ORANGE esphome::st7735::Color565<0xFDA0>{} /* 255, 180, 0 */
// Some ready-made 16-bit ('565') color settings: // Some ready-made 16-bit ('565') color settings:
#define ST7735_BLACK ST77XX_BLACK #define ST7735_BLACK ST77XX_BLACK
@@ -136,8 +150,8 @@ class ST7735 : public PollingComponent, public display::DisplayBuffer,
void spi_master_write_addr(uint16_t addr1, uint16_t addr2); void spi_master_write_addr(uint16_t addr1, uint16_t addr2);
void spi_master_write_color(uint16_t color, uint16_t size); void spi_master_write_color(uint16_t color, uint16_t size);
void draw_absolute_pixel_internal(int x, int y, int color) override; void draw_absolute_pixel_internal(int x, int y, Color color) override;
int get_height_internal() override; int get_height_internal() override;
int get_width_internal() override; int get_width_internal() override;