official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

uniform header/data names

This commit is contained in:
Kevin Matz 2021-08-14 09:26:42 -04:00
parent 13cba79652
commit d883f061a4
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sacn/data.cpp
View File

@ -31,7 +31,7 @@ namespace DATA {
* @brief frame_header::streamSize
* @return
*/
size_t frame_header::streamSize() const
size_t data_header::streamSize() const
{
return sizeof(source_name)
+ sizeof(priority)
@ -46,7 +46,7 @@ size_t frame_header::streamSize() const
* @brief frame_header::iStream
* @param stream
*/
void frame_header::iStream(PDU::Stream stream)
void data_header::iStream(PDU::Stream stream)
{
stream->read(source_name, sizeof(source_name));
if (stream->gcount() != sizeof(source_name))
@ -63,7 +63,7 @@ void frame_header::iStream(PDU::Stream stream)
* @brief frame_header::asStream
* @return
*/
void frame_header::oStream(PDU::Stream stream) const
void data_header::oStream(PDU::Stream stream) const
{
stream->write(source_name, 64);
*stream << priority;
@ -96,7 +96,7 @@ void Pdu::iStream(PDU::Stream stream)
if (flags_.hasHeader)
{
header_ = new frame_header();
header_ = new data_header();
header_->iStream(stream_);
}
}

2
sacn/data.h
View File

@ -34,7 +34,7 @@ using std::uint16_t;
/**
* @brief Table 6-1: E1.31 Data Packet Framing Layer
*/
struct frame_header : PDU::pdu_header {
struct data_header : PDU::pdu_header {
uint8_t source_name[64];
uint8_t priority;
uint16_t sync_address;

26
sacn/extended.cpp
View File

@ -32,7 +32,7 @@ namespace EXTENDED {
* @brief frame_sync_header::streamSize
* @return
*/
size_t frame_sync_header::streamSize() const
size_t sync_header::streamSize() const
{
return sizeof(sequence_number)
+ sizeof(sync_address)
@ -44,7 +44,7 @@ size_t frame_sync_header::streamSize() const
* @brief frame_sync_header::iStream
* @param stream
*/
void frame_sync_header::iStream(PDU::Stream stream)
void sync_header::iStream(PDU::Stream stream)
{
*stream >> sequence_number;
*stream >> sync_address;
@ -55,20 +55,20 @@ void frame_sync_header::iStream(PDU::Stream stream)
/**
* @brief frame_sync_header::oStream
* @brief sync_header::oStream
* @return
*/
void frame_sync_header::oStream(__attribute__((unused)) PDU::Stream stream) const
void sync_header::oStream(__attribute__((unused)) PDU::Stream stream) const
{
/// TODO: write header to stream
}
/**
* @brief frame_discovery_header::streamSize
* @brief discovery_header::streamSize
* @return
*/
size_t frame_discovery_header::streamSize() const
size_t discovery_header::streamSize() const
{
return sizeof(source_name)
+ sizeof(reserved);
@ -76,10 +76,10 @@ size_t frame_discovery_header::streamSize() const
/**
* @brief frame_discovery_header::iStream
* @brief discovery_header::iStream
* @param stream
*/
void frame_discovery_header::iStream(PDU::Stream stream)
void discovery_header::iStream(PDU::Stream stream)
{
stream->read(source_name, sizeof(source_name));
if (stream->gcount() != sizeof(source_name))
@ -91,10 +91,10 @@ void frame_discovery_header::iStream(PDU::Stream stream)
/**
* @brief frame_discovery_header::oStream
* @brief discovery_header::oStream
* @return
*/
void frame_discovery_header::oStream(__attribute__((unused)) PDU::Stream stream) const
void discovery_header::oStream(__attribute__((unused)) PDU::Stream stream) const
{
/// TODO: write header to stream
}
@ -116,16 +116,16 @@ void Pdu::iStream(PDU::Stream stream)
if (!stream_->good()) return;
if (flags_.hasHeader)
switch(vector()) {
switch(vector_) {
case VECTOR_E131_EXTENDED_SYNCHRONIZATION:
{
header_ = new frame_sync_header();
header_ = new sync_header();
header_->iStream(stream_);
}
break;
case VECTOR_E131_EXTENDED_DISCOVERY:
{
header_ = new frame_discovery_header();
header_ = new discovery_header();
header_->iStream(stream_);
}
break;

4
sacn/extended.h
View File

@ -34,7 +34,7 @@ namespace EXTENDED {
/**
* @brief 6.3 E1.31 Synchronization Packet Framing Layer
*/
struct frame_sync_header : PDU::pdu_header {
struct sync_header : PDU::pdu_header {
uint8_t sequence_number;
uint16_t sync_address;
uint8_t reserved[2];
@ -47,7 +47,7 @@ struct frame_sync_header : PDU::pdu_header {
/**
* @brief 6.4 E1.31 Universe Discovery Packet Framing Layer
*/
struct frame_discovery_header : PDU::pdu_header {
struct discovery_header : PDU::pdu_header {
uint8_t source_name[64];
uint8_t reserved[4];
size_t streamSize() const override;