Skip to content

Commit b4af7dc

Browse files
MysticialMysticial
committed
Fix build. More renaming.
1 parent 5930362 commit b4af7dc

13 files changed

+29
-27
lines changed

‎SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS{
1919

2020
const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS{
2121
{ControllerType::None, "None"},
22-
{ControllerType::NintendoSwitch_WiredProController, "NS: Wired Pro Controller"},
23-
{ControllerType::NintendoSwitch_WirelessProController, "NS: Wireless Pro Controller"},
24-
{ControllerType::NintendoSwitch_LeftJoycon, "NS: Left Joycon"},
25-
{ControllerType::NintendoSwitch_RightJoycon, "NS: Right Joycon"},
22+
{ControllerType::NintendoSwitch_WiredController, "NS1: Wired Controller"},
23+
{ControllerType::NintendoSwitch_WirelessProController, "NS1: Wireless Pro Controller"},
24+
{ControllerType::NintendoSwitch_LeftJoycon, "NS1: Left Joycon"},
25+
{ControllerType::NintendoSwitch_RightJoycon, "NS1: Right Joycon"},
2626
};
2727

2828
const EnumStringMap<ControllerFeature> CONTROLLER_FEATURE_STRINGS{

‎SerialPrograms/Source/Controllers/ControllerTypes.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ enum class ControllerInterface{
3030
enum class ControllerType{
3131
None,
3232

33-
// There's a difference between the generic 3rd party wired controllers and
34-
// a pro controller connected over USB. If/when we support the latter, we
35-
// will need to split this controller type.
36-
NintendoSwitch_WiredProController,
33+
// This is for all the generic wired controllers.
34+
// These do not support gyro or rumble.
35+
NintendoSwitch_WiredController,
36+
37+
// The official Pro Controller, connected over USB.
38+
// NintendoSwitch_WiredProController,
3739

3840
NintendoSwitch_WirelessProController,
3941
NintendoSwitch_LeftJoycon,

‎SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ControllerType id_to_controller_type(uint32_t id){
5151
case PABB_CID_NONE:
5252
return ControllerType::None;
5353
case PABB_CID_NINTENDO_SWITCH_WIRED_PRO_CONTROLLER:
54-
return ControllerType::NintendoSwitch_WiredProController;
54+
return ControllerType::NintendoSwitch_WiredController;
5555
case PABB_CID_NINTENDO_SWITCH_WIRELESS_PRO_CONTROLLER:
5656
return ControllerType::NintendoSwitch_WirelessProController;
5757
case PABB_CID_NINTENDO_SWITCH_LEFT_JOYCON:
@@ -68,7 +68,7 @@ uint32_t controller_type_to_id(ControllerType controller_type){
6868
switch (controller_type){
6969
case ControllerType::None:
7070
return PABB_CID_NONE;
71-
case ControllerType::NintendoSwitch_WiredProController:
71+
case ControllerType::NintendoSwitch_WiredController:
7272
return PABB_CID_NINTENDO_SWITCH_WIRED_PRO_CONTROLLER;
7373
case ControllerType::NintendoSwitch_WirelessProController:
7474
return PABB_CID_NINTENDO_SWITCH_WIRELESS_PRO_CONTROLLER;
@@ -110,7 +110,7 @@ const std::map<
110110
}},
111111
{2025061307, {
112112
{PABB_PID_PABOTBASE_ESP32S3, {
113-
{ControllerType::NintendoSwitch_WiredProController, {
113+
{ControllerType::NintendoSwitch_WiredController, {
114114
ControllerFeature::TickPrecise,
115115
ControllerFeature::NintendoSwitch_ProController,
116116
ControllerFeature::NintendoSwitch_DateSkip,
@@ -119,35 +119,35 @@ const std::map<
119119
}},
120120
{2025061406, {
121121
{PABB_PID_PABOTBASE_ArduinoUnoR3, {
122-
{ControllerType::NintendoSwitch_WiredProController, {
122+
{ControllerType::NintendoSwitch_WiredController, {
123123
ControllerFeature::TickPrecise,
124124
ControllerFeature::NintendoSwitch_ProController,
125125
ControllerFeature::NintendoSwitch_DateSkip,
126126
}},
127127
}},
128128
{PABB_PID_PABOTBASE_ArduinoLeonardo, {
129-
{ControllerType::NintendoSwitch_WiredProController, {
129+
{ControllerType::NintendoSwitch_WiredController, {
130130
ControllerFeature::TickPrecise,
131131
ControllerFeature::NintendoSwitch_ProController,
132132
ControllerFeature::NintendoSwitch_DateSkip,
133133
}},
134134
}},
135135
{PABB_PID_PABOTBASE_ProMicro, {
136-
{ControllerType::NintendoSwitch_WiredProController, {
136+
{ControllerType::NintendoSwitch_WiredController, {
137137
ControllerFeature::TickPrecise,
138138
ControllerFeature::NintendoSwitch_ProController,
139139
ControllerFeature::NintendoSwitch_DateSkip,
140140
}},
141141
}},
142142
{PABB_PID_PABOTBASE_Teensy2, {
143-
{ControllerType::NintendoSwitch_WiredProController, {
143+
{ControllerType::NintendoSwitch_WiredController, {
144144
ControllerFeature::TickPrecise,
145145
ControllerFeature::NintendoSwitch_ProController,
146146
ControllerFeature::NintendoSwitch_DateSkip,
147147
}},
148148
}},
149149
{PABB_PID_PABOTBASE_TeensyPP2, {
150-
{ControllerType::NintendoSwitch_WiredProController, {
150+
{ControllerType::NintendoSwitch_WiredController, {
151151
ControllerFeature::TickPrecise,
152152
ControllerFeature::NintendoSwitch_ProController,
153153
ControllerFeature::NintendoSwitch_DateSkip,

‎SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
6969
ControllerType controller_type
7070
) const{
7171
switch (controller_type){
72-
case ControllerType::NintendoSwitch_WiredProController:
72+
case ControllerType::NintendoSwitch_WiredController:
7373
return std::unique_ptr<AbstractController>(
7474
new PokemonAutomation::NintendoSwitch::SerialPABotBase_WiredController(
7575
logger,

‎SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_PostConnectActions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void run_post_connect_actions_ESP32(
3232

3333
ControllerType desired_controller = change_controller.value();
3434
switch (desired_controller){
35-
case ControllerType::NintendoSwitch_WiredProController:
35+
case ControllerType::NintendoSwitch_WiredController:
3636
case ControllerType::NintendoSwitch_WirelessProController:
3737
case ControllerType::NintendoSwitch_LeftJoycon:
3838
case ControllerType::NintendoSwitch_RightJoycon:{

‎SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#include <sstream>
8-
#include "Common/SerialPABotBase/SerialPABotBase_Messages_NS_Generic.h"
8+
#include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WiredController.h"
99
#include "ClientSource/Libraries/MessageConverter.h"
1010
#include "CommonFramework/GlobalSettingsPanel.h"
1111
#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerState.h"

‎SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ ControllerProfile ControllerSettingsTable::get_or_make_profile(
299299

300300
// Only relevant to Switch controllers.
301301
switch (controller){
302-
case ControllerType::NintendoSwitch_WiredProController:
302+
case ControllerType::NintendoSwitch_WiredController:
303303
case ControllerType::NintendoSwitch_WirelessProController:
304304
case ControllerType::NintendoSwitch_LeftJoycon:
305305
case ControllerType::NintendoSwitch_RightJoycon:

‎SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SerialPABotBase_WiredController::SerialPABotBase_WiredController(
3232
: ProController(logger)
3333
, SerialPABotBase_Controller(
3434
logger,
35-
ControllerType::NintendoSwitch_WiredProController,
35+
ControllerType::NintendoSwitch_WiredController,
3636
connection
3737
)
3838
, m_stopping(false)

‎SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SerialPABotBase_WiredController final :
4545

4646
public:
4747
virtual ControllerType controller_type() const override{
48-
return ControllerType::NintendoSwitch_WiredProController;
48+
return ControllerType::NintendoSwitch_WiredController;
4949
}
5050
virtual const ControllerFeatures& controller_features() const override{
5151
return m_supported_features;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ProController_SysbotBase3 final :
4040

4141
public:
4242
virtual ControllerType controller_type() const override{
43-
return ControllerType::NintendoSwitch_WiredProController;
43+
return ControllerType::NintendoSwitch_WiredController;
4444
}
4545
virtual const ControllerFeatures& controller_features() const override;
4646
virtual ControllerPerformanceClass performance_class() const override{

0 commit comments

Comments
 (0)