Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 17:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Boatloads of bugs squashed, partial updates now working, minus not being able to set the segmentation from yaml

Browse source
This commit is contained in:
DJGummikuh 2024-08-12 15:29:33 +00:00
parent 6c95508c3d
commit 58cacc7afd
4 changed files with 71 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
esphome/components/waveshare_epaper/display.py
View file

@ -15,7 +15,8 @@ from esphome.const import (
)
DEPENDENCIES = ["spi"]
CONF_NUM_SEGMENTS_X = "num_segments_x"
CONF_NUM_SEGMENTS_Y = "num_segments_y"
waveshare_epaper_ns = cg.esphome_ns.namespace("waveshare_epaper")
WaveshareEPaperBase = waveshare_epaper_ns.class_(
"WaveshareEPaperBase", cg.PollingComponent, spi.SPIDevice, display.DisplayBuffer
@ -181,6 +182,8 @@ CONFIG_SCHEMA = cv.All(
cv.positive_time_period_milliseconds,
cv.Range(max=core.TimePeriod(milliseconds=500)),
),
cv.Optional(CONF_NUM_SEGMENTS_X): cv.int_range(min=1, max=40),
cv.Optional(CONF_NUM_SEGMENTS_Y): cv.int_range(min=1, max=40),
}
)
.extend(cv.polling_component_schema("1s"))
@ -207,7 +210,12 @@ async def to_code(config):
dc = await cg.gpio_pin_expression(config[CONF_DC_PIN])
cg.add(var.set_dc_pin(dc))
if CONF_NUM_SEGMENTS_X in config:
cg.add(var.set_num_segments_x(config["num_segments_x"]))
if CONF_NUM_SEGMENTS_Y in config:
cg.add(var.set_num_segments_x(config["num_segments_y"]))
if "abcdefghijklmnop1" in config:
cg.add(var.blablablubb())
if CONF_LAMBDA in config:
lambda_ = await cg.process_lambda(
config[CONF_LAMBDA], [(display.DisplayRef, "it")], return_type=cg.void

79
esphome/components/waveshare_epaper/waveshare_epaper.cpp
View file

@ -1512,15 +1512,19 @@ void WaveshareEPaper2P9InV2R2::set_full_update_every(uint32_t full_update_every)
// ========================================================
void GDEY075Z08::calculate_CRCs_(bool fullSync) {
ESP_LOGD(TAG, "Entering calculate_CRCs_");
uint16_t width_b = this->get_width_internal() / (this->seg_x_ * 8); // width of individual segments in bytes
uint16_t height_px = this->get_height_internal() / this->seg_x_; // height of individual segments in pixel
uint16_t height_px = this->get_height_internal() / this->seg_y_; // height of individual segments in pixel
uint16_t segment_size = width_b * height_px;
uint32_t buffer_half_size = this->get_width_internal() * this->get_height_internal() / 2;
uint8_t seg_x, seg_y, x, y;
uint32_t buffer_half_size = this->get_width_internal() * this->get_height_internal() / 8;
uint16_t seg_x, seg_y, x, y; // loop count variables
bool found_change = false;
// reset first and last X segment so we can recalculate it here.
first_segment_x_ = -1;
last_segment_x_ = this->seg_x_ + 1;
first_segment_x_ = this->seg_x_ + 1;
last_segment_x_ = 0;
ESP_LOGD(TAG, "width_b: %d, height_px: %d, segment_size: %d, buffer_half_size: %d, seg_x_: %d, seg_y_: %d", width_b,
height_px, segment_size, buffer_half_size, seg_x_, seg_y_);
ESP_LOGD(TAG, "Entering CRC calculation Loop");
for (seg_y = 0; seg_y < this->seg_y_; seg_y++) { // vertically iterate through the number of lines (px)
for (seg_x = 0; seg_x < this->seg_x_; seg_x++) { // horizontally iterate through number of columns (px)
uint8_t *segment = new uint8_t[segment_size * 2]; // create segment array (muliply by 2 since we need 2 byte per
@ -1535,16 +1539,17 @@ void GDEY075Z08::calculate_CRCs_(bool fullSync) {
}
}
// now calculate a CRC16_checksum and compare it against the stored value.
// ESP_LOGD(TAG, "Calculating a CRC");
uint16_t segment_crc = crc16(segment, segment_size * 2, 65535U, 40961U, false, false);
if (fullSync) {
// no need to compare, we're in the first run, just place it. This is called by full refresh only
checksums_[seg_x + seg_y * width_b] = segment_crc;
checksums_[seg_x + seg_y * seg_x_] = segment_crc;
} else {
// Partial Update, compare checksums while replacing and record the X and Y block position of the top left and
// bottom right corner of the changed elements. Afterwards, we can partially update only the segment that has
// been altered.
bool changed = checksums_[seg_x + seg_y * width_b] != segment_crc;
checksums_[seg_x + seg_y * width_b] = segment_crc;
bool changed = checksums_[seg_x + seg_y * seg_x_] != segment_crc;
checksums_[seg_x + seg_y * seg_x_] = segment_crc;
if (changed && !found_change) {
found_change = true;
// We need to span the x segment, with the lowest segment found making the first segment and the highest
@ -1552,7 +1557,7 @@ void GDEY075Z08::calculate_CRCs_(bool fullSync) {
if (seg_x < first_segment_x_)
first_segment_x_ = seg_x;
if (seg_x > last_segment_x_)
last_segment_x_ > seg_x;
last_segment_x_ = seg_x;
first_segment_y_ = seg_y;
} else if (changed) {
@ -1568,8 +1573,11 @@ void GDEY075Z08::calculate_CRCs_(bool fullSync) {
// do nothing, segment didn't change.
}
}
delete segment; // Delete the heap element again, this is not java... >.<
}
}
ESP_LOGD(TAG, "CRC Calculation finished. Found changes: %02d:%02d to %02d:%02d", first_segment_x_, first_segment_y_,
last_segment_x_, last_segment_y_);
}
void GDEY075Z08::set_full_update_every(uint32_t full_update_every) { this->full_update_every_ = full_update_every; }
@ -1646,7 +1654,7 @@ void GDEY075Z08::initialize() {
void GDEY075Z08::loop() {
if (this->waiting_for_idle && this->busy_pin_) {
// reset waiting_for idle, then send the display to deep sleep.
this->deep_sleep();
// this->deep_sleep();
this->waiting_for_idle = false;
}
}
@ -1662,60 +1670,68 @@ void HOT GDEY075Z08::display() {
// still waiting for the previous busy to ebb off, skip drawing the display.
return;
}
unsigned int i;
unsigned int half_length = this->get_buffer_length_() / 2u;
uint32_t half_length = this->get_buffer_length_() / 2u; // what is the u for?
if (partial) {
ESP_LOGI(TAG, "Evaluating Partial Screen Update");
this->calculate_CRCs_(false);
ESP_LOGD(TAG, "Partial Screen Update Evaluation complete");
if (first_segment_x_ == -1) {
// if first_segment_x_ was not altered from -1, this means that no changes have happened in the display.
if (first_segment_x_ > seg_x_ || first_segment_x_ > last_segment_x_) {
// if first_segment_x_ was not altered from seg_x_ + 1, this means that no changes have happened in the display.
// Jump out, without waking the display, so we don't have to send it back to sleep.
return;
}
ESP_LOGD(TAG, "Found a change, initializing display for partial backup");
unsigned int x_start, y_start, x_end, y_end;
unsigned int x_start, y_start, x_end, y_end, x_start_b, x_end_b;
x_start = (this->get_width_internal() / seg_x_) * first_segment_x_;
x_end = (this->get_width_internal() / seg_x_) * (last_segment_x_ + 1);
y_start = (this->get_height_internal() / seg_y_) * first_segment_y_;
y_end = (this->get_height_internal() / seg_y_) * (last_segment_y_ + 1);
uint16_t first_byte, last_byte;
first_byte = ((y_start * this->get_width_internal()) + x_start) / 8;
last_byte = ((y_end * this->get_width_internal()) + x_end) / 8;
x_start_b = x_start / 8; // We need bytes for X, but pixels for Y. This Display does my head in 🤪️
x_end_b = x_end / 8;
uint16_t width_b = this->get_width_internal() / 8;
uint16_t x, y;
ESP_LOGD(TAG, "Updating from %03d:%03d to %03d:%03d.", x_start, y_start, x_end, y_end);
this->init_fast(); // Wake up Display.
this->command(0x91); // Enter partial mode
this->command(0x90); // Enter resolution Setting (?)
this->data(x_start / 32);
this->data(x_start % 32);
this->data(x_start / 256);
this->data(x_start % 256);
this->data(x_end / 32);
this->data(x_end % 32 - 1);
this->data(x_end / 256);
this->data(x_end % 256 - 1);
this->data(y_start / 32);
this->data(y_start % 32);
this->data(y_start / 256);
this->data(y_start % 256);
this->data(y_end / 32);
this->data(y_end % 32 - 1);
this->data(y_end / 256);
this->data(y_end % 256 - 1);
this->data(0x01);
this->command(0x10);
// write black data
for (i = first_byte; i <= last_byte; i++) {
this->data(~this->buffer_[i]);
for (y = y_start; y < y_end; y++) {
for (x = x_start_b; x < x_end_b; x++) {
this->data(~this->buffer_[x + y * width_b]);
}
}
this->command(0x13);
// write red data
for (i = first_byte; i <= last_byte; i++) {
this->data(this->buffer_[i + half_length]);
for (y = y_start; y < y_end; y++) {
for (x = x_start_b; x < x_end_b; x++) {
this->data(this->buffer_[half_length + x + y * width_b]);
}
}
this->command(0x12); // Display Refresh
delay(1);
this->command(0x92); // Exit Partial mode
} else { // if partial is false
uint32_t i;
ESP_LOGI(TAG, "Performing Full Screen Update");
calculate_CRCs_(true); // reset the crc table.
this->calculate_CRCs_(true); // reset the crc table.
ESP_LOGD(TAG, "after calculate_CRCs_");
this->init_fast(); // Wake up display.
// Write Data
@ -1737,6 +1753,7 @@ void HOT GDEY075Z08::display() {
delay(1); // This delay needs to be here. 200µS at least.
this->waiting_for_idle = true; // BUSY should be LOW now, setting waiting_for_idle to true. This will cause loop() to
// poll for BUSY to go HIGH again, then enter deep sleep
this->deep_sleep();
}
void GDEY075Z08::dump_config() {

14
esphome/components/waveshare_epaper/waveshare_epaper.h
View file

@ -237,13 +237,19 @@ class GDEY075Z08 : public WaveshareEPaperBWR {
void dump_config() override;
void deep_sleep() override;
void set_full_update_every(uint32_t full_update_every);
void set_seg_x(uint8_t value) { this->seg_x_ = value; }
void set_seg_y(uint8_t value) { this->seg_y_ = value; }
void set_num_segments_x(uint8_t value) {
ESP_LOGD("TAG", "Setting num segments X to %d", value);
this->seg_x_ = value;
}
void set_num_segments_y(uint8_t value) {
ESP_LOGD("TAG", "Setting num segments Y to %d", value);
this->seg_y_ = value;
}
protected:
bool wait_until_idle_();
int get_width_internal() override { return 800; }
int get_height_internal() override { return 480; }
uint16_t get_width_internal() override { return 800; }
uint16_t get_height_internal() override { return 480; }
private:
uint32_t full_update_every_{30};

2
esphome/const.py
View file

@ -522,6 +522,8 @@ CONF_NUM_CHANNELS = "num_channels"
CONF_NUM_CHIPS = "num_chips"
CONF_NUM_LEDS = "num_leds"
CONF_NUM_SCANS = "num_scans"
CONF_NUM_SEGMENTS_X = "num_segments_x"
CONF_NUM_SEGMENTS_Y = "num_segments_y"
CONF_NUMBER = "number"
CONF_NUMBER_DATAPOINT = "number_datapoint"
CONF_OE_PIN = "oe_pin"