andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups

Browse Source
This commit is contained in:
proddy
2020-07-28 11:53:48 +02:00
parent b1c92b6f14
commit 53bfbcee06
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/system.cpp
View File

@@ -197,18 +197,16 @@ void System::syslog_init() {
syslog_mark_interval_ = settings.syslog_mark_interval; syslog_mark_interval_ = settings.syslog_mark_interval;
syslog_host_ = settings.syslog_host; syslog_host_ = settings.syslog_host;
}); });
EMSESP::esp8266React.getWiFiSettingsService()->read([&](WiFiSettings & wifiSettings) { syslog_.hostname(wifiSettings.hostname.c_str()); });
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
syslog_.start(); // syslog service syslog_.start(); // syslog service re-start
// configure syslog // configure syslog
IPAddress addr; IPAddress addr;
if (!addr.fromString(syslog_host_.c_str())) { if (!addr.fromString(syslog_host_.c_str())) {
addr = (uint32_t)0; addr = (uint32_t)0;
} }
EMSESP::esp8266React.getWiFiSettingsService()->read([&](WiFiSettings & wifiSettings) { syslog_.hostname(wifiSettings.hostname.c_str()); });
syslog_.log_level((uuid::log::Level)syslog_level_); syslog_.log_level((uuid::log::Level)syslog_level_);
syslog_.mark_interval(syslog_mark_interval_); syslog_.mark_interval(syslog_mark_interval_);
syslog_.destination(addr); syslog_.destination(addr);
@@ -230,20 +228,20 @@ void System::start() {
#endif #endif
} }
// fetch settings // fetch system heartbeat
std::string hostname;
EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { tx_mode_ = settings.tx_mode; });
EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat_ = settings.system_heartbeat; }); EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat_ = settings.system_heartbeat; });
// print boot message
EMSESP::esp8266React.getWiFiSettingsService()->read( EMSESP::esp8266React.getWiFiSettingsService()->read(
[&](WiFiSettings & wifiSettings) { LOG_INFO(F("System %s booted (EMS-ESP version %s)"), wifiSettings.hostname.c_str(), EMSESP_APP_VERSION); }); [&](WiFiSettings & wifiSettings) { LOG_INFO(F("System %s booted (EMS-ESP version %s)"), wifiSettings.hostname.c_str(), EMSESP_APP_VERSION); });
syslog_.log_level((uuid::log::Level)syslog_level_);
syslog_init(); // init SysLog syslog_init(); // init SysLog
if (LED_GPIO) { if (LED_GPIO) {
pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled
} }
EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { tx_mode_ = settings.tx_mode; });
#ifndef EMSESP_FORCE_SERIAL #ifndef EMSESP_FORCE_SERIAL
EMSuart::start(tx_mode_); // start UART EMSuart::start(tx_mode_); // start UART
#endif #endif