From 687eb008e8f355adf026d716570233d4828204ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Koek?= Date: Thu, 28 Mar 2024 11:33:17 +0000 Subject: [PATCH] More logging --- esphome/components/ebyte_lora/__init__.py | 14 ++---------- esphome/components/ebyte_lora/ebyte_lora.cpp | 23 +++----------------- esphome/components/ebyte_lora/ebyte_lora.h | 4 ---- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/esphome/components/ebyte_lora/__init__.py b/esphome/components/ebyte_lora/__init__.py index f0dcfa74b4..54bdd13d38 100644 --- a/esphome/components/ebyte_lora/__init__.py +++ b/esphome/components/ebyte_lora/__init__.py @@ -1,19 +1,18 @@ import esphome.codegen as cg import esphome.config_validation as cv from esphome import pins -from esphome.components import sensor, text_sensor, uart +from esphome.components import sensor, uart from esphome.const import ( DEVICE_CLASS_SIGNAL_STRENGTH, STATE_CLASS_MEASUREMENT, CONF_ID, - ENTITY_CATEGORY_NONE, UNIT_PERCENT, ) CODEOWNERS = ["@danielkoek"] DEPENDENCIES = ["uart"] -AUTO_LOAD = ["uart", "sensor", "text_sensor"] +AUTO_LOAD = ["uart", "sensor"] MULTI_CONF = True ebyte_lora_ns = cg.esphome_ns.namespace("ebyte_lora") @@ -24,7 +23,6 @@ CONF_EBYTE_LORA = "ebyte_lora" CONF_PIN_AUX = "pin_aux" CONF_PIN_M0 = "pin_m0" CONF_PIN_M1 = "pin_m1" -CONF_LORA_MESSAGE = "lora_message" CONF_LORA_RSSI = "lora_rssi" CONFIG_SCHEMA = ( cv.Schema( @@ -36,10 +34,6 @@ CONFIG_SCHEMA = ( cv.Required(CONF_PIN_M0): pins.gpio_output_pin_schema, # for communication set the mode cv.Required(CONF_PIN_M1): pins.gpio_output_pin_schema, - # if you want to see the raw messages - cv.Optional(CONF_LORA_MESSAGE): text_sensor.text_sensor_schema( - entity_category=ENTITY_CATEGORY_NONE, - ), # if you want to see the rssi cv.Optional(CONF_LORA_RSSI): sensor.sensor_schema( device_class=DEVICE_CLASS_SIGNAL_STRENGTH, @@ -66,10 +60,6 @@ async def to_code(config): cg.add(var.set_pin_m0(pin_m0)) pin_m1 = await cg.gpio_pin_expression(config[CONF_PIN_M1]) cg.add(var.set_pin_m1(pin_m1)) - - if CONF_LORA_MESSAGE in config: - sens = await text_sensor.new_text_sensor(config[CONF_LORA_MESSAGE]) - cg.add(var.set_message_sensor(sens)) if CONF_LORA_RSSI in config: sens = await sensor.new_sensor(config[CONF_LORA_RSSI]) cg.add(var.set_rssi_sensor(sens)) diff --git a/esphome/components/ebyte_lora/ebyte_lora.cpp b/esphome/components/ebyte_lora/ebyte_lora.cpp index 7550638fcf..ba040b85b5 100644 --- a/esphome/components/ebyte_lora/ebyte_lora.cpp +++ b/esphome/components/ebyte_lora/ebyte_lora.cpp @@ -2,19 +2,6 @@ namespace esphome { namespace ebyte_lora { -void EbyteLoraComponent::update() { - can_send_message_(); - if (!this->update_needed_) - return; - if (this->rssi_sensor_ != nullptr) - this->rssi_sensor_->publish_state(this->rssi_); - - // raw info - if (this->message_text_sensor_ != nullptr) - this->message_text_sensor_->publish_state(this->raw_message_); - // reset the updater - this->update_needed_ = false; -} void EbyteLoraComponent::setup() { this->pin_aux_->setup(); this->pin_m0_->setup(); @@ -135,7 +122,7 @@ void EbyteLoraComponent::send_pin_info_(uint8_t pin, bool value) { return; } uint8_t data[3]; - data[1] = 0xFF; // just some bit to indicate, yo this is pin info + data[1] = 1; // number one to indicate data[1] = pin; // Pin to send data[2] = value; // Inverted for the pcf8574 ESP_LOGD(TAG, "Sending message"); @@ -158,14 +145,12 @@ void EbyteLoraComponent::loop() { } if (data.size() >= 4) { ESP_LOGD(TAG, "Total: %u ", data.size()); - ESP_LOGD(TAG, "Start bit: %#02x ", data[0]); + ESP_LOGD(TAG, "Start bit: ", data[0]); ESP_LOGD(TAG, "PIN: %u ", data[1]); ESP_LOGD(TAG, "VALUE: %u ", data[2]); - ESP_LOGD(TAG, "RSSI: %#02x ", data[3]); + ESP_LOGD(TAG, "RSSI: %u % ", (data[3] / 255.0) * 100); if (this->rssi_sensor_ != nullptr) this->rssi_sensor_->publish_state((data[3] / 255.0) * 100); - if (this->message_text_sensor_ != nullptr) - this->message_text_sensor_->publish_state("Got something"); for (auto *sensor : this->sensors_) { if (sensor->get_pin() == data[1]) { @@ -173,8 +158,6 @@ void EbyteLoraComponent::loop() { sensor->got_state_message(data[2]); } } - } else { - ESP_LOGD(TAG, "WEIRD"); } } } // namespace ebyte_lora diff --git a/esphome/components/ebyte_lora/ebyte_lora.h b/esphome/components/ebyte_lora/ebyte_lora.h index 0c6e712e5c..e39d509090 100644 --- a/esphome/components/ebyte_lora/ebyte_lora.h +++ b/esphome/components/ebyte_lora/ebyte_lora.h @@ -3,7 +3,6 @@ #include #include "esphome/core/component.h" #include "esphome/components/sensor/sensor.h" -#include "esphome/components/text_sensor/text_sensor.h" #include "esphome/components/switch/switch.h" #include "esphome/core/helpers.h" #include "esphome/components/uart/uart.h" @@ -33,12 +32,10 @@ class EbyteLoraComponent : public PollingComponent, public uart::UARTDevice { public: void setup() override; float get_setup_priority() const override { return setup_priority::HARDWARE; } - void update() override; void loop() override; void dump_config() override; /// Helper function to write the value of a pin. void digital_write(uint8_t pin, bool value); - void set_message_sensor(text_sensor::TextSensor *message_text_sensor) { message_text_sensor_ = message_text_sensor; } void set_rssi_sensor(sensor::Sensor *rssi_sensor) { rssi_sensor_ = rssi_sensor; } void set_pin_aux(GPIOPin *pin_aux) { pin_aux_ = pin_aux; } void register_sensor(EbyteLoraSwitch *obj) { this->sensors_.push_back(obj); } @@ -62,7 +59,6 @@ class EbyteLoraComponent : public PollingComponent, public uart::UARTDevice { uint32_t starting_to_check_; uint32_t time_out_after_; std::string raw_message_; - text_sensor::TextSensor *message_text_sensor_{nullptr}; sensor::Sensor *rssi_sensor_{nullptr}; GPIOPin *pin_aux_; GPIOPin *pin_m0_;