mirror of
https://github.com/esphome/esphome.git
synced 2024-11-23 15:38:11 +01:00
[nextion] New trigger on_buffer_overflow
(#7772)
This commit is contained in:
parent
372d68a177
commit
846b091aac
11 changed files with 55 additions and 1 deletions
|
@ -42,5 +42,12 @@ class TouchTrigger : public Trigger<uint8_t, uint8_t, bool> {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class BufferOverflowTrigger : public Trigger<> {
|
||||||
|
public:
|
||||||
|
explicit BufferOverflowTrigger(Nextion *nextion) {
|
||||||
|
nextion->add_buffer_overflow_event_callback([this]() { this->trigger(); });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
} // namespace nextion
|
} // namespace nextion
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
|
|
|
@ -18,6 +18,7 @@ CONF_ON_SLEEP = "on_sleep"
|
||||||
CONF_ON_WAKE = "on_wake"
|
CONF_ON_WAKE = "on_wake"
|
||||||
CONF_ON_SETUP = "on_setup"
|
CONF_ON_SETUP = "on_setup"
|
||||||
CONF_ON_PAGE = "on_page"
|
CONF_ON_PAGE = "on_page"
|
||||||
|
CONF_ON_BUFFER_OVERFLOW = "on_buffer_overflow"
|
||||||
CONF_TOUCH_SLEEP_TIMEOUT = "touch_sleep_timeout"
|
CONF_TOUCH_SLEEP_TIMEOUT = "touch_sleep_timeout"
|
||||||
CONF_WAKE_UP_PAGE = "wake_up_page"
|
CONF_WAKE_UP_PAGE = "wake_up_page"
|
||||||
CONF_START_UP_PAGE = "start_up_page"
|
CONF_START_UP_PAGE = "start_up_page"
|
||||||
|
|
|
@ -13,6 +13,7 @@ from esphome.const import (
|
||||||
from esphome.core import CORE
|
from esphome.core import CORE
|
||||||
from . import Nextion, nextion_ns, nextion_ref
|
from . import Nextion, nextion_ns, nextion_ref
|
||||||
from .base_component import (
|
from .base_component import (
|
||||||
|
CONF_ON_BUFFER_OVERFLOW,
|
||||||
CONF_ON_SLEEP,
|
CONF_ON_SLEEP,
|
||||||
CONF_ON_WAKE,
|
CONF_ON_WAKE,
|
||||||
CONF_ON_SETUP,
|
CONF_ON_SETUP,
|
||||||
|
@ -36,6 +37,9 @@ SleepTrigger = nextion_ns.class_("SleepTrigger", automation.Trigger.template())
|
||||||
WakeTrigger = nextion_ns.class_("WakeTrigger", automation.Trigger.template())
|
WakeTrigger = nextion_ns.class_("WakeTrigger", automation.Trigger.template())
|
||||||
PageTrigger = nextion_ns.class_("PageTrigger", automation.Trigger.template())
|
PageTrigger = nextion_ns.class_("PageTrigger", automation.Trigger.template())
|
||||||
TouchTrigger = nextion_ns.class_("TouchTrigger", automation.Trigger.template())
|
TouchTrigger = nextion_ns.class_("TouchTrigger", automation.Trigger.template())
|
||||||
|
BufferOverflowTrigger = nextion_ns.class_(
|
||||||
|
"BufferOverflowTrigger", automation.Trigger.template()
|
||||||
|
)
|
||||||
|
|
||||||
CONFIG_SCHEMA = (
|
CONFIG_SCHEMA = (
|
||||||
display.BASIC_DISPLAY_SCHEMA.extend(
|
display.BASIC_DISPLAY_SCHEMA.extend(
|
||||||
|
@ -68,6 +72,13 @@ CONFIG_SCHEMA = (
|
||||||
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TouchTrigger),
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TouchTrigger),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
cv.Optional(CONF_ON_BUFFER_OVERFLOW): automation.validate_automation(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
|
||||||
|
BufferOverflowTrigger
|
||||||
|
),
|
||||||
|
}
|
||||||
|
),
|
||||||
cv.Optional(CONF_TOUCH_SLEEP_TIMEOUT): cv.int_range(min=3, max=65535),
|
cv.Optional(CONF_TOUCH_SLEEP_TIMEOUT): cv.int_range(min=3, max=65535),
|
||||||
cv.Optional(CONF_WAKE_UP_PAGE): cv.uint8_t,
|
cv.Optional(CONF_WAKE_UP_PAGE): cv.uint8_t,
|
||||||
cv.Optional(CONF_START_UP_PAGE): cv.uint8_t,
|
cv.Optional(CONF_START_UP_PAGE): cv.uint8_t,
|
||||||
|
@ -151,3 +162,7 @@ async def to_code(config):
|
||||||
],
|
],
|
||||||
conf,
|
conf,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
for conf in config.get(CONF_ON_BUFFER_OVERFLOW, []):
|
||||||
|
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
|
||||||
|
await automation.build_automation(trigger, [], conf)
|
||||||
|
|
|
@ -190,6 +190,10 @@ void Nextion::add_touch_event_callback(std::function<void(uint8_t, uint8_t, bool
|
||||||
this->touch_callback_.add(std::move(callback));
|
this->touch_callback_.add(std::move(callback));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Nextion::add_buffer_overflow_event_callback(std::function<void()> &&callback) {
|
||||||
|
this->buffer_overflow_callback_.add(std::move(callback));
|
||||||
|
}
|
||||||
|
|
||||||
void Nextion::update_all_components() {
|
void Nextion::update_all_components() {
|
||||||
if ((!this->is_setup() && !this->ignore_is_setup_) || this->is_sleeping())
|
if ((!this->is_setup() && !this->ignore_is_setup_) || this->is_sleeping())
|
||||||
return;
|
return;
|
||||||
|
@ -458,7 +462,9 @@ void Nextion::process_nextion_commands_() {
|
||||||
this->remove_from_q_();
|
this->remove_from_q_();
|
||||||
break;
|
break;
|
||||||
case 0x24: // Serial Buffer overflow occurs
|
case 0x24: // Serial Buffer overflow occurs
|
||||||
ESP_LOGW(TAG, "Nextion reported Serial Buffer overflow!");
|
// Buffer will continue to receive the current instruction, all previous instructions are lost.
|
||||||
|
ESP_LOGE(TAG, "Nextion reported Serial Buffer overflow!");
|
||||||
|
this->buffer_overflow_callback_.call();
|
||||||
break;
|
break;
|
||||||
case 0x65: { // touch event return data
|
case 0x65: { // touch event return data
|
||||||
if (to_process_length != 3) {
|
if (to_process_length != 3) {
|
||||||
|
|
|
@ -1134,6 +1134,12 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
||||||
*/
|
*/
|
||||||
void add_touch_event_callback(std::function<void(uint8_t, uint8_t, bool)> &&callback);
|
void add_touch_event_callback(std::function<void(uint8_t, uint8_t, bool)> &&callback);
|
||||||
|
|
||||||
|
/** Add a callback to be notified when the nextion reports a buffer overflow.
|
||||||
|
*
|
||||||
|
* @param callback The void() callback.
|
||||||
|
*/
|
||||||
|
void add_buffer_overflow_event_callback(std::function<void()> &&callback);
|
||||||
|
|
||||||
void update_all_components();
|
void update_all_components();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1323,6 +1329,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
||||||
CallbackManager<void()> wake_callback_{};
|
CallbackManager<void()> wake_callback_{};
|
||||||
CallbackManager<void(uint8_t)> page_callback_{};
|
CallbackManager<void(uint8_t)> page_callback_{};
|
||||||
CallbackManager<void(uint8_t, uint8_t, bool)> touch_callback_{};
|
CallbackManager<void(uint8_t, uint8_t, bool)> touch_callback_{};
|
||||||
|
CallbackManager<void()> buffer_overflow_callback_{};
|
||||||
|
|
||||||
optional<nextion_writer_t> writer_;
|
optional<nextion_writer_t> writer_;
|
||||||
float brightness_{1.0};
|
float brightness_{1.0};
|
||||||
|
|
|
@ -58,3 +58,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
|
@ -58,3 +58,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
|
@ -58,3 +58,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
|
@ -58,3 +58,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
|
@ -58,3 +58,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
|
@ -53,3 +53,6 @@ display:
|
||||||
on_page:
|
on_page:
|
||||||
then:
|
then:
|
||||||
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
|
||||||
|
on_buffer_overflow:
|
||||||
|
then:
|
||||||
|
logger.log: "Nextion reported a buffer overflow!"
|
||||||
|
|
Loading…
Reference in a new issue