Skip to content

Commit 570028a

Browse files
committed
Fix controller dropdown not clearing on descriptor change. Enable SBB for public.
1 parent 29b8bc1 commit 570028a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <QHBoxLayout>
88
#include "Common/Qt/NoWheelComboBox.h"
9-
#include "CommonFramework/Globals.h"
109
#include "CommonFramework/GlobalSettingsPanel.h"
1110
#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
1211
#include "Controllers/ControllerTypeStrings.h"
@@ -48,9 +47,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
4847
interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::TcpSysbotBase)));
4948
// interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::UsbSysbotBase)));
5049

51-
if (!IS_BETA_VERSION && !PreloadSettings::instance().DEVELOPER_MODE){
52-
interface_dropdown->setHidden(true);
53-
}
50+
// interface_dropdown->setHidden(true);
5451

5552
auto current = session.descriptor();
5653
if (current == nullptr || current->interface_type == ControllerInterface::None){
@@ -191,6 +188,7 @@ void ControllerSelectorWidget::descriptor_changed(
191188
// cout << "descriptor_changed()" << endl;
192189
QMetaObject::invokeMethod(this, [=, this]{
193190
refresh_selection(descriptor->interface_type);
191+
refresh_controllers(ControllerType::None, {});
194192
}, Qt::QueuedConnection);
195193
}
196194
void ControllerSelectorWidget::controller_changed(

SerialPrograms/Source/Controllers/ControllerSession.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ void ControllerSession::make_controller(std::optional<ControllerType> change_con
179179
m_connection->controller_mode_status()
180180
);
181181
}
182+
183+
signal_descriptor_changed(m_descriptor);
182184
}
183185

184186

0 commit comments

Comments
 (0)