Update pi4j and address api changes #329
Open
Conversation
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
cal-pratt
suggested changes
Jun 21, 2017
| @@ -156,9 +162,12 @@ private short getPosition() { | |||
| lock.lock(); | |||
| try { | |||
| serial.write(new byte[] {START_BYTE, maestro, COMMAND_GET_POSITION, channel}); | |||
| final ByteBuffer response = ByteBuffer.allocate(4).putChar(serial.read()).putChar(serial.read()); | |||
| final ByteBuffer response = ByteBuffer.allocate(4).put(serial.read(), 0, 4); | |||
There was a problem hiding this comment.
This looks like different logic. You only have one serial read.
putChar also writes two bytes into the buffer.
This seems weird in the first place. We could maybe jut write:
return ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN).put(
new byte[]{serial.read(), serial.read()}).getShort(0);
| try { | ||
| serial.write(new byte[] {START_BYTE, maestro, COMMAND_GET_ERRORS}); | ||
| final ByteBuffer response = ByteBuffer.allocate(2).put(serial.read(), 0, 2); | ||
| return BitSet.valueOf(new byte[]{response.get(1), response.get(0)}); |
ConnorWhalen
force-pushed
the
update-pi4j
branch
from
e5a823e to
535b443
Compare
|
On second thought, the byte reads don't even matter because we don't use the voltage or current sensor |
cal-pratt
approved these changes
Jun 22, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We have to update pi4j to fix #328. Doing so has broken some of our code, mostly catching new exceptions when using serial.
@cal-pratt check the changes to MaestroChannel closely because I might have screwed up your byte management. serial.read() returns a byte array instead of a char now.