Skip to content

Commit 9e5ae90

Browse files
committed
Remove pro controller requirement from programs that don't use the controller. Tweak the Regice light pattern for ESP32. Automatically change controller dropdown to match what's on the ESP32.
1 parent 8c97698 commit 9e5ae90

File tree

12 files changed

+20
-16
lines changed

12 files changed

+20
-16
lines changed

SerialPrograms/Source/Controllers/ControllerSession.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include "Common/Cpp/Exceptions.h"
8+
#include "ControllerTypeStrings.h"
89
#include "ControllerSession.h"
910

1011
//#include <iostream>
@@ -350,6 +351,7 @@ void ControllerSession::post_connection_ready(
350351
m_available_controllers = available_controllers;
351352

352353

354+
#if 0
353355
auto iter = supported_controllers.begin();
354356
if (supported_controllers.size() == 1){
355357
// Only one controller available. Force the option to it.
@@ -361,6 +363,7 @@ void ControllerSession::post_connection_ready(
361363
current_controller = m_option.m_controller_type;
362364
}
363365
}
366+
#endif
364367

365368
// Construct the controller.
366369
if (current_controller != ControllerType::None){
@@ -373,6 +376,7 @@ void ControllerSession::post_connection_ready(
373376
}
374377

375378
// Commit all changes.
379+
// cout << "current_controller = " << CONTROLLER_TYPE_STRINGS.get_string(current_controller) << endl;
376380
m_option.m_controller_type = current_controller;
377381
ready = m_controller && m_controller->is_ready();
378382

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SnapshotDumper_Descriptor::SnapshotDumper_Descriptor()
2222
"Periodically take screenshots.",
2323
FeedbackType::NONE,
2424
AllowCommandsWhenRunning::ENABLE_COMMANDS,
25-
{ControllerFeature::NintendoSwitch_ProController}
25+
{}
2626
)
2727
{}
2828

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SwitchViewer_Descriptor::SwitchViewer_Descriptor()
2323
"ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/SwitchViewer.md",
2424
"View status information from one or more running programs."
2525
)
26-
, m_requirements({ControllerFeature::NintendoSwitch_ProController})
26+
, m_requirements({})
2727
{}
2828

2929

SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ShinyEncounterTester_Descriptor::ShinyEncounterTester_Descriptor()
2121
"",
2222
"Test the shiny encounter detector. Start this program just before an encounter.",
2323
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
24-
{ControllerFeature::NintendoSwitch_ProController},
24+
{},
2525
FasterIfTickPrecise::NOT_FASTER
2626
)
2727
{}

SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SoundListener_Descriptor::SoundListener_Descriptor()
3535
"",
3636
"Test sound detectors listening to audio stream.",
3737
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
38-
{ControllerFeature::NintendoSwitch_ProController}
38+
{}
3939
)
4040
{}
4141

SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MountDetectionTest_Descriptor::MountDetectionTest_Descriptor()
2222
"",
2323
"Test the mount detection in the bottom right corner.",
2424
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
25-
{ControllerFeature::NintendoSwitch_ProController},
25+
{},
2626
FasterIfTickPrecise::NOT_FASTER
2727
)
2828
{}

SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
2626
"This is a test program that simply observes the game and labels things of interest. "
2727
"This program doesn't really do anything.",
2828
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
29-
{ControllerFeature::NintendoSwitch_ProController},
29+
{},
3030
FasterIfTickPrecise::NOT_FASTER
3131
)
3232
{}

SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ SoundListener_Descriptor::SoundListener_Descriptor()
4141
"",
4242
"Test sound detectors listening to audio stream.",
4343
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
44-
{ControllerFeature::NintendoSwitch_ProController}
44+
{}
4545
)
4646
{}
4747

SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SoundListener_Descriptor::SoundListener_Descriptor()
2727
"",
2828
"Test sound detectors listening to audio stream.",
2929
FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
30-
{ControllerFeature::NintendoSwitch_ProController}
30+
{}
3131
)
3232
{}
3333

SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GenerateIVCheckerOCR_Descriptor::GenerateIVCheckerOCR_Descriptor()
3636
"Generate IV Checker OCR Data",
3737
FeedbackType::REQUIRED,
3838
AllowCommandsWhenRunning::DISABLE_COMMANDS,
39-
{ControllerFeature::NintendoSwitch_ProController}
39+
{}
4040
)
4141
{}
4242

0 commit comments

Comments
 (0)