official/OpenLCP
1
0
Fork 0
Code Releases 1 Activity

rename USB host side methods

Browse Source
This commit is contained in:
Kevin Matz 2023-04-05 08:10:59 -04:00
parent aaa6e04817
commit 1b272f0d23
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/qt/dmxwidget/dmxwidget.cpp
View File

@ -38,18 +38,18 @@ DmxWidget::~DmxWidget()
} }
void DmxWidget::connect() void DmxWidget::open()
{ {
ENTTEC::Widget::connect(); ENTTEC::Widget::open();
connected_ = true; connected_ = true;
emit connectedChanged(true); emit connectedChanged(true);
} }
void DmxWidget::disconnect() void DmxWidget::close()
{ {
ENTTEC::Widget::disconnect(); ENTTEC::Widget::close();
connected_ = false; connected_ = false;
emit connectedChanged(false); emit connectedChanged(false);

4
platform/qt/dmxwidget/dmxwidget.h
View File

@ -46,8 +46,8 @@ public:
explicit DmxWidget(QObject *parent = nullptr); explicit DmxWidget(QObject *parent = nullptr);
virtual ~DmxWidget(); virtual ~DmxWidget();
virtual void connect() override; virtual void open() override;
virtual void disconnect() override; virtual void close() override;
bool isConnected() const { return connected_; } bool isConnected() const { return connected_; }

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

@ -43,7 +43,7 @@ Widget::~Widget()
Widget::halt(); Widget::halt();
break; break;
case USBhost: case USBhost:
Widget::disconnect(); Widget::close();
break; break;
default: default:
break; break;
@ -78,7 +78,7 @@ void Widget::halt()
* *
* The base class method should be called from all inheriting overrides. * The base class method should be called from all inheriting overrides.
*/ */
void Widget::connect() void Widget::open()
{ {
usb_mode_ = USBhost; usb_mode_ = USBhost;
} }
@ -89,7 +89,7 @@ void Widget::connect()
* *
* The base class method should be called from all inheriting overrides. * The base class method should be called from all inheriting overrides.
*/ */
void Widget::disconnect() void Widget::close()
{ {
usb_mode_ = USBunknown; usb_mode_ = USBunknown;
} }

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

@ -45,8 +45,8 @@ public:
virtual void init(); //!< USB Device start virtual void init(); //!< USB Device start
virtual void halt(); //!< USB Device stop virtual void halt(); //!< USB Device stop
virtual void connect(); //!< USB Host start virtual void open(); //!< USB Host start
virtual void disconnect(); //!< USB Host stop virtual void close(); //!< USB Host stop
/** /**
* @brief serial * @brief serial
@ -77,6 +77,13 @@ public:
protected: protected:
void routeRxMessage(std::shared_ptr<Pro::MessageData>); void routeRxMessage(std::shared_ptr<Pro::MessageData>);
virtual void sendMessage(std::shared_ptr<Pro::MessageData>) const; virtual void sendMessage(std::shared_ptr<Pro::MessageData>) const;
/**
* @brief writeFwPage
* @return
*
* Reimpliment in super class to process the page. Base implimentation is to return false.
*/
virtual bool writeFwPage(uint8_t*) { return false; } virtual bool writeFwPage(uint8_t*) { return false; }
uint32_t serial_number; //!< BCD serial number uint32_t serial_number; //!< BCD serial number