fly/flightgear
1
0
Fork 0
Code Activity

Generic protocol fix for integer-factors.

Browse source 
Read all values as floating point before applying a factor, then
convert to the target type (int, byte or short). Suggested and
implemented by Oliver Kroth.
This commit is contained in:
James Turner 2017-03-16 15:54:38 +00:00
parent 06c6e994a5
commit 29fe9316af
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Network/generic.cxx
View file

@ -277,7 +277,7 @@ bool FGGeneric::gen_message_binary() {
case FG_INT: case FG_INT:
{ {
val = _out_message[i].offset + val = _out_message[i].offset +
_out_message[i].prop->getIntValue() * _out_message[i].factor; _out_message[i].prop->getFloatValue() * _out_message[i].factor;
int32_t intVal = val; int32_t intVal = val;
if (binary_byte_order != BYTE_ORDER_MATCHES_NETWORK_ORDER) { if (binary_byte_order != BYTE_ORDER_MATCHES_NETWORK_ORDER) {
intVal = (int32_t) sg_bswap_32((uint32_t)intVal); intVal = (int32_t) sg_bswap_32((uint32_t)intVal);
@ -339,7 +339,7 @@ bool FGGeneric::gen_message_binary() {
case FG_BYTE: case FG_BYTE:
{ {
val = _out_message[i].offset + val = _out_message[i].offset +
_out_message[i].prop->getIntValue() * _out_message[i].factor; _out_message[i].prop->getFloatValue() * _out_message[i].factor;
int8_t byteVal = val; int8_t byteVal = val;
memcpy(&buf[length], &byteVal, sizeof(int8_t)); memcpy(&buf[length], &byteVal, sizeof(int8_t));
length += sizeof(int8_t); length += sizeof(int8_t);
@ -349,7 +349,7 @@ bool FGGeneric::gen_message_binary() {
case FG_WORD: case FG_WORD:
{ {
val = _out_message[i].offset + val = _out_message[i].offset +
_out_message[i].prop->getIntValue() * _out_message[i].factor; _out_message[i].prop->getFloatValue() * _out_message[i].factor;
int16_t wordVal = val; int16_t wordVal = val;
memcpy(&buf[length], &wordVal, sizeof(int16_t)); memcpy(&buf[length], &wordVal, sizeof(int16_t));
length += sizeof(int16_t); length += sizeof(int16_t);
@ -426,7 +426,7 @@ bool FGGeneric::gen_message_ascii() {
case FG_WORD: case FG_WORD:
case FG_INT: case FG_INT:
val = _out_message[i].offset + val = _out_message[i].offset +
_out_message[i].prop->getIntValue() * _out_message[i].factor; _out_message[i].prop->getFloatValue() * _out_message[i].factor;
snprintf(tmp, 255, format.c_str(), (int)val); snprintf(tmp, 255, format.c_str(), (int)val);
break; break;