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

formatting

Browse Source
This commit is contained in:
proddy
2021-03-29 22:26:08 +02:00
parent 4d0032441f
commit 391fecadd0
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/MqttSettingsService.h
View File

@@ -67,6 +67,8 @@ static String generateClientId() {
#define EMSESP_DEFAULT_NESTED_FORMAT true #define EMSESP_DEFAULT_NESTED_FORMAT true
#define EMSESP_DEFAULT_SUBSCRIBE_FORMAT 0 #define EMSESP_DEFAULT_SUBSCRIBE_FORMAT 0
#define EMSESP_DEFAULT_BOARD_PROFILE "S32"
class MqttSettings { class MqttSettings {
public: public:
// host and port - if enabled // host and port - if enabled

2
lib/framework/NTPSettingsService.cpp
View File

@@ -46,7 +46,7 @@ void NTPSettingsService::WiFiEvent(WiFiEvent_t event) {
void NTPSettingsService::configureNTP() { void NTPSettingsService::configureNTP() {
if (connected_ && _state.enabled) { 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()); configTzTime(_state.tzFormat.c_str(), _state.server.c_str());
} else { } else {
setenv("TZ", _state.tzFormat.c_str(), 1); setenv("TZ", _state.tzFormat.c_str(), 1);

3
src/WebSettingsService.cpp
View File

@@ -66,7 +66,7 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings)
std::vector<uint8_t> data; // led, dallas, rx, tx, button std::vector<uint8_t> data; // led, dallas, rx, tx, button
settings.board_profile = root["board_profile"] | EMSESP_DEFAULT_BOARD_PROFILE; settings.board_profile = root["board_profile"] | EMSESP_DEFAULT_BOARD_PROFILE;
if (!System::load_board_profile(data, settings.board_profile.c_str())) { 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]; uint8_t default_led_gpio = data[0];
@@ -186,6 +186,7 @@ void WebSettingsService::onUpdate() {
if (WebSettings::has_flags(WebSettings::ChangeFlags::SYSLOG)) { if (WebSettings::has_flags(WebSettings::ChangeFlags::SYSLOG)) {
EMSESP::system_.syslog_init(true); // reload settings EMSESP::system_.syslog_init(true); // reload settings
EMSESP::system_.syslog_start(); // re-start (or stop)
} }
if (WebSettings::has_flags(WebSettings::ChangeFlags::ADC)) { if (WebSettings::has_flags(WebSettings::ChangeFlags::ADC)) {

2
src/WebStatusService.cpp
View File

@@ -45,7 +45,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
break; break;
case SYSTEM_EVENT_ETH_START: case SYSTEM_EVENT_ETH_START:
EMSESP::logger().info(F("Ethernet Started")); EMSESP::logger().info(F("Ethernet initialized"));
ETH.setHostname(EMSESP::system_.hostname().c_str()); ETH.setHostname(EMSESP::system_.hostname().c_str());
break; break;

2
src/version.h
View File

@@ -1,2 +1,2 @@
#define EMSESP_APP_VERSION "3.0.1b6" #define EMSESP_APP_VERSION "3.0.1b7"
#define EMSESP_PLATFORM "ESP32" #define EMSESP_PLATFORM "ESP32"