Skip to content

Commit 3be1ed4

Browse files
committed
Enable OEM wired controllers. Disable fix for serial hang due to more deadlocks.
1 parent 0377928 commit 3be1ed4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,8 @@ BotBaseMessage PABotBase::wait_for_request(uint64_t seqnum, Cancellable* cancell
958958

959959

960960
void PABotBase::cv_wait(Cancellable* cancellable, std::unique_lock<std::mutex>& lg){
961-
if (cancellable == nullptr){
961+
// This doesn't work yet. Disable it.
962+
if (cancellable == nullptr || true){
962963
m_cv.wait(lg);
963964
return;
964965
}

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ bool controller_is_valid(uint32_t id){
5555
case PABB_CID_NintendoSwitch_WirelessProController:
5656
case PABB_CID_NintendoSwitch_WirelessLeftJoycon:
5757
case PABB_CID_NintendoSwitch_WirelessRightJoycon:
58-
return true;
5958
case PABB_CID_NintendoSwitch_WiredProController:
6059
case PABB_CID_NintendoSwitch_WiredLeftJoycon:
6160
case PABB_CID_NintendoSwitch_WiredRightJoycon:
62-
return IS_BETA_VERSION || PreloadSettings::instance().DEVELOPER_MODE;
61+
return true;
62+
// return IS_BETA_VERSION || PreloadSettings::instance().DEVELOPER_MODE;
6363
case PABB_CID_NintendoSwitch2_WiredProController:
6464
case PABB_CID_NintendoSwitch2_WiredLeftJoycon:
6565
case PABB_CID_NintendoSwitch2_WiredRightJoycon:

0 commit comments

Comments
 (0)