mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-31 07:03:55 +00:00 
			
		
		
		
	fix merge error
This commit is contained in:
		| @@ -385,7 +385,7 @@ class LoggerMessageTrigger : public Trigger<uint8_t, const char *, const char *> | |||||||
|  public: |  public: | ||||||
|   explicit LoggerMessageTrigger(Logger *parent, uint8_t level) { |   explicit LoggerMessageTrigger(Logger *parent, uint8_t level) { | ||||||
|     this->level_ = level; |     this->level_ = level; | ||||||
|     parent->add_on_log_callback([this](uint8_t level, const char *tag, const char *message) { |     parent->add_on_log_callback([this](uint8_t level, const char *tag, const char *message, size_t message_len) { | ||||||
|       if (level <= this->level_) { |       if (level <= this->level_) { | ||||||
|         this->trigger(level, tag, message); |         this->trigger(level, tag, message); | ||||||
|       } |       } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user