Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 47db29b

Browse files
committedMar 6, 2023
Revert "Implemented std::function"
This reverts commit 8260346.
1 parent c8a8e0c commit 47db29b

File tree

5 files changed

+10
-21
lines changed

5 files changed

+10
-21
lines changed
 

‎changelog.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# Changelog
2-
## Version 2.10.4
3-
- Implemented std::function for RangeController to allow lambda functions
4-
52
## Version 2.10.3
63
- Fixed version number for PlatformIO library registry
74

‎library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"maintainer": true
1414
}
1515
],
16-
"version": "2.10.4",
16+
"version": "2.10.3",
1717
"frameworks": "arduino",
1818
"platforms": [
1919
"espressif8266",

‎library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=SinricPro
2-
version=2.10.4
2+
version=2.10.3
33
author=Boris Jaeger <sivar2311@gmail.com>
44
maintainer=Boris Jaeger <sivar2311@gmail.com>
55
sentence=Library for https://sinric.pro - simple way to connect your device to alexa

‎src/Capabilities/RangeController.h

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,25 @@ FSTR(RANGE, rangeValueDelta); // "rangeValueDelta"
2727
* @snippet callbacks.cpp onRangeValue
2828
**/
2929

30-
using GenericRangeValueCallback_int = std::function<bool(const String &, const String &, int &)>;
31-
using GenericRangeValueCallback_float = std::function<bool(const String &, const String &, float &)>;
30+
using GenericRangeValueCallback_int = bool (*)(const String &, const String &, int &);
31+
using GenericRangeValueCallback_float = bool (*)(const String &, const String &, float &);
3232

3333
struct GenericRangeValueCallback {
3434
GenericRangeValueCallback() : type(type_unknown) {}
35-
GenericRangeValueCallback(GenericRangeValueCallback_int cb) : type(type_int), callback(cb) {}
36-
GenericRangeValueCallback(GenericRangeValueCallback_float cb) : type(type_float), callback(cb) {}
37-
~GenericRangeValueCallback() {};
38-
GenericRangeValueCallback& operator=(const GenericRangeValueCallback& other) { this->callback = other.callback; this->type = other.type; return *this; };
35+
GenericRangeValueCallback(GenericRangeValueCallback_int cb) : type(type_int), cb_int(cb) {}
36+
GenericRangeValueCallback(GenericRangeValueCallback_float cb) : type(type_float), cb_float(cb) {}
3937
enum {
4038
type_unknown,
4139
type_int,
4240
type_float
4341
} type;
44-
union Callback {
45-
Callback() {};
46-
Callback(const GenericRangeValueCallback_int& cb) : cb_int(cb) {};
47-
Callback(const GenericRangeValueCallback_float& cb) : cb_float(cb) {};
48-
Callback& operator=(const Callback& other) { cb_int = other.cb_int; return *this; }
49-
~Callback(){};
50-
42+
union {
5143
GenericRangeValueCallback_int cb_int;
5244
GenericRangeValueCallback_float cb_float;
53-
} callback;
45+
};
5446
};
5547

56-
using SetRangeValueCallback = std::function<bool(const String &, int &)>;
48+
using SetRangeValueCallback = bool (*)(const String &, int &);
5749

5850
/**
5951
* @brief Callback definition for onRangeValue function on a specific instance

‎src/SinricProVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Version Configuration
77
#define SINRICPRO_VERSION_MAJOR 2
88
#define SINRICPRO_VERSION_MINOR 10
9-
#define SINRICPRO_VERSION_REVISION 4
9+
#define SINRICPRO_VERSION_REVISION 3
1010
#define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
1111
#define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
1212
#define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION

0 commit comments

Comments
 (0)
Please sign in to comment.