Skip to content

Commit 19465f9

Browse files
committed
Rename performance class enums.
1 parent 0eb21f0 commit 19465f9

14 files changed

+37
-34
lines changed

SerialPrograms/Source/Controllers/ControllerTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ enum class ControllerFeature{
6060

6161
enum class ControllerPerformanceClass{
6262
Unknown,
63-
SerialPABotBase_Wired_125Hz,
64-
SerialPABotBase_Wireless_ESP32,
63+
SerialPABotBase_Wired,
64+
SerialPABotBase_Wireless,
6565
SysbotBase,
6666
};
6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class SerialPABotBase_PokkenController final :
5151
return m_supported_features;
5252
}
5353
virtual ControllerPerformanceClass performance_class() const override{
54-
return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
54+
return ControllerPerformanceClass::SerialPABotBase_Wired;
5555
}
5656

5757
virtual Milliseconds ticksize() const override{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class SerialPABotBase_WirelessJoycon final :
4949
return m_supported_features;
5050
}
5151
virtual ControllerPerformanceClass performance_class() const override{
52-
return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;
52+
return ControllerPerformanceClass::SerialPABotBase_Wireless;
5353
}
5454

5555
virtual Milliseconds ticksize() const override{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class SerialPABotBase_WirelessProController final :
4848
return m_supported_features;
4949
}
5050
virtual ControllerPerformanceClass performance_class() const override{
51-
return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;
51+
return ControllerPerformanceClass::SerialPABotBase_Wireless;
5252
}
5353

