Rename performance class enums.

Mysticial · Mysticial · commit 19465f9fa909 · 2025-07-10T21:02:11.000-07:00
diff --git a/SerialPrograms/Source/Controllers/ControllerTypes.h b/SerialPrograms/Source/Controllers/ControllerTypes.h
@@ -60,8 +60,8 @@ enum class ControllerFeature{
 
 enum class ControllerPerformanceClass{
     Unknown,
-    SerialPABotBase_Wired_125Hz,
-    SerialPABotBase_Wireless_ESP32,
+    SerialPABotBase_Wired,
+    SerialPABotBase_Wireless,
     SysbotBase,
 };
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h
@@ -51,7 +51,7 @@ class SerialPABotBase_PokkenController final :
         return m_supported_features;
     }
     virtual ControllerPerformanceClass performance_class() const override{
-        return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+        return ControllerPerformanceClass::SerialPABotBase_Wired;
     }
 
     virtual Milliseconds ticksize() const override{
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.h
@@ -49,7 +49,7 @@ class SerialPABotBase_WirelessJoycon final :
         return m_supported_features;
     }
     virtual ControllerPerformanceClass performance_class() const override{
-        return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;
+        return ControllerPerformanceClass::SerialPABotBase_Wireless;
     }
 
     virtual Milliseconds ticksize() const override{
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h
@@ -48,7 +48,7 @@ class SerialPABotBase_WirelessProController final :
         return m_supported_features;
     }
     virtual ControllerPerformanceClass performance_class() const override{
-        return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;
+        return ControllerPerformanceClass::SerialPABotBase_Wireless;
     }
 
     virtual Milliseconds ticksize() const override{
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h
@@ -44,8 +44,8 @@ class ProController_SysbotBase3 final :
     }
     virtual const ControllerFeatures& controller_features() const override;
     virtual ControllerPerformanceClass performance_class() const override{
-        //  TODO: Change to SerialPABotBase_Wired_125Hz when we prove it is stable.
-        return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+        //  TODO: Change to SerialPABotBase_Wired when we prove it is stable.
+        return ControllerPerformanceClass::SerialPABotBase_Wired;
 //        return ControllerPerformanceClass::SysbotBase;
     }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp
