-
Notifications
You must be signed in to change notification settings - Fork 131
feat: SmartButton #405
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
feat: SmartButton #405
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d9e038d
feat: SmartButton
kakopappa 4c48333
feat: SmartButton
kakopappa baa541b
feat: refactor to use a single callback
kakopappa 330fbd5
feat: refactor to use onButtonPress
kakopappa 49bfa01
feat: smart button
kakopappa 0592d3e
fix: comments
kakopappa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
name=SinricPro | ||
version=3.2.1 | ||
version=3.3.1 | ||
author=Boris Jaeger <[email protected]> | ||
maintainer=Boris Jaeger <[email protected]> | ||
sentence=Library for https://sinric.pro - simple way to connect your device to alexa | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
#pragma once | ||
|
||
#include "../SinricProRequest.h" | ||
#include "../EventLimiter.h" | ||
#include "../SinricProStrings.h" | ||
#include "../SinricProNamespace.h" | ||
|
||
/** | ||
* @brief Enum defining the different types of button press events | ||
*/ | ||
enum class SmartButtonPressType { | ||
SINGLE_PRESS, | ||
DOUBLE_PRESS, | ||
LONG_PRESS | ||
}; | ||
|
||
namespace SINRICPRO_NAMESPACE { | ||
|
||
FSTR(BUTTONSTATE, state); // Button state key | ||
FSTR(BUTTONSTATE, singlePress); // Single press state value | ||
FSTR(BUTTONSTATE, doublePress); // Double press state value | ||
FSTR(BUTTONSTATE, longPress); // Long press state value | ||
FSTR(BUTTONSTATE, setSmartButtonState); // Set state action name | ||
|
||
// Callback type definition for button press events | ||
using SmartButtonPressCallback = std::function<bool(const String&, SmartButtonPressType)>; | ||
|
||
/** | ||
* @brief Controller class for managing smart button state and interactions | ||
* | ||
* @tparam T The device type that this controller is attached to | ||
*/ | ||
template <typename T> | ||
class SmartButtonStateController { | ||
public: | ||
/** | ||
* @brief Construct a new Smart Button State Controller | ||
* Automatically registers the request handler with the device | ||
*/ | ||
SmartButtonStateController(); | ||
|
||
/** | ||
* @brief Register callback for button press events from the app | ||
* @param cb Callback function to handle button press events | ||
*/ | ||
void onButtonPress(SmartButtonPressCallback cb); | ||
|
||
protected: | ||
/** | ||
* @brief Handle incoming button state change requests | ||
* @param request The incoming request to process | ||
* @return true if request was handled successfully, false otherwise | ||
*/ | ||
bool handleSmartButtonStateController(SinricProRequest &request); | ||
|
||
private: | ||
SmartButtonPressCallback buttonPressCallback; | ||
|
||
/** | ||
* @brief Convert string state to SmartButtonPressType enum | ||
* @param stateStr The state string from the request | ||
* @return corresponding SmartButtonPressType enum value | ||
*/ | ||
SmartButtonPressType getSmartButtonPressType(const String& stateStr); | ||
}; | ||
|
||
template <typename T> | ||
SmartButtonStateController<T>::SmartButtonStateController() { | ||
T* device = static_cast<T*>(this); | ||
device->registerRequestHandler( | ||
std::bind(&SmartButtonStateController<T>::handleSmartButtonStateController, | ||
this, | ||
std::placeholders::_1) | ||
); | ||
} | ||
|
||
template <typename T> | ||
void SmartButtonStateController<T>::onButtonPress(SmartButtonPressCallback cb) { | ||
buttonPressCallback = cb; | ||
} | ||
|
||
template <typename T> | ||
SmartButtonPressType SmartButtonStateController<T>::getSmartButtonPressType(const String& stateStr) { | ||
if (stateStr == FSTR_BUTTONSTATE_singlePress) { | ||
return SmartButtonPressType::SINGLE_PRESS; | ||
} else if (stateStr == FSTR_BUTTONSTATE_doublePress) { | ||
return SmartButtonPressType::DOUBLE_PRESS; | ||
} else { | ||
return SmartButtonPressType::LONG_PRESS; | ||
} | ||
} | ||
|
||
template <typename T> | ||
bool SmartButtonStateController<T>::handleSmartButtonStateController(SinricProRequest &request) { | ||
// Only process setSmartButtonState actions | ||
if (request.action != FSTR_BUTTONSTATE_setSmartButtonState || !buttonPressCallback) { | ||
return false; | ||
} | ||
|
||
T* device = static_cast<T*>(this); | ||
String stateStr = request.request_value[FSTR_BUTTONSTATE_state]; | ||
|
||
// Only process valid button states | ||
if (stateStr != FSTR_BUTTONSTATE_singlePress && | ||
stateStr != FSTR_BUTTONSTATE_doublePress && | ||
stateStr != FSTR_BUTTONSTATE_longPress) { | ||
return false; | ||
} | ||
|
||
SmartButtonPressType pressType = getSmartButtonPressType(stateStr); | ||
return buttonPressCallback(device->deviceId, pressType); | ||
} | ||
|
||
} // namespace SINRICPRO_NAMESPACE | ||
|
||
template <typename T> | ||
using SmartButtonStateController = SINRICPRO_NAMESPACE::SmartButtonStateController<T>; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.