if( 0 == n ) return 0;
- uint8_t dest[n];
- uint8_t * dp = dest;
-
+ std::vector<uint8_t> dest;
{
bool escaped = false;
switch( c ) {
case TFESC:
- *dp++ = FESC;
+ dest.push_back( FESC );
break;
case TFEND:
- *dp++ = FEND;
+ dest.push_back( FEND );
break;
default: // this is an error - ignore and continue
break;
default:
- *dp++ = c;
+ dest.push_back( c );
break;
-
}
}
}
}
- n = 0;
- for( sp = dest; sp != dp; ) {
- *buf++ = *sp++;
- n++;
- }
-
- return n;
+ memcpy( buf, dest.data(), dest.size() );
+ return dest.size();
}
break;
}
+ case FG_WORD:
+ {
+ val = _out_message[i].offset +
+ _out_message[i].prop->getIntValue() * _out_message[i].factor;
+ int16_t wordVal = val;
+ memcpy(&buf[length], &wordVal, sizeof(int16_t));
+ length += sizeof(int16_t);
+ break;
+ }
+
default: // SG_STRING
const char *strdata = _out_message[i].prop->getStringValue();
int32_t strlength = strlen(strdata);
switch (_out_message[i].type) {
case FG_BYTE:
+ case FG_WORD:
case FG_INT:
val = _out_message[i].offset +
_out_message[i].prop->getIntValue() * _out_message[i].factor;
p1 += sizeof(int8_t);
break;
+ case FG_WORD:
+ if (binary_byte_order == BYTE_ORDER_NEEDS_CONVERSION) {
+ tmp32 = sg_bswap_16(*(int16_t *)p1);
+ } else {
+ tmp32 = *(int16_t *)p1;
+ }
+ updateValue(_in_message[i], (int)tmp32);
+ p1 += sizeof(int16_t);
+ break;
+
default: // SG_STRING
SG_LOG( SG_IO, SG_ALERT, "Generic protocol: "
"Ignoring unsupported binary input chunk type.");
switch (_in_message[i].type) {
case FG_BYTE:
+ case FG_WORD:
case FG_INT:
updateValue(_in_message[i], atoi(p1));
break;
} else if (type == "byte") {
chunk.type = FG_BYTE;
record_length += sizeof(int8_t);
+ } else if (type == "word") {
+ chunk.type = FG_WORD;
+ record_length += sizeof(int16_t);
} else {
chunk.type = FG_INT;
record_length += sizeof(int32_t);