Skip to content

Commit d8f9af8

Browse files
committed
Enable UI for ESP32 without beta.
1 parent 144113e commit d8f9af8

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,20 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
9595
refresh_selection(incoming);
9696
}
9797
);
98-
if (PreloadSettings::instance().DEVELOPER_MODE){
99-
connect(
100-
m_controllers_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
101-
this, [this](int index){
102-
index = std::max(index, 0);
103-
ControllerType new_value = CONTROLLER_TYPE_STRINGS.get_enum(
104-
m_controllers_dropdown->itemText(index).toStdString(),
105-
ControllerType::None
106-
);
107-
if (new_value == m_session.controller_type()){
108-
return;
109-
}
110-
m_session.set_controller(new_value);
98+
connect(
99+
m_controllers_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
100+
this, [this](int index){
101+
index = std::max(index, 0);
102+
ControllerType new_value = CONTROLLER_TYPE_STRINGS.get_enum(
103+
m_controllers_dropdown->itemText(index).toStdString(),
104+
ControllerType::None
105+
);
106+
if (new_value == m_session.controller_type()){
107+
return;
111108
}
112-
);
113-
}
109+
m_session.set_controller(new_value);
110+
}
111+
);
114112
connect(
115113
m_reset_button, &QPushButton::clicked,
116114
this, [this](bool){

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp

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

77
#include <QWidget>
88
#include "Common/Cpp/Json/JsonValue.h"
9-
#include "CommonFramework/GlobalSettingsPanel.h"
109
#include "Controllers/ControllerTypeStrings.h"
1110
#include "SerialPABotBase_Descriptor.h"
1211
#include "SerialPABotBase_SelectorWidget.h"
@@ -40,11 +39,10 @@ std::string SerialPABotBase_Descriptor::display_name() const{
4039
if (m_port.isNull()){
4140
return "";
4241
}
43-
if (PreloadSettings::instance().DEVELOPER_MODE){
42+
// if (PreloadSettings::instance().DEVELOPER_MODE){
4443
return m_port.portName().toStdString();
45-
}
46-
return m_port.portName().toStdString() + " - " + m_port.description().toStdString();
47-
// return "Serial (PABotBase): " + m_port.portName().toStdString() + " - " + m_port.description().toStdString();
44+
// }
45+
// return m_port.portName().toStdString() + " - " + m_port.description().toStdString();
4846
}
4947
void SerialPABotBase_Descriptor::load_json(const JsonValue& json){
5048
const std::string* name = json.to_string();

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
301301
scope.wait_for(std::chrono::seconds(60));
302302
#endif
303303

304-
#if 0
304+
#if 1
305305
int* ptr = nullptr;
306306
cout << ptr[0] << endl;
307307
#endif

0 commit comments

Comments
 (0)