diff --git a/platform/qt/dmxwidget/dmxwidget.cpp b/platform/qt/dmxwidget/dmxwidget.cpp index a165c67..19e3172 100644 --- a/platform/qt/dmxwidget/dmxwidget.cpp +++ b/platform/qt/dmxwidget/dmxwidget.cpp @@ -38,18 +38,18 @@ DmxWidget::~DmxWidget() } -void DmxWidget::connect() +void DmxWidget::open() { - ENTTEC::Widget::connect(); + ENTTEC::Widget::open(); connected_ = true; emit connectedChanged(true); } -void DmxWidget::disconnect() +void DmxWidget::close() { - ENTTEC::Widget::disconnect(); + ENTTEC::Widget::close(); connected_ = false; emit connectedChanged(false); diff --git a/platform/qt/dmxwidget/dmxwidget.h b/platform/qt/dmxwidget/dmxwidget.h index 68a3a60..d8f1546 100644 --- a/platform/qt/dmxwidget/dmxwidget.h +++ b/platform/qt/dmxwidget/dmxwidget.h @@ -46,8 +46,8 @@ public: explicit DmxWidget(QObject *parent = nullptr); virtual ~DmxWidget(); - virtual void connect() override; - virtual void disconnect() override; + virtual void open() override; + virtual void close() override; bool isConnected() const { return connected_; } diff --git a/protocol/enttec/dmx-usb-pro/widget.cpp b/protocol/enttec/dmx-usb-pro/widget.cpp index a63c3e7..8eeeea3 100644 --- a/protocol/enttec/dmx-usb-pro/widget.cpp +++ b/protocol/enttec/dmx-usb-pro/widget.cpp @@ -43,7 +43,7 @@ Widget::~Widget() Widget::halt(); break; case USBhost: - Widget::disconnect(); + Widget::close(); break; default: break; @@ -78,7 +78,7 @@ void Widget::halt() * * The base class method should be called from all inheriting overrides. */ -void Widget::connect() +void Widget::open() { usb_mode_ = USBhost; } @@ -89,7 +89,7 @@ void Widget::connect() * * The base class method should be called from all inheriting overrides. */ -void Widget::disconnect() +void Widget::close() { usb_mode_ = USBunknown; } diff --git a/protocol/enttec/dmx-usb-pro/widget.h b/protocol/enttec/dmx-usb-pro/widget.h index 2aa909e..a89605a 100644 --- a/protocol/enttec/dmx-usb-pro/widget.h +++ b/protocol/enttec/dmx-usb-pro/widget.h @@ -45,8 +45,8 @@ public: virtual void init(); //!< USB Device start virtual void halt(); //!< USB Device stop - virtual void connect(); //!< USB Host start - virtual void disconnect(); //!< USB Host stop + virtual void open(); //!< USB Host start + virtual void close(); //!< USB Host stop /** * @brief serial @@ -77,6 +77,13 @@ public: protected: void routeRxMessage(std::shared_ptr); virtual void sendMessage(std::shared_ptr) 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; } uint32_t serial_number; //!< BCD serial number