Skip to content
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

Fix compilation errors on RPi #594

Merged
merged 1 commit into from Oct 1, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+2 −2
Diff settings

Always

Just for now

Fix compilation errors on RPi

  • Loading branch information...
marceloaqno committed Oct 1, 2016
commit 5b552d9e3eab369e98c9cfcd0bd3a29ae649c800
Copy path View file
@@ -532,7 +532,7 @@ void transportProcessMessage(void) {
setIndication(INDICATION_RX);
const uint8_t payloadLength = transportReceive((uint8_t *)&_msg);
// get message length and limit size
const uint8_t msgLength = min(mGetLength(_msg), MAX_PAYLOAD);
const uint8_t msgLength = min(mGetLength(_msg), (uint8_t)MAX_PAYLOAD);
// calculate expected length
const uint8_t expectedMessageLength = HEADER_SIZE + (mGetSigned(_msg) ? MAX_PAYLOAD : msgLength);
const uint8_t command = mGetCommand(_msg);
@@ -823,7 +823,7 @@ bool transportSendWrite(const uint8_t to, MyMessage &message) {

// send
setIndication(INDICATION_TX);
bool result = transportSend(to, &message, min(MAX_MESSAGE_LENGTH, totalMsgLength));
bool result = transportSend(to, &message, min((uint8_t)MAX_MESSAGE_LENGTH, totalMsgLength));
// broadcasting (workaround counterfeits)
result |= (to == BROADCAST_ADDRESS);

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.