mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-05-19 04:33:27 +02:00
Otto Winter
6682c43dfa
## Description: Move esphome-core codebase into esphome (and a bunch of other refactors). See https://github.com/esphome/feature-requests/issues/97 Yes this is a shit ton of work and no there's no way to automate it :( But it will be worth it 👍 Progress: - Core support (file copy etc): 80% - Base Abstractions (light, switch): ~50% - Integrations: ~10% - Working? Yes, (but only with ported components). Other refactors: - Moves all codegen related stuff into a single class: `esphome.codegen` (imported as `cg`) - Rework coroutine syntax - Move from `component/platform.py` to `domain/component.py` structure as with HA - Move all defaults out of C++ and into config validation. - Remove `make_...` helpers from Application class. Reason: Merge conflicts with every single new integration. - Pointer Variables are stored globally instead of locally in setup(). Reason: stack size limit. Future work: - Rework const.py - Move all `CONF_...` into a conf class (usage `conf.UPDATE_INTERVAL` vs `CONF_UPDATE_INTERVAL`). Reason: Less convoluted import block - Enable loading from `custom_components` folder. **Related issue (if applicable):** https://github.com/esphome/feature-requests/issues/97 **Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here> ## Checklist: - [ ] The code change is tested and works locally. - [ ] Tests have been added to verify that the new code works (under `tests/` folder). If user exposed functionality or configuration variables are added/changed: - [ ] Documentation added/updated in [esphomedocs](https://github.com/OttoWinter/esphomedocs).
121 lines
2.9 KiB
C++
121 lines
2.9 KiB
C++
#include "esphome/core/util.h"
|
|
#include "esphome/core/defines.h"
|
|
#include "esphome/core/application.h"
|
|
|
|
#ifdef USE_WIFI
|
|
#include "esphome/components/wifi/wifi_component.h"
|
|
#endif
|
|
|
|
#ifdef USE_API
|
|
#include "esphome/components/api/api_server.h"
|
|
#endif
|
|
|
|
#ifdef USE_ETHERNET
|
|
#include "esphome/components/ethernet/ethernet_component.h"
|
|
#endif
|
|
|
|
#ifdef ARDUINO_ARCH_ESP32
|
|
#include <ESPmDNS.h>
|
|
#endif
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
#include <ESP8266mDNS.h>
|
|
#endif
|
|
|
|
namespace esphome {
|
|
|
|
bool network_is_connected() {
|
|
#ifdef USE_ETHERNET
|
|
if (ethernet::global_eth_component != nullptr && ethernet::global_eth_component->is_connected())
|
|
return true;
|
|
#endif
|
|
|
|
#ifdef USE_WIFI
|
|
if (wifi::global_wifi_component != nullptr)
|
|
return wifi::global_wifi_component->is_connected();
|
|
#endif
|
|
|
|
return false;
|
|
}
|
|
|
|
void network_setup() {
|
|
bool ready = true;
|
|
#ifdef USE_ETHERNET
|
|
if (ethernet::global_eth_component != nullptr) {
|
|
ethernet::global_eth_component->call_setup();
|
|
ready = false;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_WIFI
|
|
if (wifi::global_wifi_component != nullptr) {
|
|
wifi::global_wifi_component->call_setup();
|
|
ready = false;
|
|
}
|
|
#endif
|
|
|
|
while (!ready) {
|
|
#ifdef USE_ETHERNET
|
|
if (ethernet::global_eth_component != nullptr) {
|
|
ethernet::global_eth_component->call_loop();
|
|
ready = ready || ethernet::global_eth_component->can_proceed();
|
|
}
|
|
#endif
|
|
#ifdef USE_WIFI
|
|
if (wifi::global_wifi_component != nullptr) {
|
|
wifi::global_wifi_component->call_loop();
|
|
ready = ready || wifi::global_wifi_component->can_proceed();
|
|
}
|
|
#endif
|
|
|
|
App.feed_wdt();
|
|
}
|
|
}
|
|
void network_tick() {
|
|
#ifdef USE_ETHERNET
|
|
if (ethernet::global_eth_component != nullptr)
|
|
ethernet::global_eth_component->call_loop();
|
|
#endif
|
|
#ifdef USE_WIFI
|
|
if (wifi::global_wifi_component != nullptr)
|
|
wifi::global_wifi_component->call_loop();
|
|
#endif
|
|
}
|
|
|
|
void network_setup_mdns() {
|
|
MDNS.begin(App.get_name().c_str());
|
|
#ifdef USE_API
|
|
if (api::global_api_server != nullptr) {
|
|
MDNS.addService("esphomelib", "tcp", api::global_api_server->get_port());
|
|
// DNS-SD (!=mDNS !) requires at least one TXT record for service discovery - let's add version
|
|
MDNS.addServiceTxt("esphomelib", "tcp", "version", ESPHOME_VERSION);
|
|
MDNS.addServiceTxt("esphomelib", "tcp", "address", network_get_address().c_str());
|
|
} else {
|
|
#endif
|
|
// Publish "http" service if not using native API.
|
|
// This is just to have *some* mDNS service so that .local resolution works
|
|
MDNS.addService("http", "tcp", 80);
|
|
MDNS.addServiceTxt("http", "tcp", "version", ESPHOME_VERSION);
|
|
#ifdef USE_API
|
|
}
|
|
#endif
|
|
}
|
|
void network_tick_mdns() {
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
MDNS.update();
|
|
#endif
|
|
}
|
|
|
|
std::string network_get_address() {
|
|
#ifdef USE_ETHERNET
|
|
if (ethernet::global_eth_component != nullptr)
|
|
return ethernet::global_eth_component->get_use_address();
|
|
#endif
|
|
#ifdef USE_WIFI
|
|
if (wifi::global_wifi_component != nullptr)
|
|
return wifi::global_wifi_component->get_use_address();
|
|
#endif
|
|
return "";
|
|
}
|
|
|
|
} // namespace esphome
|