Skip to content

Commit df0ce46

Browse files
committed
Make a method private.
1 parent 6aa4cbb commit df0ce46

File tree

1 file changed

+23
-27
lines changed

1 file changed

+23
-27
lines changed

ESPWebThingAdapter.h

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -147,31 +147,6 @@ class WebThingAdapter {
147147
this->server.begin();
148148
}
149149

150-
#ifndef WITHOUT_WS
151-
void sendChangedProperties(ThingDevice *device) {
152-
// Prepare one buffer per device
153-
DynamicJsonDocument message(LARGE_JSON_DOCUMENT_SIZE);
154-
message["messageType"] = "propertyStatus";
155-
JsonObject prop = message.createNestedObject("data");
156-
bool dataToSend = false;
157-
ThingItem *item = device->firstProperty;
158-
while (item != nullptr) {
159-
ThingDataValue *value = item->changedValueOrNull();
160-
if (value) {
161-
dataToSend = true;
162-
item->serializeValue(prop);
163-
}
164-
item = item->next;
165-
}
166-
if (dataToSend) {
167-
String jsonStr;
168-
serializeJson(message, jsonStr);
169-
// Inform all connected ws clients of a Thing about changed properties
170-
((AsyncWebSocket *)device->ws)->textAll(jsonStr);
171-
}
172-
}
173-
#endif
174-
175150
void update() {
176151
#ifdef ESP8266
177152
MDNS.update();
@@ -310,11 +285,9 @@ class WebThingAdapter {
310285

311286
ThingActionObject *obj = device->requestAction(actionRequest);
312287
if (obj != nullptr) {
313-
#ifndef WITHOUT_WS
314288
obj->setNotifyFunction(std::bind(&ThingDevice::sendActionStatus,
315289
device, std::placeholders::_1));
316290
device->sendActionStatus(obj);
317-
#endif
318291

319292
obj->start();
320293
}
@@ -328,6 +301,29 @@ class WebThingAdapter {
328301
}
329302
}
330303
}
304+
305+
void sendChangedProperties(ThingDevice *device) {
306+
// Prepare one buffer per device
307+
DynamicJsonDocument message(LARGE_JSON_DOCUMENT_SIZE);
308+
message["messageType"] = "propertyStatus";
309+
JsonObject prop = message.createNestedObject("data");
310+
bool dataToSend = false;
311+
ThingItem *item = device->firstProperty;
312+
while (item != nullptr) {
313+
ThingDataValue *value = item->changedValueOrNull();
314+
if (value) {
315+
dataToSend = true;
316+
item->serializeValue(prop);
317+
}
318+
item = item->next;
319+
}
320+
if (dataToSend) {
321+
String jsonStr;
322+
serializeJson(message, jsonStr);
323+
// Inform all connected ws clients of a Thing about changed properties
324+
((AsyncWebSocket *)device->ws)->textAll(jsonStr);
325+
}
326+
}
331327
#endif
332328

333329
void handleUnknown(AsyncWebServerRequest *request) {

0 commit comments

Comments
 (0)