Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-01 11:14:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

cleanup

Browse source
This commit is contained in:
Daniël Koek 2024-04-28 18:08:19 +01:00
parent 13bf7cdc0b
commit 08c944f1e1
2 changed files with 46 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
esphome/components/ebyte_lora/__init__.py
View file

@ -31,6 +31,12 @@ WOR_PERIOD_OPTIONS = {
"WOR_3500": WorPeriod.WOR_3500, "WOR_3500": WorPeriod.WOR_3500,
"WOR_4000": WorPeriod.WOR_4000, "WOR_4000": WorPeriod.WOR_4000,
} }
UartParitySetting = ebyte_lora_ns.enum("UartParitySetting")
UART_PARITY_OPTIONS = {
"EBYTE_UART_8N1": UartParitySetting.EBYTE_UART_8N1,
"EBYTE_UART_8O1": UartParitySetting.EBYTE_UART_8O1,
"EBYTE_UART_8E1": UartParitySetting.EBYTE_UART_8E1,
}
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,
@ -42,6 +48,13 @@ UART_BPS_OPTIONS = {
"UART_57600": UartBpsSpeed.UART_57600, "UART_57600": UartBpsSpeed.UART_57600,
"UART_115200": UartBpsSpeed.UART_115200, "UART_115200": UartBpsSpeed.UART_115200,
} }
SubPacketSetting = ebyte_lora_ns.enum("SubPacketSetting")
SUB_PACKET_OPTIONS = {
"SUB_200B": SubPacketSetting.SUB_200B,
"SUB_128B": SubPacketSetting.SUB_128B,
"SUB_64B": SubPacketSetting.SUB_64B,
"SUB_32B": SubPacketSetting.SUB_32B,
}
TransmissionMode = ebyte_lora_ns.enum("TransmissionMode") TransmissionMode = ebyte_lora_ns.enum("TransmissionMode")
TRANSMISSION_MODE_OPTIONS = { TRANSMISSION_MODE_OPTIONS = {
"TRANSPARENT": TransmissionMode.TRANSPARENT, "TRANSPARENT": TransmissionMode.TRANSPARENT,
@ -76,6 +89,8 @@ CONF_PIN_AUX = "pin_aux"
CONF_PIN_M0 = "pin_m0" CONF_PIN_M0 = "pin_m0"
CONF_PIN_M1 = "pin_m1" CONF_PIN_M1 = "pin_m1"
CONF_LORA_RSSI = "lora_rssi" CONF_LORA_RSSI = "lora_rssi"
CONF_ADDL = "addl"
CONF_ADDH = "addh"
CONF_UART_BPS = "uart_bps" 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"
@ -84,6 +99,8 @@ CONF_WOR_PERIOD = "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_UART_PARITY = "uart_parity"
CONF_SUB_PACKET = "sub_packet"
CONFIG_SCHEMA = ( CONFIG_SCHEMA = (
cv.Schema( cv.Schema(
@ -102,12 +119,20 @@ CONFIG_SCHEMA = (
accuracy_decimals=1, accuracy_decimals=1,
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
), ),
cv.Optional(CONF_ADDH, default=0): cv.int_range(min=0, max=255),
cv.Optional(CONF_ADDL, default=0): cv.int_range(min=0, max=255),
cv.Optional(CONF_CHANNEL, default=13): cv.int_range(min=0, max=83), cv.Optional(CONF_CHANNEL, default=13): cv.int_range(min=0, max=83),
cv.Optional(CONF_UART_PARITY, default="EBYTE_UART_8N1"): cv.enum(
UART_PARITY_OPTIONS, upper=True
),
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
), ),
cv.Optional(CONF_TRANSMISSION_MODE, default="TRANSPARENT"): cv.enum( cv.Optional(CONF_UART_PARITY, default="EBYTE_UART_8N1"): cv.enum(
TRANSMISSION_MODE_OPTIONS, upper=True UART_PARITY_OPTIONS, upper=True
),
cv.Optional(CONF_SUB_PACKET, default="SUB_200B"): cv.enum(
SUB_PACKET_OPTIONS, upper=True
), ),
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
@ -146,15 +171,19 @@ async def to_code(config):
cg.add(var.set_pin_m0(pin_m0)) cg.add(var.set_pin_m0(pin_m0))
pin_m1 = await cg.gpio_pin_expression(config[CONF_PIN_M1]) pin_m1 = await cg.gpio_pin_expression(config[CONF_PIN_M1])
cg.add(var.set_pin_m1(pin_m1)) cg.add(var.set_pin_m1(pin_m1))
cg.add(var.set_uart_bps(config[CONF_UART_BPS])) cg.add(var.set_addh(config[CONF_ADDH]))
cg.add(var.set_transmission_mode(config[CONF_TRANSMISSION_MODE])) cg.add(var.set_addl(config[CONF_ADDL]))
cg.add(var.set_transmission_power(config[CONF_TRANSMISSION_POWER]))
cg.add(var.set_air_data_rate(config[CONF_AIR_DATA_RATE])) cg.add(var.set_air_data_rate(config[CONF_AIR_DATA_RATE]))
cg.add(var.set_enable_rssi(config[CONF_ENABLE_RSSI])) cg.add(var.set_uart_parity(config[CONF_UART_PARITY]))
cg.add(var.set_enable_lbt(config[CONF_ENABLE_LBT])) cg.add(var.set_uart_bps(config[CONF_UART_BPS]))
cg.add(var.set_transmission_power(config[CONF_TRANSMISSION_POWER]))
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_PERIOD])) cg.add(var.set_sub_packet(config[CONF_SUB_PACKET]))
cg.add(var.set_channel(config[CONF_CHANNEL])) cg.add(var.set_channel(config[CONF_CHANNEL]))
cg.add(var.set_wor(config[CONF_WOR_PERIOD]))
cg.add(var.set_enable_lbt(config[CONF_ENABLE_LBT]))
cg.add(var.set_transmission_mode(config[CONF_TRANSMISSION_MODE]))
cg.add(var.set_enable_rssi(config[CONF_ENABLE_RSSI]))
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])

