Merge pull request #311 from sivar2311/master

Implemented std::function

Author: sivar2311

changelog.md

@@ -1,4 +1,7 @@
 # Changelog
+## Version 2.10.4
+- Implemented std::function for RangeController to allow lambda functions
+
 ## Version 2.10.3
 - Fixed version number for PlatformIO library registry
 

library.json

@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.10.3",
+  "version": "2.10.4",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",

library.properties

@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.10.3
+version=2.10.4
 author=Boris Jaeger <sivar2311@gmail.com>
 maintainer=Boris Jaeger <sivar2311@gmail.com>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa

src/Capabilities/RangeController.h

@@ -27,25 +27,33 @@ FSTR(RANGE, rangeValueDelta);     // "rangeValueDelta"
  * @snippet callbacks.cpp onRangeValue
  **/
 
-using GenericRangeValueCallback_int   = bool (*)(const String &, const String &, int &);
-using GenericRangeValueCallback_float = bool (*)(const String &, const String &, float &);
+using GenericRangeValueCallback_int   = std::function<bool(const String &, const String &, int &)>;
+using GenericRangeValueCallback_float = std::function<bool(const String &, const String &, float &)>;
 
 struct GenericRangeValueCallback {
   GenericRangeValueCallback() : type(type_unknown) {}
-  GenericRangeValueCallback(GenericRangeValueCallback_int cb)   : type(type_int), cb_int(cb) {}
-  GenericRangeValueCallback(GenericRangeValueCallback_float cb) : type(type_float), cb_float(cb) {}
+  GenericRangeValueCallback(GenericRangeValueCallback_int cb)   : type(type_int), callback(cb) {}
+  GenericRangeValueCallback(GenericRangeValueCallback_float cb) : type(type_float), callback(cb) {}
+  ~GenericRangeValueCallback() {};
+  GenericRangeValueCallback& operator=(const GenericRangeValueCallback& other) { this->callback = other.callback; this->type = other.type; return *this; };
   enum {
     type_unknown,
     type_int,
     type_float
   } type;
-  union {
+  union Callback {
+    Callback() {};
+    Callback(const GenericRangeValueCallback_int& cb) : cb_int(cb) {};
+    Callback(const GenericRangeValueCallback_float& cb) : cb_float(cb) {};
+    Callback& operator=(const Callback& other) { cb_int = other.cb_int; return *this; }
+    ~Callback(){};
+
     GenericRangeValueCallback_int   cb_int;
     GenericRangeValueCallback_float cb_float;
-  };
+  } callback;
 };
 
-using SetRangeValueCallback = bool (*)(const String &, int &);
+using SetRangeValueCallback = std::function<bool(const String &, int &)>;
 
 /**
  * @brief Callback definition for onRangeValue function on a specific instance
@@ -272,14 +280,14 @@ bool RangeController<T>::handleRangeController(SinricProRequest &request) {
 
       if (cb.type == GenericRangeValueCallback::type_float) {
         float value = request.request_value[FSTR_RANGE_rangeValue];
-        success = cb.cb_float(device->deviceId, request.instance, value);
+        success = cb.callback.cb_float(device->deviceId, request.instance, value);
         request.response_value[FSTR_RANGE_rangeValue] = value;
         return success;
       }
 
       if (cb.type == GenericRangeValueCallback::type_int) {
         int value = request.request_value[FSTR_RANGE_rangeValue];
-        success = cb.cb_int(device->deviceId, request.instance, value);
+        success = cb.callback.cb_int(device->deviceId, request.instance, value);
         request.response_value[FSTR_RANGE_rangeValue] = value;
         return success;
       }
@@ -303,14 +311,14 @@ bool RangeController<T>::handleRangeController(SinricProRequest &request) {
 
       if (cb.type == GenericRangeValueCallback::type_float) {
         float value = request.request_value[FSTR_RANGE_rangeValueDelta];
-        success = cb.cb_float(device->deviceId, request.instance, value);
+        success = cb.callback.cb_float(device->deviceId, request.instance, value);
         request.response_value[FSTR_RANGE_rangeValue] = value;
         return success;
       }
 
       if (cb.type == GenericRangeValueCallback::type_int) {
         int value = request.request_value[FSTR_RANGE_rangeValueDelta];
-        success = cb.cb_int(device->deviceId, request.instance, value);
+        success = cb.callback.cb_int(device->deviceId, request.instance, value);
         request.response_value[FSTR_RANGE_rangeValue] = value;
         return success;
       }

src/SinricProVersion.h

@@ -6,7 +6,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     2
 #define SINRICPRO_VERSION_MINOR     10
-#define SINRICPRO_VERSION_REVISION  3
+#define SINRICPRO_VERSION_REVISION  4
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
 #define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION