mirror of
				https://github.com/esphome/esphome.git
				synced 2025-11-04 09:01:49 +00:00 
			
		
		
		
	Merge branch 'esphome:dev' into mcp4461
This commit is contained in:
		@@ -815,8 +815,20 @@ void Display::test_card() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
DisplayPage::DisplayPage(display_writer_t writer) : writer_(std::move(writer)) {}
 | 
					DisplayPage::DisplayPage(display_writer_t writer) : writer_(std::move(writer)) {}
 | 
				
			||||||
void DisplayPage::show() { this->parent_->show_page(this); }
 | 
					void DisplayPage::show() { this->parent_->show_page(this); }
 | 
				
			||||||
void DisplayPage::show_next() { this->next_->show(); }
 | 
					void DisplayPage::show_next() {
 | 
				
			||||||
void DisplayPage::show_prev() { this->prev_->show(); }
 | 
					  if (this->next_ == nullptr) {
 | 
				
			||||||
 | 
					    ESP_LOGE(TAG, "no next page");
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  this->next_->show();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					void DisplayPage::show_prev() {
 | 
				
			||||||
 | 
					  if (this->prev_ == nullptr) {
 | 
				
			||||||
 | 
					    ESP_LOGE(TAG, "no previous page");
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  this->prev_->show();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
void DisplayPage::set_parent(Display *parent) { this->parent_ = parent; }
 | 
					void DisplayPage::set_parent(Display *parent) { this->parent_ = parent; }
 | 
				
			||||||
void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
 | 
					void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
 | 
				
			||||||
void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
 | 
					void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user