From 39d78fb44484c5ba55e8d838036f8edebc59aa81 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Tue, 29 Mar 2022 10:38:05 +0200 Subject: [PATCH] remove `(hidden)` text, force exclude from web icon --- interface/src/project/SettingsCustomization.tsx | 6 +++--- src/emsdevice.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index b6e3f77a5..136c3d951 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -186,13 +186,13 @@ const SettingsCustomization: FC = () => { const getMask = (de: DeviceEntity) => { var new_masks = []; - if ((de.m & 1) === 1) { + if ((de.m & 1) === 1 || de.n === '') { new_masks.push('1'); } if ((de.m & 2) === 2) { new_masks.push('2'); } - if ((de.m & 4) === 4) { + if ((de.m & 4) === 4 && de.w) { new_masks.push('4'); } if ((de.m & 8) === 8) { @@ -223,7 +223,7 @@ const SettingsCustomization: FC = () => { setMask(de, mask); }} > - + diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index f3ca26d0b..ea0db7ba0 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -831,7 +831,7 @@ void EMSdevice::generate_values_web_all(JsonArray & output) { obj["n"] = name; } } else { - obj["n"] = "(hidden)"; + obj["n"] = ""; } // shortname