official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

differentiate between firmware version and protocol version

This commit is contained in:
Kevin Matz 2023-05-21 14:17:35 -04:00
parent 4b71f666e2
commit 2b8be50db8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/artistic/artnet/packet.cpp
View File

@ -81,8 +81,8 @@ void pollreply_data::iStream(std::shared_ptr<bufferstream> stream)
{ // Field #
*stream >> my_ip; // 3
*stream >> udp_port; // 4
version = stream->get() << 8 | // 5
stream->get(); // 6
fw_version = stream->get() << 8 | // 5
stream->get(); // 6
net_sub_switch.value = stream->get() << 8 | // 7
stream->get() << 4; // 8
oem.value = stream->get() << 8 | // 9
@ -129,8 +129,8 @@ void pollreply_data::oStream(std::shared_ptr<bufferstream> stream) const
{ // Field #
*stream << my_ip; // 3
*stream << udp_port; // 4
stream->put(version >> 8); // 5
stream->put(version & 0xff); // 6
stream->put(fw_version >> 8); // 5
stream->put(fw_version & 0xff); // 6
stream->put(net_sub_switch.value >> 8); // 7
stream->put(net_sub_switch.value >> 4 & 0x0f); // 8
stream->put(oem.value >> 8); // 9

1
protocol/artistic/artnet/packet.h
View File

@ -83,6 +83,7 @@ struct pollreply_data
uint32_t my_ip = 0; //!< the Node’s IPv4 address
uint16_t udp_port; //!< The Port is always 0x1936
uint16_t fw_version; //!< Node's Firemware revision number
PortAddress net_sub_switch; //!< Net and Subnet switch positions
OEM oem; //!< the equipment vendor and the feature set
uint8_t ubea_version = 0; //!< the firmware version of the User Bios Extension Area (UBEA)