From 391fecadd0aa55dd4831267636e2c1a62c56d259 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 29 Mar 2021 22:26:08 +0200 Subject: [PATCH] formatting --- lib/framework/MqttSettingsService.h | 2 ++ lib/framework/NTPSettingsService.cpp | 2 +- src/WebSettingsService.cpp | 3 ++- src/WebStatusService.cpp | 2 +- src/version.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h index 673b1a013..fd7dc5d37 100644 --- a/lib/framework/MqttSettingsService.h +++ b/lib/framework/MqttSettingsService.h @@ -67,6 +67,8 @@ static String generateClientId() { #define EMSESP_DEFAULT_NESTED_FORMAT true #define EMSESP_DEFAULT_SUBSCRIBE_FORMAT 0 +#define EMSESP_DEFAULT_BOARD_PROFILE "S32" + class MqttSettings { public: // host and port - if enabled diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp index 295d3637d..8ac57dfaf 100644 --- a/lib/framework/NTPSettingsService.cpp +++ b/lib/framework/NTPSettingsService.cpp @@ -46,7 +46,7 @@ void NTPSettingsService::WiFiEvent(WiFiEvent_t event) { void NTPSettingsService::configureNTP() { if (connected_ && _state.enabled) { - emsesp::EMSESP::logger().info(F("Starting NTP...")); + emsesp::EMSESP::logger().info(F("Starting NTP")); configTzTime(_state.tzFormat.c_str(), _state.server.c_str()); } else { setenv("TZ", _state.tzFormat.c_str(), 1); diff --git a/src/WebSettingsService.cpp b/src/WebSettingsService.cpp index 04d7ef2a0..8f70e342b 100644 --- a/src/WebSettingsService.cpp +++ b/src/WebSettingsService.cpp @@ -66,7 +66,7 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) std::vector data; // led, dallas, rx, tx, button settings.board_profile = root["board_profile"] | EMSESP_DEFAULT_BOARD_PROFILE; if (!System::load_board_profile(data, settings.board_profile.c_str())) { - settings.board_profile = "S32"; // invalid board configuration, override the default in case it has been misspelled + settings.board_profile = EMSESP_DEFAULT_BOARD_PROFILE; // invalid board configuration, override the default in case it has been misspelled } uint8_t default_led_gpio = data[0]; @@ -186,6 +186,7 @@ void WebSettingsService::onUpdate() { if (WebSettings::has_flags(WebSettings::ChangeFlags::SYSLOG)) { EMSESP::system_.syslog_init(true); // reload settings + EMSESP::system_.syslog_start(); // re-start (or stop) } if (WebSettings::has_flags(WebSettings::ChangeFlags::ADC)) { diff --git a/src/WebStatusService.cpp b/src/WebStatusService.cpp index 0ea0c67a2..f0d418c2e 100644 --- a/src/WebStatusService.cpp +++ b/src/WebStatusService.cpp @@ -45,7 +45,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) { break; case SYSTEM_EVENT_ETH_START: - EMSESP::logger().info(F("Ethernet Started")); + EMSESP::logger().info(F("Ethernet initialized")); ETH.setHostname(EMSESP::system_.hostname().c_str()); break; diff --git a/src/version.h b/src/version.h index ce729b078..4626cd455 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define EMSESP_APP_VERSION "3.0.1b6" +#define EMSESP_APP_VERSION "3.0.1b7" #define EMSESP_PLATFORM "ESP32"