Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix update message type data.

Browse Source 
The type was being read and written as the raw enum value rather than as
the actual type definition.
This commit is contained in:
Peter Johnson
2015-11-02 22:08:35 -08:00
parent 32a1beb772
commit 4d7ea37d56
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Message.cpp
View File

@@ -77,13 +77,11 @@ std::shared_ptr<Message> Message::Read(WireDecoder& decoder,
if (!decoder.Read16(&msg->m_seq_num_uid)) return nullptr; // seq num
NT_Type type;
if (decoder.proto_rev() >= 0x0300u) {
unsigned int itype;
if (!decoder.Read8(&itype)) return nullptr;
type = static_cast<NT_Type>(itype);
if (!decoder.ReadType(&type)) return nullptr;
} else {
type = get_entry_type(msg->m_id);
DEBUG4("update message data type: " << type);
}
DEBUG4("update message data type: " << type);
msg->m_value = decoder.ReadValue(type);
if (!msg->m_value) return nullptr;
break;
@@ -266,7 +264,7 @@ void Message::Write(WireEncoder& encoder) const {
encoder.Write8(kEntryUpdate);
encoder.Write16(m_id);
encoder.Write16(m_seq_num_uid);
if (encoder.proto_rev() >= 0x0300u) encoder.Write8(m_value->type());
if (encoder.proto_rev() >= 0x0300u) encoder.WriteType(m_value->type());
encoder.WriteValue(*m_value);
break;
case kFlagsUpdate: