Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-04 20:48:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fixed update interval handling

Browse source
This commit is contained in:
endym 2024-07-01 14:46:43 +02:00
parent dbe24bd30e
commit 0720c98fb6
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
esphome/components/max6921/display.cpp
View file

@ -123,7 +123,7 @@ const uint8_t ASCII_TO_SEG[FONT_SIZE] PROGMEM = {
void Display::setup(std::vector<uint8_t>& seg_to_out_map, std::vector<uint8_t>& pos_to_out_map) {
this->restore_update_interval_ = 0;
this->default_update_interval_ = this->max6921_->get_update_interval();
this->seg_to_out_map_ = seg_to_out_map;
this->pos_to_out_map_ = pos_to_out_map;
this->num_digits_ = pos_to_out_map.size();
@ -278,6 +278,30 @@ void Display::clear(int pos) {
ESP_LOGW(TAG, "Invalid display position %i (max=%u)", pos, this->num_digits_ - 1);
}
/**
* @brief Sets the display update interval.
*
* @param interval_ms update interval in ms (optional, default=restore)
*/
void Display::set_update_interval(uint32_t interval_ms) {
ESP_LOGD(TAG, "Change polling interval: %" PRIu32 "ms", interval_ms);
this->max6921_->stop_poller();
this->max6921_->set_update_interval(interval_ms);
this->max6921_->start_poller();
}
/**
* @brief Restores the configured display update interval.
*/
void Display::restore_update_interval(void) {
if (this->max6921_->get_update_interval() != this->default_update_interval_) {
ESP_LOGD(TAG, "Restore polling interval: %" PRIu32 "ms", this->default_update_interval_);
this->max6921_->stop_poller();
this->max6921_->set_update_interval(this->default_update_interval_);
this->max6921_->start_poller();
}
}
/**
* @brief Updates the display.
*/
@ -306,11 +330,7 @@ void Display::update(void) {
}
if (this->disp_text_.effect == TEXT_EFFECT_NONE) { // effect finished?
this->duration_ms = 0;
if (this->restore_update_interval_) { // yes, polling interval changed?
ESP_LOGD(TAG, "Restore polling interval: %" PRIu32 "ms", this->restore_update_interval_);
this->max6921_->set_update_interval(this->restore_update_interval_);
this->restore_update_interval_ = 0;
}
restore_update_interval();
set_mode(DISP_MODE_PRINT); // switch back to "it" interface
}
}
@ -396,9 +416,7 @@ int Display::set_text(const std::string& text, uint8_t start_pos, const std::str
// set text effect...
this->disp_text_.set_text_effect(effect, cycle_num);
if ((this->disp_text_.effect != TEXT_EFFECT_NONE) && (interval > 0)) {
ESP_LOGD(TAG, "Change polling interval: %" PRIu32 "ms", interval);
this->restore_update_interval_ = this->max6921_->get_update_interval();
this->max6921_->set_update_interval(interval);
set_update_interval(interval);
}
// update display mode...

4
esphome/components/max6921/display.h
View file

@ -99,12 +99,14 @@ class Display : public DisplayBrightness,
void clear(int pos=-1);
void dump_config();
bool isPointSegOnly(char c);
void restore_update_interval(void);
void setup(std::vector<uint8_t>& seg_to_out_map, std::vector<uint8_t>& pos_to_out_map);
void set_demo_mode(demo_mode_t mode, uint8_t cycle_num);
void set_demo_mode(const std::string& mode, uint8_t cycle_num);
int set_text(const char *text, uint8_t start_pos);
int set_text(const std::string& text, uint8_t start_pos, const std::string& align,
uint32_t duration, const std::string& effect, uint32_t interval, uint8_t cycle_num);
void set_update_interval(uint32_t interval_ms);
void update(void);
protected:
@ -118,7 +120,7 @@ class Display : public DisplayBrightness,
uint seg_out_smallest_;
uint32_t refresh_period_us_;
DisplayText disp_text_;
uint32_t restore_update_interval_;
uint32_t default_update_interval_;
static void display_refresh_task_(void *pv);
int update_out_buf_(void);