official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

no need to pass around zero data messages

This commit is contained in:
Kevin Matz 2023-04-09 19:51:01 -04:00
parent c16e999969
commit 244da5c8c1
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
protocol/enttec/dmx-usb-pro/widget.cpp
View File

@ -358,13 +358,10 @@ void Widget::routeRxMessage(std::shared_ptr<Pro::MessageData> msg)
switch (msg->label)
{
case Pro::OpNoop:
rxMsgHello(msg);
rxMsgHello();
break;
case Pro::OpReprogramFirmware:
{
auto data = std::static_pointer_cast<Pro::MsgReprogramFirmware>(msg);
rxMsgReprogramFirmware(data);
}
rxMsgReprogramFirmware();
break;
case Pro::OpProgramFlashPage:
{
@ -446,10 +443,7 @@ void Widget::routeRxMessage(std::shared_ptr<Pro::MessageData> msg)
{
switch (usb_mode) {
case USBdevice:
{
auto data = std::static_pointer_cast<Pro::MsgGetWidgetSerialRequest>(msg);
rxMsgGetWidgetSerialRequest(data);
}
rxMsgGetWidgetSerialRequest();
break;
case USBhost:
{
@ -602,13 +596,12 @@ void Widget::sendDmx(bool trimmed) const
/**
* @brief Widget::rxMsgHello
* @param msg
*/
void Widget::rxMsgHello(std::shared_ptr<Pro::MessageData> msg)
void Widget::rxMsgHello()
{
switch (usb_mode) {
case USBdevice:
sendMessage(msg); // mirror the message back to the host
sendMessage(std::make_shared<Pro::MsgNoop>()); // mirror the message back to the host
break;
case USBhost:
reply_hello_.set_value(true); // device was polite
@ -622,9 +615,8 @@ void Widget::rxMsgHello(std::shared_ptr<Pro::MessageData> msg)
/**
* @brief Widget::rxMsgReprogramFirmware
* @param msg
*/
void Widget::rxMsgReprogramFirmware(std::shared_ptr<Pro::MsgReprogramFirmware>)
void Widget::rxMsgReprogramFirmware()
{
rebootBootloader();
}
@ -770,9 +762,8 @@ void Widget::rxMsgRecievedDMXChanged(std::shared_ptr<Pro::MsgRecievedDMXChanged>
/**
* @brief Widget::rxMsgGetWidgetSerialRequest
* @param msg
*/
void Widget::rxMsgGetWidgetSerialRequest(std::shared_ptr<Pro::MsgGetWidgetSerialRequest>)
void Widget::rxMsgGetWidgetSerialRequest()
{
auto reply = std::make_shared<Pro::MsgGetWidgetSerialReply>();
{

6
protocol/enttec/dmx-usb-pro/widget.h
View File

@ -111,8 +111,8 @@ protected:
OperatingMode usb_mode; //!< The side of the USB the widget is acting on.
private:
void rxMsgHello(std::shared_ptr<Pro::MessageData>);
void rxMsgReprogramFirmware(std::shared_ptr<Pro::MsgReprogramFirmware>);
void rxMsgHello();
void rxMsgReprogramFirmware();
void rxMsgProgramFlashPageRequest(std::shared_ptr<Pro::MsgProgramFlashPageRequest>);
void rxMsgProgramFlashPageReply(std::shared_ptr<Pro::MsgProgramFlashPageReply>);
void rxMsgGetWidgetParametersRequest(std::shared_ptr<Pro::MsgGetWidgetParametersRequest>);
@ -123,7 +123,7 @@ private:
void rxMsgSendRDMData(std::shared_ptr<Pro::MsgSendRDMData>);
void rxMsgRecieveDMXOnChange(std::shared_ptr<Pro::MsgRecieveDMXOnChange>);
void rxMsgRecievedDMXChanged(std::shared_ptr<Pro::MsgRecievedDMXChanged>);
void rxMsgGetWidgetSerialRequest(std::shared_ptr<Pro::MsgGetWidgetSerialRequest>);
void rxMsgGetWidgetSerialRequest();
void rxMsgGetWidgetSerialReply(std::shared_ptr<Pro::MsgGetWidgetSerialReply>);
void rxMsgSendRDMDiscovery(std::shared_ptr<Pro::MsgSendRDMDiscovery>);