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

minor changes from https branch

Browse Source
This commit is contained in:
Proddy
2023-12-28 14:20:06 +01:00
parent fa1a372468
commit 3a92d69c77
9 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
interface/src/project/DashboardDevices.tsx
View File

@@ -420,33 +420,35 @@ const DashboardDevices: FC = () => {
<MessageBox my={2} level="warning" message={LL.EMS_BUS_SCANNING()} /> <MessageBox my={2} level="warning" message={LL.EMS_BUS_SCANNING()} />
)} )}
<Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}> {coreData.connected && (
{(tableList: any) => ( <Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}>
<> {(tableList: any) => (
<Header> <>
<HeaderRow> <Header>
<HeaderCell stiff /> <HeaderRow>
<HeaderCell resize>{LL.DESCRIPTION()}</HeaderCell> <HeaderCell stiff />
<HeaderCell stiff>{LL.TYPE(0)}</HeaderCell> <HeaderCell resize>{LL.DESCRIPTION()}</HeaderCell>
</HeaderRow> <HeaderCell stiff>{LL.TYPE(0)}</HeaderCell>
</Header> </HeaderRow>
<Body> </Header>
{tableList.map((device: Device) => ( <Body>
<Row key={device.id} item={device}> {tableList.map((device: Device) => (
<Cell stiff> <Row key={device.id} item={device}>
<DeviceIcon type_id={device.t} /> <Cell stiff>
</Cell> <DeviceIcon type_id={device.t} />
<Cell> </Cell>
{device.n} <Cell>
<span style={{ color: 'lightblue' }}>&nbsp;&nbsp;({device.e})</span> {device.n}
</Cell> <span style={{ color: 'lightblue' }}>&nbsp;&nbsp;({device.e})</span>
<Cell stiff>{device.tn}</Cell> </Cell>
</Row> <Cell stiff>{device.tn}</Cell>
))} </Row>
</Body> ))}
</> </Body>
)} </>
</Table> )}
</Table>
)}
</IconContext.Provider> </IconContext.Provider>
); );

2
interface/src/project/Help.tsx
View File

@@ -111,7 +111,7 @@ const Help: FC = () => {
{'github.com/emsesp/EMS-ESP32'} {'github.com/emsesp/EMS-ESP32'}
</Link> </Link>
</Typography> </Typography>
<Typography color="white" align="center"> <Typography color="white" variant="subtitle2" align="center">
@proddy @MichaelDvP @proddy @MichaelDvP
</Typography> </Typography>
</Box> </Box>

5
lib/framework/FSPersistence.h
View File

@@ -68,7 +68,10 @@ class FSPersistence {
return false; return false;
} }
// serialize the data to the file // serialize the data to the file
#ifdef EMSESP_DEBUG
Serial.println("Writing settings to " + String(_filePath));
#endif
serializeJson(jsonDocument, settingsFile); serializeJson(jsonDocument, settingsFile);
settingsFile.close(); settingsFile.close();
return true; return true;

2
src/devices/thermostat.cpp
View File

@@ -4226,7 +4226,7 @@ void Thermostat::register_device_values() {
#if defined(EMSESP_STANDALONE_DUMP) #if defined(EMSESP_STANDALONE_DUMP)
// if we're just dumping out values, create a single dummy hc // if we're just dumping out values, create a single dummy hc
register_device_values_hc(std::make_shared<emsesp::Thermostat::HeatingCircuit>(1, this->model())); // hc=1 register_device_values_hc(std::make_shared<Thermostat::HeatingCircuit>(1, this->model())); // hc=1
#endif #endif
} }

2
src/emsdevice.cpp
View File

@@ -1755,7 +1755,7 @@ void EMSdevice::mqtt_ha_entity_config_create() {
} }
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
// always create minimum one config // always create minimum one config
if (ESP.getMaxAllocHeap() < (6 * 1024) || (!emsesp::EMSESP::system_.PSram() && ESP.getFreeHeap() < (65 * 1024))) { if (ESP.getMaxAllocHeap() < (6 * 1024) || (!EMSESP::system_.PSram() && ESP.getFreeHeap() < (65 * 1024))) {
break; break;
} }
#endif #endif

6
src/emsesp.cpp
View File

