1
0
Fork 0

provide OpCode in the Packet constructor

This commit is contained in:
Kevin Matz 2023-05-20 13:24:14 -04:00
parent 9a0fd158d6
commit 796ef5f8ca
1 changed files with 49 additions and 48 deletions

View File

@ -534,10 +534,11 @@ struct Packet
{
/**
* @brief Packet
* @param opcode
* @param data
*/
Packet(std::shared_ptr<packet_data> data = nullptr)
: _opcode(OpNull)
Packet(OpCode opcode = OpNull, std::shared_ptr<packet_data> data = nullptr)
: _opcode(opcode)
, _data(data)
{}
@ -545,7 +546,7 @@ struct Packet
* @brief opcode
* @return
*/
OpCode opcode() { return _opcode; }
OpCode opcode() const { return _opcode; }
/**
* @brief data
@ -580,8 +581,8 @@ struct Packet
void oStream(std::shared_ptr<bufferstream>) const override;
protected:
OpCode _opcode; //!< Op Code
std::shared_ptr<packet_data> _data; //!< packet data
OpCode _opcode; //!< Op Code
std::shared_ptr<packet_data> _data; //!< packet data
};
@ -592,8 +593,8 @@ struct ArtPoll
: public Packet
{
ArtPoll()
: Packet(std::make_shared<poll_data>())
{ _opcode = OpPoll; }
: Packet(OpPoll, std::make_shared<poll_data>())
{}
};
@ -604,8 +605,8 @@ struct ArtPollReply
: public Packet
{
ArtPollReply()
: Packet(std::make_shared<pollreply_data>())
{ _opcode = OpPollReply; }
: Packet(OpPollReply, std::make_shared<pollreply_data>())
{}
};
@ -616,8 +617,8 @@ struct ArtIpProg
: public Packet
{
ArtIpProg()
: Packet(std::make_shared<ipprog_data>())
{ _opcode = OpIpProg; }
: Packet(OpIpProg, std::make_shared<ipprog_data>())
{}
};
@ -628,8 +629,8 @@ struct ArtIpProgReply
: public Packet
{
ArtIpProgReply()
: Packet(std::make_shared<ipprogreply_data>())
{ _opcode = OpIpProgReply; }
: Packet(OpIpProgReply, std::make_shared<ipprogreply_data>())
{}
};
@ -640,8 +641,8 @@ struct ArtAddress
: public Packet
{
ArtAddress()
: Packet(std::make_shared<address_data>())
{ _opcode = OpAddress; }
: Packet(OpAddress, std::make_shared<address_data>())
{}
};
@ -652,8 +653,8 @@ struct ArtDiagData
: public Packet
{
ArtDiagData()
: Packet(std::make_shared<diagdata_data>())
{ _opcode = OpDiagData; }
: Packet(OpDiagData, std::make_shared<diagdata_data>())
{}
};
@ -664,8 +665,8 @@ struct ArtTimeCode
: public Packet
{
ArtTimeCode()
: Packet(std::make_shared<timecode_data>())
{ _opcode = OpTimeCode; }
: Packet(OpTimeCode, std::make_shared<timecode_data>())
{}
};
@ -676,8 +677,8 @@ struct ArtCommand
: public Packet
{
ArtCommand()
: Packet(std::make_shared<command_data>())
{ _opcode = OpCommand; }
: Packet(OpCommand, std::make_shared<command_data>())
{}
};
@ -688,8 +689,8 @@ struct ArtTrigger
: public Packet
{
ArtTrigger()
: Packet(std::make_shared<trigger_data>())
{ _opcode = OpTrigger; }
: Packet(OpTrigger, std::make_shared<trigger_data>())
{}
};
@ -700,8 +701,8 @@ struct ArtDmx
: public Packet
{
ArtDmx()
: Packet(std::make_shared<dmx_data>())
{ _opcode = OpDmx; }
: Packet(OpDmx, std::make_shared<dmx_data>())
{}
};
@ -712,8 +713,8 @@ struct ArtSync
: public Packet
{
ArtSync()
: Packet(std::make_shared<sync_data>())
{ _opcode = OpSync; }
: Packet(OpSync, std::make_shared<sync_data>())
{}
};
@ -724,8 +725,8 @@ struct ArtNzs
: public Packet
{
ArtNzs()
: Packet(std::make_shared<nzs_data>())
{ _opcode = OpNzs; }
: Packet(OpNzs, std::make_shared<nzs_data>())
{}
};
@ -736,8 +737,8 @@ struct ArtVlc
: public Packet
{
ArtVlc()
: Packet(std::make_shared<vlc_data>())
{ _opcode = OpNzs; }
: Packet(OpNzs, std::make_shared<vlc_data>())
{}
};
@ -748,8 +749,8 @@ struct ArtInput
: public Packet
{
ArtInput()
: Packet(std::make_shared<input_data>())
{ _opcode = OpInput; }
: Packet(OpInput, std::make_shared<input_data>())
{}
};
@ -760,8 +761,8 @@ struct ArtFirmwareMaster
: public Packet
{
ArtFirmwareMaster()
: Packet(std::make_shared<firmwaremaster_data>())
{ _opcode = OpFirmwareMaster; }
: Packet(OpFirmwareMaster, std::make_shared<firmwaremaster_data>())
{}
};
@ -772,8 +773,8 @@ struct ArtFirmwareReply
: public Packet
{
ArtFirmwareReply()
: Packet(std::make_shared<firmwarereply_data>())
{ _opcode = OpFirmwareReply; }
: Packet(OpFirmwareReply, std::make_shared<firmwarereply_data>())
{}
};
@ -784,8 +785,8 @@ struct ArtTodRequest
: public Packet
{
ArtTodRequest()
: Packet(std::make_shared<todrequest_data>())
{ _opcode = OpTodRequest; }
: Packet(OpTodRequest, std::make_shared<todrequest_data>())
{}
};
@ -796,8 +797,8 @@ struct ArtTodData
: public Packet
{
ArtTodData()
: Packet(std::make_shared<toddata_data>())
{ _opcode = OpTodData; }
: Packet(OpTodData, std::make_shared<toddata_data>())
{}
};
@ -808,8 +809,8 @@ struct ArtTodControl
: public Packet
{
ArtTodControl()
: Packet(std::make_shared<todcontrol_data>())
{ _opcode = OpTodControl; }
: Packet(OpTodControl, std::make_shared<todcontrol_data>())
{}
};
@ -820,20 +821,20 @@ struct ArtRdm
: public Packet
{
ArtRdm()
: Packet(std::make_shared<rdm_data>())
{ _opcode = OpRdm; }
: Packet(OpRdm, std::make_shared<rdm_data>())
{}
};
/**
* @brief The Art Packet
* @brief The ArtRdmSub Packet
*/
struct ArtRdmSub
: public Packet
{
ArtRdmSub()
: Packet(std::make_shared<rdmsub_data>())
{ _opcode = OpRdmSub; }
: Packet(OpRdmSub, std::make_shared<rdmsub_data>())
{}
};