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 #416 from proddy/dev

Browse Source 
Dev
This commit is contained in:
Proddy
2022-03-27 23:19:52 +02:00
committed by GitHub
parent 9f946f3514 b9e1c0ba56
commit 28ae1ae3d4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,8 @@ const SettingsCustomization: FC = () => {
const [errorMessage, setErrorMessage] = useState<string>(); const [errorMessage, setErrorMessage] = useState<string>();
const [selectedDevice, setSelectedDevice] = useState<number>(0); const [selectedDevice, setSelectedDevice] = useState<number>(0);
const [confirmReset, setConfirmReset] = useState<boolean>(false); const [confirmReset, setConfirmReset] = useState<boolean>(false);
// eslint-disable-next-line
const [masks, setMasks] = useState(() => ['1']); const [masks, setMasks] = useState(() => ['1']);
const fetchDevices = useCallback(async () => { const fetchDevices = useCallback(async () => {

2
src/emsdevice.cpp
View File

@@ -858,7 +858,7 @@ void EMSdevice::reset_entity_masks() {
} }
// disable/exclude/mask_out a device entity based on the id // 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 // first character contains mask flags
uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str()); uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str());
for (auto & dv : devicevalues_) { for (auto & dv : devicevalues_) {

2
src/emsdevice.h
View File

@@ -183,7 +183,7 @@ class EMSdevice {
char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers); char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers);
void show_mqtt_handlers(uuid::console::Shell & shell) const; void show_mqtt_handlers(uuid::console::Shell & shell) const;
void list_device_entries(JsonObject & output) 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(); void reset_entity_masks();
using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>; using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>;