5454
virtual Milliseconds ticksize() const override{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class ProController_SysbotBase3 final :
4444
}
4545
virtual const ControllerFeatures& controller_features() const override;
4646
virtual ControllerPerformanceClass performance_class() const override{
47-
// TODO: Change to SerialPABotBase_Wired_125Hz when we prove it is stable.
48-
return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
47+
// TODO: Change to SerialPABotBase_Wired when we prove it is stable.
48+
return ControllerPerformanceClass::SerialPABotBase_Wired;
4949
// return ControllerPerformanceClass::SysbotBase;
5050
}
5151

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ namespace NintendoSwitch{
2727

2828
void home_to_date_time_Switch1_blind(Logger& logger, ProControllerContext& context, bool to_date_change){
2929
switch (context->performance_class()){
30-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
30+
case ControllerPerformanceClass::SerialPABotBase_Wired:
3131
home_to_date_time_Switch1_wired_blind(logger, context, to_date_change);
3232
return;
33-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
33+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
3434
home_to_date_time_Switch1_wireless_esp32_blind(logger, context, to_date_change);
3535
return;
3636
default:
@@ -41,7 +41,7 @@ void home_to_date_time_Switch1_blind(Logger& logger, ProControllerContext& conte
4141
}
4242
bool home_to_date_time_Switch1_feedback(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
4343
switch (context->performance_class()){
44-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
44+
case ControllerPerformanceClass::SerialPABotBase_Wired:
4545
home_to_date_time_Switch1_wired_feedback(console, context, to_date_change);
4646
return true;
4747
default:;
@@ -55,10 +55,10 @@ void home_to_date_time_Switch2_blind(
5555
ConsoleType console_type, bool to_date_change
5656
){
5757
switch (context->performance_class()){
58-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
58+
case ControllerPerformanceClass::SerialPABotBase_Wired:
5959
home_to_date_time_Switch2_wired_blind(logger, context, console_type, to_date_change);
6060
return;
61-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
61+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
6262
home_to_date_time_Switch2_wireless_blind(logger, context, console_type, to_date_change);
6363
return;
6464
default:
@@ -72,10 +72,10 @@ bool home_to_date_time_Switch2_feedback(
7272
ConsoleType console_type, bool to_date_change
7373
){
7474
switch (context->performance_class()){
75-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
75+
case ControllerPerformanceClass::SerialPABotBase_Wired:
7676
home_to_date_time_Switch2_wired_feedback(console, context, to_date_change);
7777
return true;
78-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
78+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
7979
home_to_date_time_Switch2_wireless_feedback(console, context, to_date_change);
8080
return true;
8181
default:;
@@ -150,7 +150,7 @@ void home_to_date_time(JoyconContext& context, bool to_date_change){
150150
Milliseconds tv = context->timing_variation();
151151
Milliseconds unit = 100ms + tv;
152152

153-
//From ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32
153+
//From ControllerPerformanceClass::SerialPABotBase_Wireless
154154
//as Joycon will only have that controller type
155155

156156
pbf_move_joystick(context, 255, 128, 2*unit, unit);

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context){
120120

121121
if (is_switch1(type)){
122122
switch (context->performance_class()){
123-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
123+
case ControllerPerformanceClass::SerialPABotBase_Wired:
124124
neutral_date_skip_switch1_wired(context);
125125
return;
126-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
126+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
127127
neutral_date_skip_switch1_wireless(context);
128128
return;
129129
case ControllerPerformanceClass::SysbotBase:
@@ -139,10 +139,10 @@ void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context){
139139

140140
if (is_switch2(type)){
141141
switch (context->performance_class()){
142-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
142+
case ControllerPerformanceClass::SerialPABotBase_Wired:
143143
neutral_date_skip_switch2_wired(context);
144144
return;
145-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
145+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
146146
neutral_date_skip_switch2_wireless(context);
147147
return;
148148
default:

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ void roll_date_backward_N(
173173

174174
if (is_switch1(type)){
175175
switch (context->performance_class()){
176-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
176+
case ControllerPerformanceClass::SerialPABotBase_Wired:
177177
roll_date_backward_N_Switch1_wired(context, skips, fast);
178178
return;
179-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
179+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
180180
roll_date_backward_N_Switch1_wireless(context, skips);
181181
return;
182182
case ControllerPerformanceClass::SysbotBase:
@@ -192,10 +192,10 @@ void roll_date_backward_N(
192192

193193
if (is_switch2(type)){
194194
switch (context->performance_class()){
195-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
195+
case ControllerPerformanceClass::SerialPABotBase_Wired:
196196
roll_date_backward_N_Switch2_wired(context, skips);
197197
return;
198-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
198+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
199199
roll_date_backward_N_Switch2_wireless(context, skips);
200200
return;
201201
default:

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ void roll_date_forward_1(
104104

105105
if (is_switch1(type)){
106106
switch (context->performance_class()){
107-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
107+
case ControllerPerformanceClass::SerialPABotBase_Wired:
108108
roll_date_forward_1_Switch1_wired(context, fast);
109109
return;
110-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
110+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
111111
roll_date_forward_1_Switch1_wireless(context);
112112
return;
113113
case ControllerPerformanceClass::SysbotBase:
@@ -123,10 +123,10 @@ void roll_date_forward_1(
123123

124124
if (is_switch2(type)){
125125
switch (context->performance_class()){
126-
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
126+
case ControllerPerformanceClass::SerialPABotBase_Wired:
127127
roll_date_forward_1_Switch2_wired(context);
128128
return;
129-
case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
129+
case ControllerPerformanceClass::SerialPABotBase_Wireless:
130130
roll_date_forward_1_Switch2_wireless(context);
131131
return;
132132
default:

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
99
#include "NintendoSwitch/NintendoSwitch_Settings.h"
1010
#include "NintendoSwitch_FriendCodeAdder.h"
11+
#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
1112
#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
1213
#include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
1314

@@ -72,6 +73,8 @@ FriendCodeAdder::FriendCodeAdder()
7273
void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
7374
grip_menu_connect_go_home(context);
7475

76+
ensure_at_home(env.console, context);
77+
7578
ConsoleType type = env.console.state().console_type();
7679
uint8_t scroll_down_slots = 0;
7780
if (is_switch1(type)){

0 commit comments

Comments
 (0)