Skip to content

Commit

Permalink
Merge pull request #416 from proddy/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
proddy authored Mar 27, 2022
2 parents 9f946f3 + b9e1c0b commit 28ae1ae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions interface/src/project/SettingsCustomization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ const SettingsCustomization: FC = () => {
const [errorMessage, setErrorMessage] = useState<string>();
const [selectedDevice, setSelectedDevice] = useState<number>(0);
const [confirmReset, setConfirmReset] = useState<boolean>(false);

// eslint-disable-next-line
const [masks, setMasks] = useState(() => ['1']);

const fetchDevices = useCallback(async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/emsdevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ void EMSdevice::reset_entity_masks() {
}

// disable/exclude/mask_out a device entity based on the id
void EMSdevice::mask_entity(std::string & entity_id) {
void EMSdevice::mask_entity(const std::string & entity_id) {
// first character contains mask flags
uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str());
for (auto & dv : devicevalues_) {
Expand Down
2 changes: 1 addition & 1 deletion src/emsdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class EMSdevice {
char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers);
void show_mqtt_handlers(uuid::console::Shell & shell) const;
void list_device_entries(JsonObject & output) const;
void mask_entity(std::string & entity_id);
void mask_entity(const std::string & entity_id);
void reset_entity_masks();

using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>;
Expand Down

0 comments on commit 28ae1ae

Please sign in to comment.