From 310eae05ec66cec786f1cbe7df014a3bc045488b Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sat, 13 May 2023 11:25:32 -0400 Subject: [PATCH] don't hard code constants --- protocol/enttec/dmx-usb-pro/pro.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/protocol/enttec/dmx-usb-pro/pro.h b/protocol/enttec/dmx-usb-pro/pro.h index 63caa93..0a6109c 100644 --- a/protocol/enttec/dmx-usb-pro/pro.h +++ b/protocol/enttec/dmx-usb-pro/pro.h @@ -97,7 +97,7 @@ struct MessageData struct MsgNoop : public MessageData { - MsgNoop() : MessageData(0) {}; + MsgNoop() : MessageData(OpNoop) {}; virtual size_t streamSize() const override { return 0; }; virtual void iStream(std::shared_ptr) override {}; @@ -114,7 +114,7 @@ struct MsgNoop struct MsgReprogramFirmware : public MessageData { - MsgReprogramFirmware() : MessageData(1) {}; + MsgReprogramFirmware() : MessageData(OpReprogramFirmware) {}; virtual size_t streamSize() const override { return 0; }; virtual void iStream(std::shared_ptr) override {}; @@ -132,7 +132,7 @@ struct MsgReprogramFirmware struct MsgProgramFlashPageRequest : public MessageData { - MsgProgramFlashPageRequest() : MessageData(2) {}; + MsgProgramFlashPageRequest() : MessageData(OpProgramFlashPage) {}; virtual size_t streamSize() const override { return 64; }; virtual void iStream(std::shared_ptr) override; @@ -151,7 +151,7 @@ struct MsgProgramFlashPageRequest struct MsgProgramFlashPageReply : public MessageData { - MsgProgramFlashPageReply() : MessageData(2) {}; + MsgProgramFlashPageReply() : MessageData(OpProgramFlashPage) {}; virtual size_t streamSize() const override { return 4; }; virtual void iStream(std::shared_ptr) override; @@ -172,7 +172,7 @@ const char SUCCESS_FAIL[4] = {'F','A','L','S'}; //!< Firmware page write failure struct MsgGetWidgetParametersRequest : public MessageData { - MsgGetWidgetParametersRequest() : MessageData(3) {}; + MsgGetWidgetParametersRequest() : MessageData(OpGetWidgetParameters) {}; virtual size_t streamSize() const override { return 2; }; virtual void iStream(std::shared_ptr) override; @@ -193,7 +193,7 @@ const size_t USER_CONFIGURATION_MAX = 508; //!< maximum user configuration size struct MsgGetWidgetParametersReply : public MessageData { - MsgGetWidgetParametersReply() : MessageData(3) {}; + MsgGetWidgetParametersReply() : MessageData(OpGetWidgetParameters) {}; virtual size_t streamSize() const override { return 5 + user_data.size(); }; virtual void iStream(std::shared_ptr) override; @@ -232,7 +232,7 @@ const uint8_t DMX_RATE_MAX = 40; //!< minimum DMX refresh rate struct MsgSetWidgetParametersRequest : public MessageData { - MsgSetWidgetParametersRequest() : MessageData(4) {}; + MsgSetWidgetParametersRequest() : MessageData(OpSetWidgetParameters) {}; virtual size_t streamSize() const override { return 5 + user_data.size(); }; virtual void iStream(std::shared_ptr) override; @@ -255,7 +255,7 @@ struct MsgSetWidgetParametersRequest struct MsgRecievedDmxPacket : public MessageData { - MsgRecievedDmxPacket() : MessageData(5) {}; + MsgRecievedDmxPacket() : MessageData(OpRecievedDmxPacket) {}; virtual size_t streamSize() const override { return 1 + data.size(); }; virtual void iStream(std::shared_ptr) override; @@ -287,7 +287,7 @@ const size_t DMX_LAST_SLOT_MIN = 24; //!< length of the shortest supported struct MsgOutputOnlySendDMX : public MessageData { - MsgOutputOnlySendDMX() : MessageData(6) {}; + MsgOutputOnlySendDMX() : MessageData(OpOutputOnlySendDMX) {}; virtual size_t streamSize() const override { return std::max(data.size(), DMX_LAST_SLOT_MIN + 1); }; virtual void iStream(std::shared_ptr) override; @@ -308,7 +308,7 @@ struct MsgOutputOnlySendDMX struct MsgSendRDMData : public MessageData { - MsgSendRDMData() : MessageData(7) {}; + MsgSendRDMData() : MessageData(OpSendRDMData) {}; virtual size_t streamSize() const override { return data.size(); }; virtual void iStream(std::shared_ptr) override; @@ -335,7 +335,7 @@ enum DMX_RX_MODE { struct MsgRecieveDMXOnChange : public MessageData { - MsgRecieveDMXOnChange() : MessageData(8) {}; + MsgRecieveDMXOnChange() : MessageData(OpRecieveDMXOnChange) {}; virtual size_t streamSize() const override { return 1; }; virtual void iStream(std::shared_ptr) override; @@ -355,7 +355,7 @@ struct MsgRecieveDMXOnChange struct MsgRecievedDMXChanged : public MessageData { - MsgRecievedDMXChanged() : MessageData(9) {}; + MsgRecievedDMXChanged() : MessageData(OpRecievedDMXChanged) {}; virtual size_t streamSize() const override { return 6 + data.size(); }; virtual void iStream(std::shared_ptr) override; @@ -375,7 +375,7 @@ struct MsgRecievedDMXChanged struct MsgGetWidgetSerialRequest : public MessageData { - MsgGetWidgetSerialRequest() : MessageData(10) {}; + MsgGetWidgetSerialRequest() : MessageData(OpGetWidgetSerial) {}; virtual size_t streamSize() const override { return 0; }; virtual void iStream(std::shared_ptr) override {}; @@ -392,7 +392,7 @@ struct MsgGetWidgetSerialRequest struct MsgGetWidgetSerialReply : public MessageData { - MsgGetWidgetSerialReply() : MessageData(10) {}; + MsgGetWidgetSerialReply() : MessageData(OpGetWidgetSerial) {}; virtual size_t streamSize() const override { return 4; }; virtual void iStream(std::shared_ptr) override; @@ -411,7 +411,7 @@ struct MsgGetWidgetSerialReply struct MsgSendRDMDiscovery : public MessageData { - MsgSendRDMDiscovery() : MessageData(11) {}; + MsgSendRDMDiscovery() : MessageData(OpSendRDMDiscovery) {}; virtual size_t streamSize() const override { return 38; }; virtual void iStream(std::shared_ptr) override;