Skip to content

Commit 008fbf0

Browse files
MysticialMysticial
committed
Rename ControllerContext -> SwitchControllerContext.
1 parent adc9439 commit 008fbf0

File tree

627 files changed

+2379
-2379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

627 files changed

+2379
-2379
lines changed

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ namespace PokemonAutomation{
1111
namespace NintendoSwitch{
1212

1313

14-
uint32_t system_clock(ControllerContext& context){
14+
uint32_t system_clock(SwitchControllerContext& context){
1515
pabb_MsgAckRequestI32 response;
1616
context.issue_request_and_wait(
1717
DeviceRequest_system_clock()
1818
).convert<PABB_MSG_ACK_REQUEST_I32>(context.controller().logger(), response);
1919
return response.data;
2020
}
21-
void set_leds(ControllerContext& context, bool on){
21+
void set_leds(SwitchControllerContext& context, bool on){
2222
context.issue_request(DeviceRequest_set_leds(on));
2323
}
2424

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace PokemonAutomation{
1313
namespace NintendoSwitch{
1414

1515

16-
uint32_t system_clock (ControllerContext& context);
17-
void set_leds (ControllerContext& context, bool on);
16+
uint32_t system_clock (SwitchControllerContext& context);
17+
void set_leds (SwitchControllerContext& context, bool on);
1818

1919

2020

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ namespace NintendoSwitch{
3737
const uint8_t XCORD[] = {1, 0, 1, 2, 0, 1, 2, 0, 1, 2};
3838
const uint8_t YCORD[] = {3, 0, 0, 0, 1, 1, 1, 2, 2, 2};
3939

40-
void code_entry_scroll(ControllerContext& context, ssf_ScrollDirection direction){
40+
void code_entry_scroll(SwitchControllerContext& context, ssf_ScrollDirection direction){
4141
pbf_wait(context, CODE_DELAY);
4242
ssf_issue_scroll(context, direction, 0);
4343
}
4444
uint16_t scroll_to(
45-
ControllerContext& context,
45+
SwitchControllerContext& context,
4646
uint8_t start_digit, uint8_t end_digit, bool actually_scroll
4747
){
4848
// Returns the # of ticks needed to scroll from "start_digit" to "end_digit".
@@ -142,7 +142,7 @@ uint16_t scroll_to(
142142

143143

144144

145-
void enter_digits(ControllerContext& context, uint8_t count, const uint8_t* digits){
145+
void enter_digits(SwitchControllerContext& context, uint8_t count, const uint8_t* digits){
146146
#if 0
147147
context.issue_request(DeviceRequest_enter_digits(count, digits));
148148
#else
@@ -229,7 +229,7 @@ void enter_digits(ControllerContext& context, uint8_t count, const uint8_t* digi
229229
}
230230

231231

232-
void enter_digits_str(ControllerContext& context, uint8_t count, const char* digits){
232+
void enter_digits_str(SwitchControllerContext& context, uint8_t count, const char* digits){
233233
enter_digits(context, count, (const uint8_t*)digits);
234234
}
235235
uint8_t convert_digit(uint8_t digit){

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace PokemonAutomation{
1313
namespace NintendoSwitch{
1414

1515

16-
void enter_digits_str (ControllerContext& context, uint8_t count, const char* digits);
17-
void enter_digits (ControllerContext& context, uint8_t count, const uint8_t* digits);
16+
void enter_digits_str (SwitchControllerContext& context, uint8_t count, const char* digits);
17+
void enter_digits (SwitchControllerContext& context, uint8_t count, const uint8_t* digits);
1818

1919

2020

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace PokemonAutomation{
1616
namespace NintendoSwitch{
1717

1818

19-
void pbf_wait(ControllerContext& context, uint16_t ticks){
19+
void pbf_wait(SwitchControllerContext& context, uint16_t ticks){
2020
#if 0
2121
context.issue_request(
2222
DeviceRequest_pbf_wait(ticks)
@@ -25,7 +25,7 @@ void pbf_wait(ControllerContext& context, uint16_t ticks){
2525
ssf_do_nothing(context, ticks);
2626
#endif
2727
}
28-
void pbf_press_button(ControllerContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks){
28+
void pbf_press_button(SwitchControllerContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks){
2929
#if 0
3030
context.issue_request(
3131
DeviceRequest_pbf_press_button(button, hold_ticks, release_ticks)
@@ -40,7 +40,7 @@ void pbf_press_button(ControllerContext& context, Button button, uint16_t hold_t
4040
}
4141
#endif
4242
}
43-
void pbf_press_dpad(ControllerContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks){
43+
void pbf_press_dpad(SwitchControllerContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks){
4444
#if 0
4545
context.issue_request(
4646
DeviceRequest_pbf_press_dpad(position, hold_ticks, release_ticks)
@@ -55,7 +55,7 @@ void pbf_press_dpad(ControllerContext& context, DpadPosition position, uint16_t
5555
}
5656
#endif
5757
}
58-
void pbf_move_left_joystick(ControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
58+
void pbf_move_left_joystick(SwitchControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
5959
#if 0
6060
context.issue_request(
6161
DeviceRequest_pbf_move_left_joystick(x, y, hold_ticks, release_ticks)
@@ -70,7 +70,7 @@ void pbf_move_left_joystick(ControllerContext& context, uint8_t x, uint8_t y, ui
7070
}
7171
#endif
7272
}
73-
void pbf_move_right_joystick(ControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
73+
void pbf_move_right_joystick(SwitchControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
7474
#if 0
7575
context.issue_request(
7676
DeviceRequest_pbf_move_right_joystick(x, y, hold_ticks, release_ticks)
@@ -85,7 +85,7 @@ void pbf_move_right_joystick(ControllerContext& context, uint8_t x, uint8_t y, u
8585
}
8686
#endif
8787
}
88-
void pbf_mash_button(ControllerContext& context, Button button, uint16_t ticks){
88+
void pbf_mash_button(SwitchControllerContext& context, Button button, uint16_t ticks){
8989
#if 0
9090
context.issue_request(
9191
DeviceRequest_pbf_mash_button(button, ticks)
@@ -95,22 +95,22 @@ void pbf_mash_button(ControllerContext& context, Button button, uint16_t ticks){
9595
#endif
9696
}
9797

98-
void start_program_flash(ControllerContext& context, uint16_t ticks){
98+
void start_program_flash(SwitchControllerContext& context, uint16_t ticks){
9999
for (uint16_t c = 0; c < ticks; c += 50){
100100
set_leds(context, true);
101101
pbf_wait(context, 25);
102102
set_leds(context, false);
103103
pbf_wait(context, 25);
104104
}
105105
}
106-
void grip_menu_connect_go_home(ControllerContext& context){
106+
void grip_menu_connect_go_home(SwitchControllerContext& context){
107107
pbf_press_button(context, BUTTON_L | BUTTON_R, 10, 40);
108108
pbf_press_button(context, BUTTON_A, 10, 140);
109109
pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
110110
}
111111

112112
// void pbf_controller_state(
113-
// ControllerContext& context,
113+
// SwitchControllerContext& context,
114114
// Button button,
115115
// DpadPosition position,
116116
// uint8_t left_x, uint8_t left_y,
@@ -124,7 +124,7 @@ void grip_menu_connect_go_home(ControllerContext& context){
124124

125125

126126
void pbf_controller_state(
127-
ControllerContext& context,
127+
SwitchControllerContext& context,
128128
Button button,
129129
DpadPosition position,
130130
uint8_t left_x, uint8_t left_y,

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ namespace PokemonAutomation{
2020
namespace NintendoSwitch{
2121

2222
// Wait for this many ticks on the Switch.
23-
void pbf_wait (ControllerContext& context, uint16_t ticks);
23+
void pbf_wait (SwitchControllerContext& context, uint16_t ticks);
2424
// Press a Switch controller button (excluding D-Pad). Hold the button for `hold_ticks`, then release it for `release_ticks`.
2525
// The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.
2626
// The buttons also include clicking joysticks: BUTTON_LCLICK, BUTTON_RCLICK.
2727
// D-Pad buttons and directional movements of joysticks are controlled by separate functions.
28-
void pbf_press_button (ControllerContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks);
28+
void pbf_press_button (SwitchControllerContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks);
2929
// Press a Switch controller D-Pad button. Hold the button for `hold_ticks`, then release it for `release_ticks`.
3030
// The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include DPAD_DOWN, DPAD_UP_RIGHT.
31-
void pbf_press_dpad (ControllerContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks);
31+
void pbf_press_dpad (SwitchControllerContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks);
3232

3333
// Move left joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`.
3434
// The direction is specified by (x, y):
@@ -40,7 +40,7 @@ void pbf_press_dpad (ControllerContext& context, DpadPosition positi
4040
// y = 255 : down
4141
// Example: move the joystick fully left: (x, y) = (0, 128)
4242
// move the joystick upper-right: (x, y) = (255, 0)
43-
void pbf_move_left_joystick (ControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
43+
void pbf_move_left_joystick (SwitchControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
4444
// Move right joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`.
4545
// The direction is specified by (x, y):
4646
// x = 0 : left
@@ -51,14 +51,14 @@ void pbf_move_left_joystick (ControllerContext& context, uint8_t x, uint8_t
5151
// y = 255 : down
5252
// Example: move the joystick fully left: (x, y) = (0, 128)
5353
// move the joystick upper-right: (x, y) = (255, 0)
54-
void pbf_move_right_joystick (ControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
54+
void pbf_move_right_joystick (SwitchControllerContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
5555
// Mash a Switch controller button (excluding D-Pad) repeatedly for `ticks` ticks.
5656
// The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.
5757
// The buttons also include clicking joysticks: BUTTON_LCLICK, BUTTON_RCLICK.
58-
void pbf_mash_button (ControllerContext& context, Button button, uint16_t ticks);
58+
void pbf_mash_button (SwitchControllerContext& context, Button button, uint16_t ticks);
5959

60-
void start_program_flash (ControllerContext& context, uint16_t ticks);
61-
void grip_menu_connect_go_home (ControllerContext& context);
60+
void start_program_flash (SwitchControllerContext& context, uint16_t ticks);
61+
void grip_menu_connect_go_home (SwitchControllerContext& context);
6262

6363

6464

@@ -79,7 +79,7 @@ void grip_menu_connect_go_home (ControllerContext& context);
7979
// programs already use this for overlapping)
8080
//
8181
void pbf_controller_state(
82-
ControllerContext& context,
82+
SwitchControllerContext& context,
8383
Button button,
8484
DpadPosition position,
8585
uint8_t left_x, uint8_t left_y,

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace PokemonAutomation{
1717
namespace NintendoSwitch{
1818

1919

20-
void close_game(ConsoleHandle& console, ControllerContext& context){
20+
void close_game(ConsoleHandle& console, SwitchControllerContext& context){
2121
#if 0
2222
context.issue_request(
2323
DeviceRequest_close_game()

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace PokemonAutomation{
1414
namespace NintendoSwitch{
1515

1616

17-
void close_game(ConsoleHandle& console, ControllerContext& device);
17+
void close_game(ConsoleHandle& console, SwitchControllerContext& device);
1818

1919

2020

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ namespace PokemonAutomation{
1313
namespace NintendoSwitch{
1414

1515

16-
void ssf_flush_pipeline(ControllerContext& context){
16+
void ssf_flush_pipeline(SwitchControllerContext& context){
1717
context.issue_request(
1818
DeviceRequest_ssf_flush_pipeline()
1919
);
2020
}
21-
void ssf_do_nothing(ControllerContext& context, uint16_t ticks){
21+
void ssf_do_nothing(SwitchControllerContext& context, uint16_t ticks){
2222
context.issue_request(
2323
DeviceRequest_ssf_do_nothing(ticks)
2424
);
@@ -27,7 +27,7 @@ void ssf_do_nothing(ControllerContext& context, uint16_t ticks){
2727

2828

2929
void ssf_press_button(
30-
ControllerContext& context,
30+
SwitchControllerContext& context,
3131
Button button,
3232
uint16_t delay, uint16_t hold, uint8_t cool
3333
){
@@ -36,7 +36,7 @@ void ssf_press_button(
3636
);
3737
}
3838
void ssf_press_dpad(
39-
ControllerContext& context,
39+
SwitchControllerContext& context,
4040
DpadPosition position,
4141
uint16_t delay, uint16_t hold, uint8_t cool
4242
){
@@ -45,7 +45,7 @@ void ssf_press_dpad(
4545
);
4646
}
4747
void ssf_press_left_joystick(
48-
ControllerContext& context,
48+
SwitchControllerContext& context,
4949
uint8_t x, uint8_t y,
5050
uint16_t delay, uint16_t hold, uint8_t cool
5151
){
@@ -54,7 +54,7 @@ void ssf_press_left_joystick(
5454
);
5555
}
5656
void ssf_press_right_joystick(
57-
ControllerContext& context,
57+
SwitchControllerContext& context,
5858
uint8_t x, uint8_t y,
5959
uint16_t delay, uint16_t hold, uint8_t cool
6060
){
@@ -65,23 +65,23 @@ void ssf_press_right_joystick(
6565

6666

6767

68-
void ssf_mash1_button(ControllerContext& context, Button button, uint16_t ticks){
68+
void ssf_mash1_button(SwitchControllerContext& context, Button button, uint16_t ticks){
6969
context.issue_request(
7070
DeviceRequest_ssf_mash1_button(button, ticks)
7171
);
7272
}
73-
void ssf_mash2_button(ControllerContext& context, Button button0, Button button1, uint16_t ticks){
73+
void ssf_mash2_button(SwitchControllerContext& context, Button button0, Button button1, uint16_t ticks){
7474
context.issue_request(
7575
DeviceRequest_ssf_mash2_button(button0, button1, ticks)
7676
);
7777
}
78-
void ssf_mash_AZs(ControllerContext& context, uint16_t ticks){
78+
void ssf_mash_AZs(SwitchControllerContext& context, uint16_t ticks){
7979
context.issue_request(
8080
DeviceRequest_ssf_mash_AZs(ticks)
8181
);
8282
}
8383
void ssf_issue_scroll(
84-
ControllerContext& context,
84+
SwitchControllerContext& context,
8585
ssf_ScrollDirection direction,
8686
uint16_t delay, uint16_t hold, uint8_t cool
8787
){

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,38 @@ namespace PokemonAutomation{
2222
namespace NintendoSwitch{
2323

2424

25-
void ssf_flush_pipeline (ControllerContext& context);
26-
void ssf_do_nothing (ControllerContext& context, uint16_t ticks);
25+
void ssf_flush_pipeline (SwitchControllerContext& context);
26+
void ssf_do_nothing (SwitchControllerContext& context, uint16_t ticks);
2727

2828

2929

3030
void ssf_press_button(
31-
ControllerContext& context,
31+
SwitchControllerContext& context,
3232
Button button,
3333
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
3434
);
3535
void ssf_press_dpad(
36-
ControllerContext& context,
36+
SwitchControllerContext& context,
3737
DpadPosition position,
3838
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
3939
);
4040

4141

4242
void ssf_press_left_joystick(
43-
ControllerContext& context,
43+
SwitchControllerContext& context,
4444
uint8_t x, uint8_t y,
4545
uint16_t delay, uint16_t hold, uint8_t cool = 0
4646
);
4747
void ssf_press_right_joystick(
48-
ControllerContext& context,
48+
SwitchControllerContext& context,
4949
uint8_t x, uint8_t y,
5050
uint16_t delay, uint16_t hold, uint8_t cool = 0
5151
);
5252

5353

54-
void ssf_mash1_button (ControllerContext& context, Button button, uint16_t ticks);
55-
void ssf_mash2_button (ControllerContext& context, Button button0, Button button1, uint16_t ticks);
56-
void ssf_mash_AZs (ControllerContext& context, uint16_t ticks);
54+
void ssf_mash1_button (SwitchControllerContext& context, Button button, uint16_t ticks);
55+
void ssf_mash2_button (SwitchControllerContext& context, Button button0, Button button1, uint16_t ticks);
56+
void ssf_mash_AZs (SwitchControllerContext& context, uint16_t ticks);
5757

5858

5959
#define ssf_ScrollDirection uint16_t
@@ -62,7 +62,7 @@ void ssf_mash_AZs (ControllerContext& context, uint16_t ticks);
6262
#define SSF_SCROLL_DOWN 4
6363
#define SSF_SCROLL_LEFT 6
6464
void ssf_issue_scroll(
65-
ControllerContext& context,
65+
SwitchControllerContext& context,
6666
ssf_ScrollDirection direction,
6767
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
6868
);

0 commit comments

Comments
 (0)