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

Merge pull request #642 from proddy/dev

Browse Source 
update to commands in web
This commit is contained in:
Proddy
2022-09-25 11:46:01 +02:00
committed by GitHub
parent a7930d8403 96af9afc83
commit 1278776297
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/components/upload/SingleUpload.tsx
View File

@@ -64,7 +64,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, prog
borderWidth: 2, borderWidth: 2,
borderRadius: 2, borderRadius: 2,
borderStyle: 'dashed', borderStyle: 'dashed',
color: theme.palette.grey[700], color: theme.palette.grey[400],
transition: 'border .24s ease-in-out', transition: 'border .24s ease-in-out',
width: '100%', width: '100%',
cursor: uploading ? 'default' : 'pointer', cursor: uploading ? 'default' : 'pointer',

8
interface/src/project/SettingsCustomization.tsx
View File

@@ -169,8 +169,8 @@ const SettingsCustomization: FC = () => {
return de.id; return de.id;
} }
if (de.n === '') { if (de.n[0] === '!') {
return LL.COMMAND() + ': ' + de.id; return LL.COMMAND() + ': ' + de.n.slice(1);
} }
return ( return (
@@ -316,6 +316,10 @@ const SettingsCustomization: FC = () => {
}; };
const editEntity = (de: DeviceEntity) => { const editEntity = (de: DeviceEntity) => {
if (de.n && de.n[0] === '!') {
return;
}
if (de.cn === undefined) { if (de.cn === undefined) {
de.cn = ''; de.cn = '';
} }

2
mock-api/server.js
View File

@@ -623,7 +623,7 @@ const emsesp_deviceentities_1 = [
] ]
const emsesp_deviceentities_2 = [ const emsesp_deviceentities_2 = [
{ u: 0, n: '', id: 'reset', m: 8, w: false }, { u: 0, n: '!reset', id: 'reset', m: 8, w: false },
{ v: false, n: 'heating active', id: 'heatingactive', m: 8, w: false }, { v: false, n: 'heating active', id: 'heatingactive', m: 8, w: false },
{ v: false, n: 'tapwater active', id: 'tapwateractive', m: 4, w: false }, { v: false, n: 'tapwater active', id: 'tapwateractive', m: 4, w: false },
{ v: 5, n: 'selected flow temperature', id: 'selflowtemp', m: 4, w: true }, { v: 5, n: 'selected flow temperature', id: 'selflowtemp', m: 4, w: true },

13
src/emsdevice.cpp
View File

@@ -956,13 +956,14 @@ void EMSdevice::generate_values_web_customization(JsonArray & output) {
obj["n"] = name; obj["n"] = name;
} }
} }
} else {
obj["n"] = "";
}
// add the custom name, is optional // add the custom name, is optional
if (!dv.custom_fullname.empty()) { if (!dv.custom_fullname.empty()) {
obj["cn"] = dv.custom_fullname; obj["cn"] = dv.custom_fullname;
}
} else {
// it's a command
obj["n"] = "!" + fullname; // prefix ! to fullname for commands
} }
obj["m"] = dv.state >> 4; // send back the mask state. We're only interested in the high nibble obj["m"] = dv.state >> 4; // send back the mask state. We're only interested in the high nibble

4
src/locale_translations.h
View File

@@ -26,7 +26,7 @@
#define EMSESP_LOCALE_PL "pl" #define EMSESP_LOCALE_PL "pl"
#define EMSESP_LOCALE_NO "no" #define EMSESP_LOCALE_NO "no"
// translations are in order en, de,nl, se.... // translations are in order en, de, nl, se, pl, no....
// if there is no translation, it will default to en // if there is no translation, it will default to en
// General // General
@@ -171,7 +171,7 @@ MAKE_PSTR_LIST(cyl2, F("cyl 2"), F("Zyl_2"), F("Cil 2"), F("Cyl 2"))
// Entity translations // Entity translations
// Boiler // Boiler
MAKE_PSTR_LIST(wwtapactivated, F("wwtapactivated"), F("turn on/off"), F("Durchlauferhitzer aktiv"), F("zet aan/uit"), F("sätt på/av")) MAKE_PSTR_LIST(wwtapactivated, F("wwtapactivated"), F("turn on/off"), F("Durchlauferhitzer aktiv"), F("zet aan/uit"), F("sätt på/av"))
MAKE_PSTR_LIST(reset, F("reset"), F("Reset"), F("Reset"), F("Nollställ"), F("reset")) MAKE_PSTR_LIST(reset, F("reset"), F("Reset"), F("Reset"), F("Reset"), F("Nollställ"))
MAKE_PSTR_LIST(oilPreHeat, F("oilpreheat"), F("oil preheating"), F("Ölvorwärmung"), F("Olie voorverwarming"), F("Förvärmning olja")) MAKE_PSTR_LIST(oilPreHeat, F("oilpreheat"), F("oil preheating"), F("Ölvorwärmung"), F("Olie voorverwarming"), F("Förvärmning olja"))
MAKE_PSTR_LIST(heatingActive, F("heatingactive"), F("heating active"), F("Heizen aktiv"), F("Verwarming actief"), F("Uppvärmning aktiv")) MAKE_PSTR_LIST(heatingActive, F("heatingactive"), F("heating active"), F("Heizen aktiv"), F("Verwarming actief"), F("Uppvärmning aktiv"))
MAKE_PSTR_LIST(tapwaterActive, F("tapwateractive"), F("tapwater active"), F("Warmwasser aktiv"), F("Warm water actief"), F("Varmvatten aktiv")) MAKE_PSTR_LIST(tapwaterActive, F("tapwateractive"), F("tapwater active"), F("Warmwasser aktiv"), F("Warm water actief"), F("Varmvatten aktiv"))