fly/flightgear
1
0
Fork 0
Code Activity

Fix some bugs

Browse source
This commit is contained in:
ehofman 2004-10-15 12:23:36 +00:00
parent ca31288e64
commit 359fb0d3b7
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Network/generic.cxx
View file

@ -57,15 +57,18 @@ FGGeneric::FGGeneric(string& config) {
return; return;
} }
_out_message.clear();
SGPropertyNode *output = root.getNode("generic/output"); SGPropertyNode *output = root.getNode("generic/output");
read_config(output, _out_message); read_config(output, _out_message);
_in_message.clear();
SGPropertyNode *input = root.getNode("generic/input"); SGPropertyNode *input = root.getNode("generic/input");
read_config(input, _in_message); read_config(input, _in_message);
} }
FGGeneric::~FGGeneric() { FGGeneric::~FGGeneric() {
_out_message.clear(); _out_message.clear();
_in_message.clear();
} }
@ -85,7 +88,7 @@ bool FGGeneric::gen_message() {
switch (_out_message[i].type) { switch (_out_message[i].type) {
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->getIntValue() * _out_message[i].factor;
snprintf(tmp, 255, _out_message[i].format.c_str(), (int)val); snprintf(tmp, 255, _out_message[i].format.c_str(), (int)val);
break; break;
@ -96,13 +99,13 @@ bool FGGeneric::gen_message() {
case FG_DOUBLE: case FG_DOUBLE:
val = _out_message[i].offset + val = _out_message[i].offset +
_out_message[i].prop->getDoubleValue() * _out_message[i].factor; _out_message[i].prop->getFloatValue() * _out_message[i].factor;
snprintf(tmp, 255, _out_message[i].format.c_str(), val); snprintf(tmp, 255, _out_message[i].format.c_str(), (float)val);
break; break;
default: // SG_STRING default: // SG_STRING
snprintf(tmp, 255, _out_message[i].format.c_str(), snprintf(tmp, 255, _out_message[i].format.c_str(),
_out_message[i].prop->getStringValue()); _out_message[i].prop->getStringValue());
} }
generic_sentence += tmp; generic_sentence += tmp;
@ -131,23 +134,23 @@ bool FGGeneric::parse_message() {
if (p2) if (p2)
*(p2++) = 0; *(p2++) = 0;
switch (_out_message[i].type) { switch (_in_message[i].type) {
case FG_INT: case FG_INT:
val = _out_message[i].offset + atoi(p1) * _out_message[i].factor; val = _in_message[i].offset + atoi(p1) * _in_message[i].factor;
_out_message[i].prop->setIntValue(val); _in_message[i].prop->setIntValue((int)val);
break; break;
case FG_BOOL: case FG_BOOL:
_out_message[i].prop->setIntValue( atoi(p1) ); _in_message[i].prop->setBoolValue( atoi(p1) != 0 );
break; break;
case FG_DOUBLE: case FG_DOUBLE:
val = _out_message[i].offset + strtod(p1, 0) * _out_message[i].factor; val = _in_message[i].offset + strtod(p1, 0) * _in_message[i].factor;
_out_message[i].prop->setIntValue(val); _in_message[i].prop->setFloatValue((float)val);
break; break;
default: // SG_STRING default: // SG_STRING
_out_message[i].prop->setStringValue(p1); _in_message[i].prop->setStringValue(p1);
} }
p1 = p2; p1 = p2;
@ -267,9 +270,9 @@ FGGeneric::read_config(SGPropertyNode *root, vector<_serial_prot> &msg)
_serial_prot chunk; _serial_prot chunk;
// chunk.name = chunks[i]->getStringValue("name"); // chunk.name = chunks[i]->getStringValue("name");
chunk.format = chunks[i]->getStringValue("format", "%f"); chunk.format = chunks[i]->getStringValue("format", "%d");
chunk.offset = chunks[i]->getDoubleValue("offset"); chunk.offset = chunks[i]->getDoubleValue("offset");
chunk.factor = chunks[i]->getDoubleValue("offset", 1.0); chunk.factor = chunks[i]->getDoubleValue("factor", 1.0);
string node = chunks[i]->getStringValue("node"); string node = chunks[i]->getStringValue("node");
chunk.prop = fgGetNode(node.c_str(), true); chunk.prop = fgGetNode(node.c_str(), true);