capitalize the Range struct
This commit is contained in:
parent
433e91f70c
commit
ce3e1ebf7c
@ -61,13 +61,14 @@ void address_type::oStream(PDU::Stream stream) const
|
|||||||
*stream << byte;
|
*stream << byte;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief range::read_
|
* @brief range::read_
|
||||||
* @param stream
|
* @param stream
|
||||||
* @param length
|
* @param length
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
uint32_t range::read_(PDU::Stream stream)
|
uint32_t Range::read_(PDU::Stream stream)
|
||||||
{
|
{
|
||||||
switch (type_.address_length) {
|
switch (type_.address_length) {
|
||||||
case ONE:
|
case ONE:
|
||||||
@ -87,7 +88,7 @@ uint32_t range::read_(PDU::Stream stream)
|
|||||||
* @param stream
|
* @param stream
|
||||||
* @param val
|
* @param val
|
||||||
*/
|
*/
|
||||||
void range::write_(PDU::Stream stream, const uint32_t& val) const
|
void Range::write_(PDU::Stream stream, const uint32_t& val) const
|
||||||
{
|
{
|
||||||
switch (type_.address_length) {
|
switch (type_.address_length) {
|
||||||
case ONE:
|
case ONE:
|
||||||
@ -105,7 +106,7 @@ void range::write_(PDU::Stream stream, const uint32_t& val) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
size_t range::streamSize() const
|
size_t Range::streamSize() const
|
||||||
{
|
{
|
||||||
auto count = [&] () {
|
auto count = [&] () {
|
||||||
switch (type_.data_type) {
|
switch (type_.data_type) {
|
||||||
@ -134,7 +135,7 @@ size_t range::streamSize() const
|
|||||||
* @brief range::iStream
|
* @brief range::iStream
|
||||||
* @param stream
|
* @param stream
|
||||||
*/
|
*/
|
||||||
void range::iStream(PDU::Stream stream)
|
void Range::iStream(PDU::Stream stream)
|
||||||
{
|
{
|
||||||
address = read_(stream);
|
address = read_(stream);
|
||||||
if (type_.data_type == SINGLE)
|
if (type_.data_type == SINGLE)
|
||||||
@ -148,7 +149,7 @@ void range::iStream(PDU::Stream stream)
|
|||||||
* @brief range::oStream
|
* @brief range::oStream
|
||||||
* @param stream
|
* @param stream
|
||||||
*/
|
*/
|
||||||
void range::oStream(PDU::Stream stream) const
|
void Range::oStream(PDU::Stream stream) const
|
||||||
{
|
{
|
||||||
write_(stream, address);
|
write_(stream, address);
|
||||||
if (type_.data_type == SINGLE)
|
if (type_.data_type == SINGLE)
|
||||||
@ -182,7 +183,7 @@ void address_pair_list::iStream(PDU::Stream stream)
|
|||||||
{
|
{
|
||||||
while(stream->good()) {
|
while(stream->good()) {
|
||||||
// Property Address
|
// Property Address
|
||||||
range pr(type_);
|
Range pr(type_);
|
||||||
pr.iStream(stream);
|
pr.iStream(stream);
|
||||||
|
|
||||||
if (!stream->good() || stream->available() < pr.count * pr.incriment)
|
if (!stream->good() || stream->available() < pr.count * pr.incriment)
|
||||||
@ -237,7 +238,7 @@ void address_list::iStream(PDU::Stream stream)
|
|||||||
while(stream->good())
|
while(stream->good())
|
||||||
{
|
{
|
||||||
// Property Address
|
// Property Address
|
||||||
addresses.emplace_back(range(type_));
|
addresses.emplace_back(Range(type_));
|
||||||
*stream >> addresses.back();
|
*stream >> addresses.back();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,14 +81,14 @@ struct address_type
|
|||||||
* @brief 5.1.5 The range struct
|
* @brief 5.1.5 The range struct
|
||||||
*/
|
*/
|
||||||
/// \todo maybe template this struct based on address_length
|
/// \todo maybe template this struct based on address_length
|
||||||
struct range
|
struct Range
|
||||||
: PDU::pdu_stream_object
|
: PDU::pdu_stream_object
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @brief range
|
* @brief range constructor
|
||||||
* @param t
|
* @param t
|
||||||
*/
|
*/
|
||||||
range(const address_type& t) : type_(t) {};
|
Range(const address_type& t) : type_(t) {};
|
||||||
|
|
||||||
uint32_t address = 0; //!< start address
|
uint32_t address = 0; //!< start address
|
||||||
uint32_t incriment = 0; //!< property size (number of octets)
|
uint32_t incriment = 0; //!< property size (number of octets)
|
||||||
@ -109,7 +109,7 @@ private:
|
|||||||
/**
|
/**
|
||||||
* @brief set_property
|
* @brief set_property
|
||||||
*/
|
*/
|
||||||
typedef std::pair<range, std::vector<uint8_t>> address_data_pair;
|
typedef std::pair<Range, std::vector<uint8_t>> address_data_pair;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -145,7 +145,7 @@ struct address_list
|
|||||||
* @param t
|
* @param t
|
||||||
*/
|
*/
|
||||||
address_list(const address_type& t) : type_(t) {};
|
address_list(const address_type& t) : type_(t) {};
|
||||||
std::vector<range> addresses; //!< list of addresses
|
std::vector<Range> addresses; //!< list of addresses
|
||||||
|
|
||||||
size_t streamSize() const override;
|
size_t streamSize() const override;
|
||||||
void iStream(PDU::Stream) override;
|
void iStream(PDU::Stream) override;
|
||||||
|
@ -271,7 +271,7 @@ void Receiver::dataFrameHandler(ACN::PDU::Message<DATA::Pdu> frame) {
|
|||||||
|
|
||||||
// PDU data will be a block of DMP
|
// PDU data will be a block of DMP
|
||||||
auto block = std::static_pointer_cast<ACN::PDU::Block<ACN::DMP::Pdu>>(frame->data());
|
auto block = std::static_pointer_cast<ACN::PDU::Block<ACN::DMP::Pdu>>(frame->data());
|
||||||
for (auto const &dmp : *block->pdu)
|
for (const auto & dmp : *block->pdu)
|
||||||
{
|
{
|
||||||
/// > \cite sACN 7.2 DMP Layer: Vector
|
/// > \cite sACN 7.2 DMP Layer: Vector
|
||||||
/// >
|
/// >
|
||||||
|
@ -339,7 +339,7 @@ void Universe::sACNsend() const
|
|||||||
addrtyp->z_reserved = true; // buy why? Its in the standard...
|
addrtyp->z_reserved = true; // buy why? Its in the standard...
|
||||||
|
|
||||||
// property range
|
// property range
|
||||||
ACN::DMP::range pr(*addrtyp);
|
ACN::DMP::Range pr(*addrtyp);
|
||||||
pr.address = 0;
|
pr.address = 0;
|
||||||
pr.incriment = 1;
|
pr.incriment = 1;
|
||||||
pr.count = (active_data_slots_ <= 513 ? active_data_slots_ : 513);
|
pr.count = (active_data_slots_ <= 513 ? active_data_slots_ : 513);
|
||||||
|
Loading…
Reference in New Issue
Block a user