14
esphome/components/ebyte_lora/ebyte_lora.h
View file

@ -35,15 +35,19 @@ class EbyteLoraComponent : public PollingComponent, public uart::UARTDevice {
void register_sensor(EbyteLoraSwitch *obj) { this->sensors_.push_back(obj); } void register_sensor(EbyteLoraSwitch *obj) { this->sensors_.push_back(obj); }
void set_pin_m0(InternalGPIOPin *pin_m0) { pin_m0_ = pin_m0; } void set_pin_m0(InternalGPIOPin *pin_m0) { pin_m0_ = pin_m0; }
void set_pin_m1(InternalGPIOPin *pin_m1) { pin_m1_ = pin_m1; } void set_pin_m1(InternalGPIOPin *pin_m1) { pin_m1_ = pin_m1; }
void set_uart_bps(UartBpsSpeed bps_speed) { expected_config_.uart_baud = bps_speed; } void set_addh(uint8_t addh) { expected_config_.addh = addh; }
void set_transmission_mode(TransmissionMode mode) { expected_config_.transmission_mode = mode; } void set_addl(uint8_t addl) { expected_config_.addl = addl; }
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_uart_parity(UartParitySetting parity) { expected_config_.parity = parity; }
void set_uart_bps(UartBpsSpeed bps_speed) { expected_config_.uart_baud = bps_speed; }
void set_transmission_power(TransmissionPower power) { expected_config_.transmission_power = power; }
void set_rssi_noise(EnableByte enable) { expected_config_.rssi_noise = enable; }
void set_sub_packet(SubPacketSetting sub_packet) { expected_config_.sub_packet = sub_packet; }
void set_channel(uint8_t channel) { expected_config_.channel = channel; }
void set_wor(WorPeriod wor) { expected_config_.wor_period = wor; } 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_transmission_mode(TransmissionMode mode) { expected_config_.transmission_mode = mode; }
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_channel(uid_t channel) { expected_config_.channel = channel; }
private: private:
std::vector<EbyteLoraSwitch *> sensors_; std::vector<EbyteLoraSwitch *> sensors_;