andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-09 18:19:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace std:function with lambda

Browse Source
This commit is contained in:
proddy
2026-05-16 16:17:10 +02:00
parent 824c036f9a
commit 2f85b367b0
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/emsdevice.cpp
View File

@@ -2252,7 +2252,7 @@ bool EMSdevice::handle_telegram(const std::shared_ptr<const Telegram> & telegram
if (tf.telegram_type_id_ == telegram->type_id) {
// for telegram destination only read telegram
if (telegram->dest == device_id_ && telegram->message_length > 0) {
tf.process_function_(telegram);
tf.process_function_(this, telegram);
return true;
}
// if the data block is empty and we have not received data before, assume that this telegram
@@ -2270,7 +2270,7 @@ bool EMSdevice::handle_telegram(const std::shared_ptr<const Telegram> & telegram
}
if (telegram->message_length > 0) {
tf.received_ = true;
tf.process_function_(telegram);
tf.process_function_(this, telegram);
}
return true;

10
src/core/emsdevice.h
View File

@@ -34,7 +34,15 @@ class EMSdevice {
public:
virtual ~EMSdevice() = default; // destructor of base class must always be virtual because it's a polymorphic class
using process_function_p = std::function<void(const std::shared_ptr<const Telegram> &)>;
// Raw function pointer + EMSdevice* context, instead of std::function.
// Each std::function<void(...)> typically heap-allocates its capture (a few
// bytes for the [&] closure) on libstdc++ ESP32 builds. With hundreds of
// registered telegram handlers across devices, that's tens of KB of
// long-lived heap. The MAKE_PF_CB macro produces a non-capturing trampoline
// that decays to this raw pointer (zero heap, zero indirection beyond the
// call itself). The first parameter receives `this` of the dispatching
// EMSdevice instance; the trampoline downcasts to the actual derived type.
using process_function_p = void (*)(EMSdevice * dev, const std::shared_ptr<const Telegram> & t);
// device_type defines which derived class to use, e.g. BOILER, THERMOSTAT etc..
EMSdevice(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * default_name, uint8_t flags, uint8_t brand)