jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-30 07:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert wled light effect to use socket instead of WiFiUDP

Browse Source
This commit is contained in:
Jesse Hills 2023-06-19 13:40:46 +12:00
parent b9f20b36cb
commit e07f9a5b9c
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
3 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/wled/__init__.py
View File

@ -7,7 +7,8 @@ from esphome.const import CONF_NAME, CONF_PORT
wled_ns = cg.esphome_ns.namespace("wled") wled_ns = cg.esphome_ns.namespace("wled")
WLEDLightEffect = wled_ns.class_("WLEDLightEffect", AddressableLightEffect) WLEDLightEffect = wled_ns.class_("WLEDLightEffect", AddressableLightEffect)
CONFIG_SCHEMA = cv.All(cv.Schema({}), cv.only_with_arduino) AUTO_LOAD = ["socket"]
CONFIG_SCHEMA = cv.Schema({})
@register_addressable_effect( @register_addressable_effect(

70
esphome/components/wled/wled_light_effect.cpp
View File

@ -1,17 +1,7 @@
#ifdef USE_ARDUINO
#include "wled_light_effect.h" #include "wled_light_effect.h"
#include "esphome/core/log.h"
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
#include "esphome/core/log.h"
#ifdef USE_ESP32
#include <WiFi.h>
#endif
#ifdef USE_ESP8266
#include <ESP8266WiFi.h>
#include <WiFiUdp.h>
#endif
namespace esphome { namespace esphome {
namespace wled { namespace wled {
@ -35,9 +25,9 @@ void WLEDLightEffect::start() {
void WLEDLightEffect::stop() { void WLEDLightEffect::stop() {
AddressableLightEffect::stop(); AddressableLightEffect::stop();
if (udp_) { if (this->socket_) {
udp_->stop(); this->socket_->close();
udp_.reset(); this->socket_.reset();
} }
} }
@ -50,27 +40,49 @@ void WLEDLightEffect::blank_all_leds_(light::AddressableLight &it) {
void WLEDLightEffect::apply(light::AddressableLight &it, const Color &current_color) { void WLEDLightEffect::apply(light::AddressableLight &it, const Color &current_color) {
// Init UDP lazily // Init UDP lazily
if (!udp_) { if (this->socket_ == nullptr) {
udp_ = make_unique<WiFiUDP>(); this->socket_ = socket::socket_ip(SOCK_DGRAM, IPPROTO_IP);
if (!udp_->begin(port_)) { int enable = 1;
ESP_LOGW(TAG, "Cannot bind WLEDLightEffect to %d.", port_); int err = this->socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
if (err != 0) {
ESP_LOGW(TAG, "Socket unable to set reuseaddr: errno %d", err);
// we can still continue
}
err = this->socket_->setblocking(false);
if (err != 0) {
ESP_LOGW(TAG, "Socket unable to set nonblocking mode: errno %d", err);
return;
}
struct sockaddr_storage server;
socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
if (sl == 0) {
ESP_LOGW(TAG, "Socket unable to set sockaddr: errno %d", errno);
return;
}
server.ss_family = AF_INET;
err = this->socket_->bind((struct sockaddr *) &server, sizeof(server));
if (err != 0) {
ESP_LOGW(TAG, "Socket unable to bind: errno %d", errno);
return; return;
} }
} }
std::vector<uint8_t> payload; std::vector<uint8_t> payload;
while (uint16_t packet_size = udp_->parsePacket()) { uint8_t buf[1460];
payload.resize(packet_size);
if (!udp_->read(&payload[0], payload.size())) { ssize_t len = this->socket_->read(buf, sizeof(buf));
continue; if (len == -1) {
} return;
}
payload.resize(len);
memmove(&payload[0], buf, len);
if (!this->parse_frame_(it, &payload[0], payload.size())) { if (!this->parse_frame_(it, &payload[0], payload.size())) {
ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=0x%02X).", payload.size(), payload[0]); ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=0x%02X).", payload.size(), payload[0]);
continue;
}
} }
// FIXME: Use roll-over safe arithmetic // FIXME: Use roll-over safe arithmetic
@ -248,5 +260,3 @@ bool WLEDLightEffect::parse_dnrgb_frame_(light::AddressableLight &it, const uint
} // namespace wled } // namespace wled
} // namespace esphome } // namespace esphome
#endif // USE_ARDUINO

11
esphome/components/wled/wled_light_effect.h
View File

@ -1,15 +1,12 @@
#pragma once #pragma once
#ifdef USE_ARDUINO
#include "esphome/core/component.h"
#include "esphome/components/light/addressable_light_effect.h" #include "esphome/components/light/addressable_light_effect.h"
#include "esphome/components/socket/socket.h"
#include "esphome/core/component.h"
#include <vector> #include <vector>
#include <memory> #include <memory>
class UDP;
namespace esphome { namespace esphome {
namespace wled { namespace wled {
@ -32,12 +29,10 @@ class WLEDLightEffect : public light::AddressableLightEffect {
bool parse_dnrgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size); bool parse_dnrgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
uint16_t port_{0}; uint16_t port_{0};
std::unique_ptr<UDP> udp_; std::unique_ptr<socket::Socket> socket_;
uint32_t blank_at_{0}; uint32_t blank_at_{0};
uint32_t dropped_{0}; uint32_t dropped_{0};
}; };
} // namespace wled } // namespace wled
} // namespace esphome } // namespace esphome
#endif // USE_ARDUINO