@@ -1153,7 +1153,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
emsdevices.back()->unique_id(++unique_id_count_); emsdevices.back()->unique_id(++unique_id_count_);
// sort devices based on type // sort devices based on type
std::sort(emsdevices.begin(), emsdevices.end(), [](const std::unique_ptr<emsesp::EMSdevice> & a, const std::unique_ptr<emsesp::EMSdevice> & b) { std::sort(emsdevices.begin(), emsdevices.end(), [](const std::unique_ptr<EMSdevice> & a, const std::unique_ptr<EMSdevice> & b) {
return a->device_type() < b->device_type(); return a->device_type() < b->device_type();
}); });
@@ -1394,7 +1394,7 @@ void EMSESP::scheduled_fetch_values() {
EMSESP::EMSESP() EMSESP::EMSESP()
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
: telnet_([this](Stream & stream, const IPAddress & addr, uint16_t port) -> std::shared_ptr<uuid::console::Shell> { : telnet_([this](Stream & stream, const IPAddress & addr, uint16_t port) -> std::shared_ptr<uuid::console::Shell> {
return std::make_shared<emsesp::EMSESPConsole>(*this, stream, addr, port); return std::make_shared<EMSESPConsole>(*this, stream, addr, port);
}) })
#endif #endif
{ {
@@ -1421,7 +1421,7 @@ void EMSESP::start() {
// start the file system // start the file system
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
if (!LittleFS.begin(true)) { if (!LittleFS.begin(true)) {
Serial.println("LittleFS Mount Failed. EMS-ESP stopped."); Serial.println("LittleFS Mount Failed. Using default settings.");
return; return;
} }
#endif #endif

12
src/emsesp.h
View File

@@ -1,7 +1,7 @@
/* /*
* EMS-ESP - https://github.com/emsesp/EMS-ESP * EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020-2023 Paul Derbyshire * Copyright 2020-2023 Paul Derbyshire
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@@ -83,11 +83,11 @@
namespace emsesp { namespace emsesp {
using DeviceValueUOM = emsesp::DeviceValue::DeviceValueUOM; using DeviceValueUOM = DeviceValue::DeviceValueUOM;
using DeviceValueType = emsesp::DeviceValue::DeviceValueType; using DeviceValueType = DeviceValue::DeviceValueType;
using DeviceValueState = emsesp::DeviceValue::DeviceValueState; using DeviceValueState = DeviceValue::DeviceValueState;
using DeviceValueTAG = emsesp::DeviceValue::DeviceValueTAG; using DeviceValueTAG = DeviceValue::DeviceValueTAG;
using DeviceValueNumOp = emsesp::DeviceValue::DeviceValueNumOp; using DeviceValueNumOp = DeviceValue::DeviceValueNumOp;
// forward declarations for compiler // forward declarations for compiler
class EMSESPShell; class EMSESPShell;

6
src/main.cpp
View File

@@ -1,7 +1,7 @@
/* /*
* EMS-ESP - https://github.com/emsesp/EMS-ESP * EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020-2023 Paul Derbyshire * Copyright 2020-2023 Paul Derbyshire
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,9 @@
#include "emsesp.h" #include "emsesp.h"
static emsesp::EMSESP application; using namespace emsesp;
static EMSESP application; // the main application
void setup() { void setup() {
application.start(); application.start();

33
src/system.cpp
View File

@@ -1111,7 +1111,7 @@ bool System::check_upgrade(bool factory_settings) {
#if defined(EMSESP_DEBUG) #if defined(EMSESP_DEBUG)
if (!missing_version) { if (!missing_version) {
LOG_INFO("Current version from settings is %d.%d.%d-%s", LOG_INFO("Checking version (settings has %d.%d.%d-%s)...",
settings_version.major(), settings_version.major(),
settings_version.minor(), settings_version.minor(),
settings_version.patch(), settings_version.patch(),
@@ -1119,26 +1119,20 @@ bool System::check_upgrade(bool factory_settings) {
} }
#endif #endif
// always save the new version to the settings
EMSESP::webSettingsService.update(
[&](WebSettings & settings) {
settings.version = EMSESP_APP_VERSION;
return StateUpdateResult::CHANGED;
},
"local");
if (factory_settings) { if (factory_settings) {
return false; // fresh install, do nothing return false; // fresh install, do nothing
} }
version::Semver200_version this_version(EMSESP_APP_VERSION); version::Semver200_version this_version(EMSESP_APP_VERSION);
bool save_version = true;
// compare versions // compare versions
bool reboot_required = false;
if (this_version > settings_version) { if (this_version > settings_version) {
// need upgrade
LOG_NOTICE("Upgrading to version %d.%d.%d-%s", this_version.major(), this_version.minor(), this_version.patch(), this_version.prerelease().c_str()); LOG_NOTICE("Upgrading to version %d.%d.%d-%s", this_version.major(), this_version.minor(), this_version.patch(), this_version.prerelease().c_str());
// if we're coming from 3.4.4 or 3.5.0b14 then we need to apply new settings // if we're coming from 3.4.4 or 3.5.0b14 which had no version stored then we need to apply new settings
if (missing_version) { if (missing_version) {
LOG_DEBUG("Setting MQTT Entity ID format to v3.4 format"); LOG_DEBUG("Setting MQTT Entity ID format to v3.4 format");
EMSESP::esp8266React.getMqttSettingsService()->update( EMSESP::esp8266React.getMqttSettingsService()->update(
@@ -1148,15 +1142,26 @@ bool System::check_upgrade(bool factory_settings) {
}, },
"local"); "local");
} }
} else if (this_version < settings_version) { } else if (this_version < settings_version) {
// need downgrade
LOG_NOTICE("Downgrading to version %d.%d.%d-%s", this_version.major(), this_version.minor(), this_version.patch(), this_version.prerelease().c_str()); LOG_NOTICE("Downgrading to version %d.%d.%d-%s", this_version.major(), this_version.minor(), this_version.patch(), this_version.prerelease().c_str());
} else { } else {
// same version, do nothing // same version, do nothing
return false; save_version = false;
} }
return reboot_required; // if we did a change, set the new version and reboot
if (save_version) {
EMSESP::webSettingsService.update(
[&](WebSettings & settings) {
settings.version = EMSESP_APP_VERSION;
return StateUpdateResult::CHANGED;
},
"local");
return true; // need reboot
}
return false;
} }
// list commands // list commands