Skip to content

Commit 8bf10ae

Browse files
committed
Remove direct botbase commands.
1 parent 66f5bb7 commit 8bf10ae

File tree

5 files changed

+1
-68
lines changed

5 files changed

+1
-68
lines changed

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,7 @@ class ProController : public AbstractController{
6363

6464

6565
public:
66-
// Temporary for refactor: Send custom requests for PABotBase's advanced
67-
// RPCs.
68-
virtual void send_botbase_request(
69-
const Cancellable* cancellable,
70-
const BotBaseRequest& request
71-
) = 0;
72-
virtual BotBaseMessage send_botbase_request_and_wait(
73-
const Cancellable* cancellable,
74-
const BotBaseRequest& request
75-
) = 0;
76-
77-
78-
public:
66+
// Standard Commands
7967

8068
// Press all the buttons set in the bitfield simultaneously.
8169
// This command will wait until all the selected buttons are ready to

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,6 @@ class SerialPABotBase_PokkenController final :
8080
SerialPABotBase_Controller::wait_for_all(cancellable);
8181
}
8282

83-
virtual void send_botbase_request(
84-
const Cancellable* cancellable,
85-
const BotBaseRequest& request
86-
) override{
87-
SerialPABotBase_Controller::send_botbase_request(cancellable, request);
88-
}
89-
virtual BotBaseMessage send_botbase_request_and_wait(
90-
const Cancellable* cancellable,
91-
const BotBaseRequest& request
92-
) override{
93-
return SerialPABotBase_Controller::send_botbase_request_and_wait(cancellable, request);
94-
}
95-
9683

9784
public:
9885
// Superscalar Commands (the "ssf" framework)

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,6 @@ class SerialPABotBase_WirelessProController final :
7777
SerialPABotBase_Controller::wait_for_all(cancellable);
7878
}
7979

80-
virtual void send_botbase_request(
81-
const Cancellable* cancellable,
82-
const BotBaseRequest& request
83-
) override{
84-
SerialPABotBase_Controller::send_botbase_request(cancellable, request);
85-
}
86-
virtual BotBaseMessage send_botbase_request_and_wait(
87-
const Cancellable* cancellable,
88-
const BotBaseRequest& request
89-
) override{
90-
return SerialPABotBase_Controller::send_botbase_request_and_wait(cancellable, request);
91-
}
92-
9380

9481
public:
9582
// Superscalar Commands (the "ssf" framework)

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -173,26 +173,6 @@ void ProController_SysbotBase::push_state(const Cancellable* cancellable, WallDu
173173
}
174174

175175

176-
void ProController_SysbotBase::send_botbase_request(
177-
const Cancellable* cancellable,
178-
const BotBaseRequest& request
179-
){
180-
throw InternalProgramError(
181-
&m_logger, PA_CURRENT_FUNCTION,
182-
"ProController_SysbotBase::send_botbase_request(): Not supported."
183-
);
184-
}
185-
BotBaseMessage ProController_SysbotBase::send_botbase_request_and_wait(
186-
const Cancellable* cancellable,
187-
const BotBaseRequest& request
188-
){
189-
throw InternalProgramError(
190-
&m_logger, PA_CURRENT_FUNCTION,
191-
"ProController_SysbotBase::send_botbase_request_and_wait(): Not supported."
192-
);
193-
}
194-
195-
196176

197177
void ProController_SysbotBase::send_diff(
198178
const ProControllerState& old_state,

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,6 @@ class ProController_SysbotBase final :
8181

8282
virtual void wait_for_all(const Cancellable* cancellable) override;
8383

84-
virtual void send_botbase_request(
85-
const Cancellable* cancellable,
86-
const BotBaseRequest& request
87-
) override;
88-
virtual BotBaseMessage send_botbase_request_and_wait(
89-
const Cancellable* cancellable,
90-
const BotBaseRequest& request
91-
) override;
92-
9384

9485
public:
9586
// Superscalar Commands (the "ssf" framework)

0 commit comments

Comments
 (0)