Skip to content

Commit c302799

Browse files
MysticialMysticial
committed
naming
1 parent 917d7b3 commit c302799

13 files changed

+45
-46
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -698,13 +698,6 @@ file(GLOB MAIN_SOURCES
698698
Source/Controllers/ControllerTypeStrings.cpp
699699
Source/Controllers/ControllerTypeStrings.h
700700
Source/Controllers/ControllerTypes.h
701-
Source/Controllers/HidControllers/HID_Keyboard.cpp
702-
Source/Controllers/HidControllers/HID_Keyboard.h
703-
Source/Controllers/HidControllers/HID_Keyboard_ControllerButtons.h
704-
Source/Controllers/HidControllers/HID_Keyboard_SerialPABotBase.cpp
705-
Source/Controllers/HidControllers/HID_Keyboard_SerialPABotBase.h
706-
Source/Controllers/HidControllers/HID_KeyboardWithScheduler.cpp
707-
Source/Controllers/HidControllers/HID_KeyboardWithScheduler.h
708701
Source/Controllers/JoystickTools.h
709702
Source/Controllers/KeyboardInput/GlobalQtKeyMap.cpp
710703
Source/Controllers/KeyboardInput/GlobalQtKeyMap.h
@@ -733,6 +726,13 @@ file(GLOB MAIN_SOURCES
733726
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h
734727
Source/Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h
735728
Source/Controllers/SerialPABotBase/SerialPABotBase_StatusThread.h
729+
Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
730+
Source/Controllers/StandardHid/StandardHid_Keyboard.h
731+
Source/Controllers/StandardHid/StandardHid_Keyboard_ControllerButtons.h
732+
Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.cpp
733+
Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h
734+
Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp
735+
Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h
736736
Source/Integrations/DiscordIntegrationSettings.cpp
737737
Source/Integrations/DiscordIntegrationSettings.h
738738
Source/Integrations/DiscordIntegrationTable.cpp

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "SerialPABotBase_Descriptor.h"
1111
#include "SerialPABotBase_SelectorWidget.h"
1212

13-
#include "Controllers/HidControllers/HID_Keyboard_SerialPABotBase.h"
13+
#include "Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h"
1414
#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h"
1515
#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h"
1616
#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.h"
@@ -73,7 +73,7 @@ std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
7373
switch (controller_type){
7474
case ControllerType::HID_Keyboard:
7575
return std::unique_ptr<AbstractController>(
76-
new PokemonAutomation::HidControllers::SerialPABotBase_Keyboard(
76+
new PokemonAutomation::StandardHid::SerialPABotBase_Keyboard(
7777
logger,
7878
static_cast<SerialPABotBase_Connection&>(connection),
7979
reset_mode

SerialPrograms/Source/Controllers/HidControllers/HID_Keyboard.cpp renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "CommonTools/Async/InterruptableCommands.tpp"
99
#include "CommonTools/Async/SuperControlSession.tpp"
1010
#include "Controllers/KeyboardInput/KeyboardInput.h"
11-
#include "HID_Keyboard.h"
11+
#include "StandardHid_Keyboard.h"
1212

1313
//#include <iostream>
1414
//using std::cout;
@@ -17,10 +17,10 @@
1717
namespace PokemonAutomation{
1818

1919
// Instantiate some template helper classes.
20-
template class AsyncCommandSession<HidControllers::Keyboard>;
21-
template class SuperControlSession<HidControllers::Keyboard>;
20+
template class AsyncCommandSession<StandardHid::Keyboard>;
21+
template class SuperControlSession<StandardHid::Keyboard>;
2222

23-
namespace HidControllers{
23+
namespace StandardHid{
2424

2525
using namespace std::chrono_literals;
2626

SerialPrograms/Source/Controllers/HidControllers/HID_Keyboard.h renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
*
77
*/
88

9-
#ifndef PokemonAutomation_HID_Keyboard_H
10-
#define PokemonAutomation_HID_Keyboard_H
9+
#ifndef PokemonAutomation_StandardHid_Keyboard_H
10+
#define PokemonAutomation_StandardHid_Keyboard_H
1111

1212
#include <set>
1313
#include "Common/Cpp/Containers/Pimpl.h"
1414
#include "Controllers/Controller.h"
15-
#include "HID_Keyboard_ControllerButtons.h"
15+
#include "StandardHid_Keyboard_ControllerButtons.h"
1616

1717
namespace PokemonAutomation{
18-
namespace HidControllers{
18+
namespace StandardHid{
1919

2020

2121
class Keyboard;

SerialPrograms/Source/Controllers/HidControllers/HID_KeyboardWithScheduler.cpp renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*
55
*/
66

7-
#include "HID_KeyboardWithScheduler.h"
7+
#include "StandardHid_KeyboardWithScheduler.h"
88

99
namespace PokemonAutomation{
10-
namespace HidControllers{
10+
namespace StandardHid{
1111

1212

1313

SerialPrograms/Source/Controllers/HidControllers/HID_KeyboardWithScheduler.h renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
*
88
*/
99

10-
#ifndef PokemonAutomation_HID_KeyboardWithScheduler_H
11-
#define PokemonAutomation_HID_KeyboardWithScheduler_H
10+
#ifndef PokemonAutomation_StandardHid_KeyboardWithScheduler_H
11+
#define PokemonAutomation_StandardHid_KeyboardWithScheduler_H
1212

13-
#include <vector>
1413
#include <set>
1514
#include "Common/Cpp/CancellableScope.h"
1615
#include "Controllers/Schedulers/ControllerWithScheduler.h"
17-
#include "HID_Keyboard_ControllerButtons.h"
16+
#include "StandardHid_Keyboard_ControllerButtons.h"
1817

1918
namespace PokemonAutomation{
20-
namespace HidControllers{
19+
namespace StandardHid{
2120

2221

2322

SerialPrograms/Source/Controllers/HidControllers/HID_Keyboard_ControllerButtons.h renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_ControllerButtons.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*
55
*/
66

7-
#ifndef PokemonAutomation_HID_Keyboard_ControllerButtons_H
8-
#define PokemonAutomation_HID_Keyboard_ControllerButtons_H
7+
#ifndef PokemonAutomation_StandardHid_Keyboard_ControllerButtons_H
8+
#define PokemonAutomation_StandardHid_Keyboard_ControllerButtons_H
99

1010
#include <stdint.h>
1111

1212

1313
namespace PokemonAutomation{
14-
namespace HidControllers{
14+
namespace StandardHid{
1515

1616

1717
#if 0

SerialPrograms/Source/Controllers/HidControllers/HID_Keyboard_SerialPABotBase.cpp renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
88
#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h"
99
#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h"
10-
#include "HID_Keyboard_SerialPABotBase.h"
10+
#include "StandardHid_Keyboard_SerialPABotBase.h"
1111

1212
//#include <iostream>
1313
//using std::cout;
1414
//using std::endl;
1515

1616
namespace PokemonAutomation{
17-
namespace HidControllers{
17+
namespace StandardHid{
1818

1919
using namespace std::chrono_literals;
2020

SerialPrograms/Source/Controllers/HidControllers/HID_Keyboard_SerialPABotBase.h renamed to SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
*
55
*/
66

7-
#ifndef PokemonAutomation_HID_Keyboard_SerialPABotBase_H
8-
#define PokemonAutomation_HID_Keyboard_SerialPABotBase_H
7+
#ifndef PokemonAutomation_StandardHid_Keyboard_SerialPABotBase_H
8+
#define PokemonAutomation_StandardHid_Keyboard_SerialPABotBase_H
99

1010
#include "ClientSource/Connection/BotBase.h"
1111
#include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
1212
#include "Controllers/SerialPABotBase/SerialPABotBase_StatusThread.h"
13-
#include "HID_Keyboard.h"
14-
#include "HID_KeyboardWithScheduler.h"
13+
#include "StandardHid_Keyboard.h"
14+
#include "StandardHid_KeyboardWithScheduler.h"
1515

1616
namespace PokemonAutomation{
17-
namespace HidControllers{
17+
namespace StandardHid{
1818

1919

2020

‎SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ void keyboard_enter_code(
3030
KeyboardLayout keyboard_layout, const std::string& code,
3131
bool include_plus
3232
){
33-
auto* keyboard = context->cast<HidControllers::Keyboard>();
33+
auto* keyboard = context->cast<StandardHid::Keyboard>();
3434
if (keyboard){
35-
HidControllers::KeyboardContext subcontext(context);
35+
StandardHid::KeyboardContext subcontext(context);
3636
keyboard_enter_code(console, subcontext, code, include_plus);
3737
return;
3838
}
@@ -54,11 +54,11 @@ void keyboard_enter_code(
5454

5555

5656
void keyboard_enter_code(
57-
ConsoleHandle& console, HidControllers::KeyboardContext& context,
57+
ConsoleHandle& console, StandardHid::KeyboardContext& context,
5858
const std::string& code,
5959
bool include_plus
6060
){
61-
using namespace HidControllers;
61+
using namespace StandardHid;
6262

6363
Milliseconds delay = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.TIME_UNIT;
6464
Milliseconds hold = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.HOLD;

0 commit comments

Comments
 (0)