@@ -27,10 +27,10 @@ namespace NintendoSwitch{
 
 void home_to_date_time_Switch1_blind(Logger& logger, ProControllerContext& context, bool to_date_change){
     switch (context->performance_class()){
-    case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
         home_to_date_time_Switch1_wired_blind(logger, context, to_date_change);
         return;
-    case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
         home_to_date_time_Switch1_wireless_esp32_blind(logger, context, to_date_change);
         return;
     default:
@@ -41,7 +41,7 @@ void home_to_date_time_Switch1_blind(Logger& logger, ProControllerContext& conte
 }
 bool home_to_date_time_Switch1_feedback(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
     switch (context->performance_class()){
-    case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
         home_to_date_time_Switch1_wired_feedback(console, context, to_date_change);
         return true;
     default:;
@@ -55,10 +55,10 @@ void home_to_date_time_Switch2_blind(
     ConsoleType console_type, bool to_date_change
 ){
     switch (context->performance_class()){
-    case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
         home_to_date_time_Switch2_wired_blind(logger, context, console_type, to_date_change);
         return;
-    case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
         home_to_date_time_Switch2_wireless_blind(logger, context, console_type, to_date_change);
         return;
     default:
@@ -72,10 +72,10 @@ bool home_to_date_time_Switch2_feedback(
     ConsoleType console_type, bool to_date_change
 ){
     switch (context->performance_class()){
-    case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
         home_to_date_time_Switch2_wired_feedback(console, context, to_date_change);
         return true;
-    case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
         home_to_date_time_Switch2_wireless_feedback(console, context, to_date_change);
         return true;
     default:;
@@ -150,7 +150,7 @@ void home_to_date_time(JoyconContext& context, bool to_date_change){
     Milliseconds tv = context->timing_variation();
     Milliseconds unit = 100ms + tv;
 
-    //From ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32
+    //From ControllerPerformanceClass::SerialPABotBase_Wireless
     //as Joycon will only have that controller type
 
     pbf_move_joystick(context, 255, 128, 2*unit, unit);
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp
@@ -120,10 +120,10 @@ void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context){
 
     if (is_switch1(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             neutral_date_skip_switch1_wired(context);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             neutral_date_skip_switch1_wireless(context);
             return;
         case ControllerPerformanceClass::SysbotBase:
@@ -139,10 +139,10 @@ void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context){
 
     if (is_switch2(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             neutral_date_skip_switch2_wired(context);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             neutral_date_skip_switch2_wireless(context);
             return;
         default:
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp
@@ -173,10 +173,10 @@ void roll_date_backward_N(
 
     if (is_switch1(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             roll_date_backward_N_Switch1_wired(context, skips, fast);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             roll_date_backward_N_Switch1_wireless(context, skips);
             return;
         case ControllerPerformanceClass::SysbotBase:
@@ -192,10 +192,10 @@ void roll_date_backward_N(
 
     if (is_switch2(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             roll_date_backward_N_Switch2_wired(context, skips);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             roll_date_backward_N_Switch2_wireless(context, skips);
             return;
         default:
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp
@@ -104,10 +104,10 @@ void roll_date_forward_1(
 
     if (is_switch1(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             roll_date_forward_1_Switch1_wired(context, fast);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             roll_date_forward_1_Switch1_wireless(context);
             return;
         case ControllerPerformanceClass::SysbotBase:
@@ -123,10 +123,10 @@ void roll_date_forward_1(
 
     if (is_switch2(type)){
         switch (context->performance_class()){
-        case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
             roll_date_forward_1_Switch2_wired(context);
             return;
-        case ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32:
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
             roll_date_forward_1_Switch2_wireless(context);
             return;
         default:
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
@@ -8,6 +8,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_FriendCodeAdder.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
 
@@ -72,6 +73,8 @@ FriendCodeAdder::FriendCodeAdder()
 void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     grip_menu_connect_go_home(context);
 
+    ensure_at_home(env.console, context);
+
     ConsoleType type = env.console.state().console_type();
     uint8_t scroll_down_slots = 0;
     if (is_switch1(type)){
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
@@ -82,7 +82,7 @@ DaySkipperEU::DaySkipperEU()
 void DaySkipperEU::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch1;
 
-    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired;
 
     SkipperStats& stats = env.current_stats<SkipperStats>();
     stats.total_skips = SKIPS;
@@ -149,7 +149,7 @@ void DaySkipperEU::run_switch1(SingleSwitchProgramEnvironment& env, ProControlle
 void DaySkipperEU::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch2;
 
-    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz){
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
         throw UserSetupError(
             env.logger(),
             "This program requires a tick precise wired controller."
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
@@ -155,7 +155,7 @@ void DaySkipperJPN7p8k::program(SingleSwitchProgramEnvironment& env, ProControll
             "This program only works on the Switch 1."
         );
     }
-    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz){
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
         throw UserSetupError(
             env.logger(),
             "This program requires a tick precise wired controller."
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
@@ -75,7 +75,7 @@ DaySkipperJPN::DaySkipperJPN()
 void DaySkipperJPN::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch1;
 
-    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired;
 
     SkipperStats& stats = env.current_stats<SkipperStats>();
     stats.total_skips = SKIPS;
@@ -130,7 +130,7 @@ void DaySkipperJPN::run_switch1(SingleSwitchProgramEnvironment& env, ProControll
 void DaySkipperJPN::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch2;
 
-    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz){
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
         throw UserSetupError(
             env.logger(),
             "This program requires a tick precise wired controller."
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
@@ -81,7 +81,7 @@ DaySkipperUS::DaySkipperUS()
 void DaySkipperUS::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch1;
 
-    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+    bool needs_inference = context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired;
 
     SkipperStats& stats = env.current_stats<SkipperStats>();
     stats.total_skips = SKIPS;
@@ -148,7 +148,7 @@ void DaySkipperUS::run_switch1(SingleSwitchProgramEnvironment& env, ProControlle
 void DaySkipperUS::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch2;
 
-    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired_125Hz){
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
         throw UserSetupError(
             env.logger(),
             "This program requires a tick precise wired controller."

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class SerialPABotBase_PokkenController final :`
`51`	`51`	`return m_supported_features;`
`52`	`52`	`}`
`53`	`53`	`virtual ControllerPerformanceClass performance_class() const override{`
`54`		`- return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;`
	`54`	`+ return ControllerPerformanceClass::SerialPABotBase_Wired;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`virtual Milliseconds ticksize() const override{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class SerialPABotBase_WirelessJoycon final :`
`49`	`49`	`return m_supported_features;`
`50`	`50`	`}`
`51`	`51`	`virtual ControllerPerformanceClass performance_class() const override{`
`52`		`- return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;`
	`52`	`+ return ControllerPerformanceClass::SerialPABotBase_Wireless;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`virtual Milliseconds ticksize() const override{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class SerialPABotBase_WirelessProController final :`
`48`	`48`	`return m_supported_features;`
`49`	`49`	`}`
`50`	`50`	`virtual ControllerPerformanceClass performance_class() const override{`
`51`		`- return ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32;`
	`51`	`+ return ControllerPerformanceClass::SerialPABotBase_Wireless;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`virtual Milliseconds ticksize() const override{`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ class ProController_SysbotBase3 final :`
`44`	`44`	`}`
`45`	`45`	`virtual const ControllerFeatures& controller_features() const override;`
`46`	`46`	`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;`
`49`	`49`	`// return ControllerPerformanceClass::SysbotBase;`
`50`	`50`	`}`
`51`	`51`