This repository has been archived by the owner on May 17, 2021. It is now read-only.
[satel] Support for troubles added #5162
Merged
Conversation
This file contains 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
9037568
suggested changes
Apr 17, 2017
| if (!isPayloadLengthValid(response.getPayload().length)) { | ||
| logger.error("Invalid payload length for this object type {}: {}", this.stateType.getObjectType(), | ||
| if (response.getPayload().length != this.stateType.getPayloadLength(isExtended())) { | ||
| logger.error("Invalid payload length for this state type {}: {}", this.stateType, |
There was a problem hiding this comment.
This should be a warn instead of an error.
There was a problem hiding this comment.
The level hasn't changed in this PR, it was always an error. But I can change it, if you wish.
| stateType = iterator.nextOfType(TroubleState.class, "trouble state type"); | ||
| break; | ||
| case TROUBLE_MEMORY: | ||
| stateType = iterator.nextOfType(TroubleMemoryState.class, "trouble mamory state type"); |
There was a problem hiding this comment.
Shouldn't this be "memory" instead of "mamory" ?
| @@ -0,0 +1,119 @@ | |||
| /** | |||
| * Copyright (c) 2010-2016 by the respective copyright holders. | |||
| JAMMED_ACU100(0x21, 39, 24, 2), | ||
| LCD_RESTART(0x21, 39, 26, 1), | ||
| EXPANDER_RESTART(0x21, 39, 27, 8), | ||
| // GSM_CODE(0x21, 39, 35, 2), not an on/off state |
There was a problem hiding this comment.
Remove unused/commented code.
| @@ -0,0 +1,113 @@ | |||
| /** | |||
| * Copyright (c) 2010-2016 by the respective copyright holders. | |||
| EXPANDER_OVERLOAD(0x1c, 26, 16, 8), | ||
| JAMMED_ACU100(0x1c, 26, 24, 2), | ||
| // part 3 | ||
| // JAM_LEVEL(0x1d, 60, 0, 15), not an on/off state |
There was a problem hiding this comment.
Remove unused/commented code.
|
Hey, I made changes for all requests except for the first one, for which I added a comment. |
|
Cool, thanks! |
9037568
approved these changes
Apr 18, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR introduces support for detailed Integra troubles. It allows defining items that reflect various troubles in Integra alarm system.