aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-12-18 11:55:32 +0100
committerJakob Odersky <jodersky@gmail.com>2014-12-18 11:55:32 +0100
commit5f16695c3b1c13840d0c4dc6a1dfb4adbee4e836 (patch)
treee0499ad0f6a49295419fcf5241e5fec6d5406ef6 /project
parent658807f9df853e1349c6c4d3958666cee86dc89f (diff)
downloadmavigator-5f16695c3b1c13840d0c4dc6a1dfb4adbee4e836.tar.gz
mavigator-5f16695c3b1c13840d0c4dc6a1dfb4adbee4e836.tar.bz2
mavigator-5f16695c3b1c13840d0c4dc6a1dfb4adbee4e836.zip
fix issue with unsigned bytes
Diffstat (limited to 'project')
-rw-r--r--project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt
index 1507df4..4bba2a1 100644
--- a/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt
+++ b/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt
@@ -3,9 +3,9 @@
@extract(field: parsing.Field, offset: Int) = {
@field.tpe.width match {
case 1 => {payload(@offset)}
- case 2 => {((payload(@offset)) | ((payload(@{offset+1}) & 0xff) << 8)).toShort}
- case 4 => {(payload(@offset)) | ((payload(@{offset+1}) & 0xff) << 8) | ((payload(@{offset+2}) & 0xff) << 16) | ((payload(@{offset+3}) & 0xff) << 24)}
- case 8 => {payload(@offset) |
+ case 2 => {((payload(@offset) & 0xff) | ((payload(@{offset+1}) & 0xff) << 8)).toShort}
+ case 4 => {(payload(@offset) & 0xff) | ((payload(@{offset+1}) & 0xff) << 8) | ((payload(@{offset+2}) & 0xff) << 16) | ((payload(@{offset+3}) & 0xff) << 24)}
+ case 8 => {(payload(@offset) & 0xffl) |
((payload(@{offset+2}) & 0xffl) << 8) |
((payload(@{offset+3}) & 0xffl) << 16) |
((payload(@{offset+4}) & 0xffl) << 24) |