Added support for RSL devices sold by Conrad as Switch Type E#39
Open
glaukos wants to merge 8 commits intosui77:masterfrom
Open
Added support for RSL devices sold by Conrad as Switch Type E#39glaukos wants to merge 8 commits intosui77:masterfrom
glaukos wants to merge 8 commits intosui77:masterfrom
Conversation
| * @param sGroup Number of the switch group (1..4) | ||
| * @param nDevice Number of the switch itself (1..4) | ||
| */ | ||
| void RCSwitch::switchOffRSL(int sGroup, int nDevice) { |
Collaborator
There was a problem hiding this comment.
Could you please use two spaces for indention, instead of tabs? To match the surrounding code... :-)
Author
There was a problem hiding this comment.
Sure, will replace tabs. Although the surrounding code is already a mixture of two and four spaces intendations.
| } | ||
|
|
||
| /** | ||
| <<<<<<< HEAD |
Collaborator
There was a problem hiding this comment.
This looks like you had a merge or rebase conflict and did not resolve it completely?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes according to http://www.mikrocontroller.net/topic/252895 and https://forum.pilight.org/Thread-Fully-Supported-Conrad-RSL-Switch
I could verify to some degree with my personal blind shuttter switch.