This commit is contained in:
Daniël Koek 2024-04-25 18:26:30 +01:00
parent abca903491
commit c4e680c570
3 changed files with 24 additions and 1 deletions

View file

@ -19,6 +19,17 @@ ebyte_lora_ns = cg.esphome_ns.namespace("ebyte_lora")
EbyteLoraComponent = ebyte_lora_ns.class_( EbyteLoraComponent = ebyte_lora_ns.class_(
"EbyteLoraComponent", cg.PollingComponent, uart.UARTDevice "EbyteLoraComponent", cg.PollingComponent, uart.UARTDevice
) )
WorPeriod = ebyte_lora_ns.enum("WorPeriod")
WOR_PERIOD_OPTIONS = {
"WOR_500": WorPeriod.WOR_500,
"WOR_1000": WorPeriod.WOR_1000,
"WOR_1500": WorPeriod.WOR_1500,
"WOR_2000": WorPeriod.WOR_2000,
"WOR_2500": WorPeriod.WOR_2500,
"WOR_3000": WorPeriod.WOR_3000,
"WOR_3500": WorPeriod.WOR_3500,
"WOR_4000": WorPeriod.WOR_4000,
}
UartBpsSpeed = ebyte_lora_ns.enum("UartBpsSpeed") UartBpsSpeed = ebyte_lora_ns.enum("UartBpsSpeed")
UART_BPS_OPTIONS = { UART_BPS_OPTIONS = {
"UART_1200": UartBpsSpeed.UART_1200, "UART_1200": UartBpsSpeed.UART_1200,
@ -68,9 +79,11 @@ CONF_UART_BPS = "uart_bps"
CONF_TRANSMISSION_MODE = "transmission_mode" CONF_TRANSMISSION_MODE = "transmission_mode"
CONF_TRANSMISSION_POWER = "transmission_power" CONF_TRANSMISSION_POWER = "transmission_power"
CONF_AIR_DATA_RATE = "air_data_rate" CONF_AIR_DATA_RATE = "air_data_rate"
CONF_WOR = "wor_period"
CONF_ENABLE_RSSI = "enable_rssi" CONF_ENABLE_RSSI = "enable_rssi"
CONF_ENABLE_LBT = "enable_lbt" CONF_ENABLE_LBT = "enable_lbt"
CONF_RSSI_NOISE = "rssi_noise" CONF_RSSI_NOISE = "rssi_noise"
CONF_CHANNEL = "channel"
CONFIG_SCHEMA = ( CONFIG_SCHEMA = (
cv.Schema( cv.Schema(
{ {
@ -88,6 +101,7 @@ CONFIG_SCHEMA = (
accuracy_decimals=1, accuracy_decimals=1,
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
), ),
cv.Optional(CONF_CHANNEL, default=13): cv.int_range(min=0, max=83),
cv.Optional(CONF_UART_BPS, default="UART_9600"): cv.enum( cv.Optional(CONF_UART_BPS, default="UART_9600"): cv.enum(
UART_BPS_OPTIONS, upper=True UART_BPS_OPTIONS, upper=True
), ),
@ -97,6 +111,9 @@ CONFIG_SCHEMA = (
cv.Optional(CONF_TRANSMISSION_POWER, default="TX_DEFAULT_MAX"): cv.enum( cv.Optional(CONF_TRANSMISSION_POWER, default="TX_DEFAULT_MAX"): cv.enum(
TRANSMISSION_POWER_OPTIONS, upper=True TRANSMISSION_POWER_OPTIONS, upper=True
), ),
cv.Optional(CONF_WOR, default="WOR_4000"): cv.enum(
WOR_PERIOD_OPTIONS, upper=True
),
cv.Optional(CONF_AIR_DATA_RATE, default="AIR_2_4KB"): cv.enum( cv.Optional(CONF_AIR_DATA_RATE, default="AIR_2_4KB"): cv.enum(
AIR_DATA_RATE_OPTIONS, upper=True AIR_DATA_RATE_OPTIONS, upper=True
), ),
@ -135,6 +152,9 @@ async def to_code(config):
cg.add(var.set_enable_rssi(config[CONF_ENABLE_RSSI])) cg.add(var.set_enable_rssi(config[CONF_ENABLE_RSSI]))
cg.add(var.set_enable_lbt(config[CONF_ENABLE_LBT])) cg.add(var.set_enable_lbt(config[CONF_ENABLE_LBT]))
cg.add(var.set_rssi_noise(config[CONF_RSSI_NOISE])) cg.add(var.set_rssi_noise(config[CONF_RSSI_NOISE]))
cg.add(var.set_wor(config[CONF_WOR]))
cg.add(var.set_channel(config[CONF_CHANNEL]))
if CONF_LORA_RSSI in config: if CONF_LORA_RSSI in config:
sens = await sensor.new_sensor(config[CONF_LORA_RSSI]) sens = await sensor.new_sensor(config[CONF_LORA_RSSI])
cg.add(var.set_rssi_sensor(sens)) cg.add(var.set_rssi_sensor(sens))

View file

@ -36,7 +36,8 @@ void EbyteLoraComponent::update() {
ESP_LOGD(TAG, "sub_packet was not set right"); ESP_LOGD(TAG, "sub_packet was not set right");
} }
if (this->current_config_.channel != this->expected_config_.channel) { if (this->current_config_.channel != this->expected_config_.channel) {
ESP_LOGD(TAG, "channel was not set right"); ESP_LOGD(TAG, "channel was not set right is %u, should be %u", this->current_config_.channel,
this->expected_config_.channel);
} }
if (this->current_config_.wor_period != this->expected_config_.wor_period) { if (this->current_config_.wor_period != this->expected_config_.wor_period) {
ESP_LOGD(TAG, "wor_period was not set right"); ESP_LOGD(TAG, "wor_period was not set right");

View file

@ -39,9 +39,11 @@ class EbyteLoraComponent : public PollingComponent, public uart::UARTDevice {
void set_transmission_mode(TransmissionMode mode) { expected_config_.transmission_mode = mode; } void set_transmission_mode(TransmissionMode mode) { expected_config_.transmission_mode = mode; }
void set_transmission_power(TransmissionPower power) { expected_config_.transmission_power = power; } void set_transmission_power(TransmissionPower power) { expected_config_.transmission_power = power; }
void set_air_data_rate(AirDataRate air_data_rate) { expected_config_.air_data_rate = air_data_rate; } void set_air_data_rate(AirDataRate air_data_rate) { expected_config_.air_data_rate = air_data_rate; }
void set_wor(WorPeriod wor) { expected_config_.wor_period = wor; }
void set_enable_lbt(EnableByte enable) { expected_config_.enable_lbt = enable; } void set_enable_lbt(EnableByte enable) { expected_config_.enable_lbt = enable; }
void set_enable_rssi(EnableByte enable) { expected_config_.enable_rssi = enable; } void set_enable_rssi(EnableByte enable) { expected_config_.enable_rssi = enable; }
void set_rssi_noise(EnableByte enable) { expected_config_.rssi_noise = enable; } void set_rssi_noise(EnableByte enable) { expected_config_.rssi_noise = enable; }
void set_channel(uid_t channel) { expected_config_.channel = channel; }
private: private:
std::vector<EbyteLoraSwitch *> sensors_; std::vector<EbyteLoraSwitch *> sensors_;