From 55f2b2fabbd510ef78ca99624052e102cc708c86 Mon Sep 17 00:00:00 2001 From: Steve Evans Date: Sun, 26 Apr 2015 22:19:51 +0100 Subject: [PATCH] OP-1849 Fix GCS HW Settings tab to only display receiver port com-bridge if available --- .../openpilotgcs/src/plugins/config/configrevohwwidget.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index ae224bd6c..5a0258da8 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -151,6 +151,12 @@ void ConfigRevoHWWidget::usbVCPPortChanged(int index) m_ui->cbMain->model()->setData(m_ui->cbMain->model()->index(HwSettings::RM_MAINPORT_COMBRIDGE, 0), !vcpComBridgeEnabled ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1); + if (!vcpComBridgeEnabled && m_ui->cbRcvr->currentIndex() == HwSettings::RM_RCVRPORT_COMBRIDGE) { + m_ui->cbRcvr->setCurrentIndex(HwSettings::RM_RCVRPORT_DISABLED); + } + m_ui->cbRcvr->model()->setData(m_ui->cbRcvr->model()->index(HwSettings::RM_RCVRPORT_COMBRIDGE, 0), + !vcpComBridgeEnabled ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1); + // _DEBUGCONSOLE modes are mutual exclusive if (m_ui->cbUSBVCPFunction->currentIndex() == HwSettings::USB_VCPPORT_DEBUGCONSOLE) { if (m_ui->cbMain->currentIndex() == HwSettings::RM_MAINPORT_DEBUGCONSOLE) {