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

Merge pull request #423 from MichaelDvP/dev

Browse Source 
remove `(hidden)` text, force exclude from web icon
This commit is contained in:
Proddy
2022-03-29 12:16:16 +02:00
committed by GitHub
parent ac1de4c995 39d78fb444
commit 80c87c8c43
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,13 +186,13 @@ const SettingsCustomization: FC = () => {
const getMask = (de: DeviceEntity) => { const getMask = (de: DeviceEntity) => {
var new_masks = []; var new_masks = [];
if ((de.m & 1) === 1) { if ((de.m & 1) === 1 || de.n === '') {
new_masks.push('1'); new_masks.push('1');
} }
if ((de.m & 2) === 2) { if ((de.m & 2) === 2) {
new_masks.push('2'); new_masks.push('2');
} }
if ((de.m & 4) === 4) { if ((de.m & 4) === 4 && de.w) {
new_masks.push('4'); new_masks.push('4');
} }
if ((de.m & 8) === 8) { if ((de.m & 8) === 8) {
@@ -223,7 +223,7 @@ const SettingsCustomization: FC = () => {
setMask(de, mask); setMask(de, mask);
}} }}
> >
<ToggleButton value="8" color="success" disabled={(de.m & 1) !== 0}> <ToggleButton value="8" color="success" disabled={(de.m & 1) !== 0 || de.n === ''}>
<FavoriteBorderOutlinedIcon fontSize="small" /> <FavoriteBorderOutlinedIcon fontSize="small" />
</ToggleButton> </ToggleButton>
<ToggleButton value="4" disabled={!de.w}> <ToggleButton value="4" disabled={!de.w}>

2
src/emsdevice.cpp
View File

@@ -831,7 +831,7 @@ void EMSdevice::generate_values_web_all(JsonArray & output) {
obj["n"] = name; obj["n"] = name;
} }
} else { } else {
obj["n"] = "(hidden)"; obj["n"] = "";
} }
// shortname // shortname