forked from PokemonAutomation/Arduino-Source
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix wait waiting seconds instead of ticks
- Loading branch information
Showing
1 changed file
with
122 additions
and
122 deletions.
There are no files selected for viewing
244 changes: 122 additions & 122 deletions
244
SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,122 +1,122 @@ | ||
| /* Turbo Macro | ||
| * | ||
| * From: https://github.com/PokemonAutomation/Arduino-Source | ||
| * | ||
| */ | ||
|
|
||
| #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" | ||
| #include "NintendoSwitch/Options/TurboMacroTable.h" | ||
| #include "NintendoSwitch_TurboMacro.h" | ||
|
|
||
| namespace PokemonAutomation{ | ||
| namespace NintendoSwitch{ | ||
|
|
||
|
|
||
| TurboMacro_Descriptor::TurboMacro_Descriptor() | ||
| : SingleSwitchProgramDescriptor( | ||
| "NintendoSwitch:TurboMacro", | ||
| "Nintendo Switch", "Turbo Macro", | ||
| "", | ||
| "Create macros", | ||
| FeedbackType::NONE, | ||
| AllowCommandsWhenRunning::DISABLE_COMMANDS, | ||
| PABotBaseLevel::PABOTBASE_12KB | ||
| ) | ||
| {} | ||
|
|
||
| TurboMacro::TurboMacro() | ||
| : LOOP( | ||
| "<b>Number of times to loop:</b>", | ||
| LockMode::UNLOCK_WHILE_RUNNING, | ||
| 100, 0 | ||
| ) | ||
| { | ||
| PA_ADD_OPTION(LOOP); | ||
| PA_ADD_OPTION(MACRO); | ||
| } | ||
|
|
||
| void TurboMacro::run_macro(SingleSwitchProgramEnvironment& env, BotBaseContext& context){ | ||
| std::vector<std::unique_ptr<TurboMacroRow>> table = MACRO.copy_snapshot(); | ||
| for (const std::unique_ptr<TurboMacroRow>& row : table){ | ||
| execute_action(env.console, context, *row); | ||
| } | ||
| } | ||
|
|
||
| void TurboMacro::execute_action(ConsoleHandle& console, BotBaseContext& context, const TurboMacroRow& row){ | ||
| console.log("Execute action " + row.action.current_display()); | ||
| const TurboMacroCell& cell = row.parameters; | ||
| switch(row.action){ | ||
| case TurboMacroAction::LEFT_JOYSTICK: | ||
| pbf_move_left_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::RIGHT_JOYSTICK: | ||
| pbf_move_right_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::LEFT_JOY_CLICK: | ||
| pbf_press_button(context, BUTTON_LCLICK, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::RIGHT_JOY_CLICK: | ||
| pbf_press_button(context, BUTTON_RCLICK, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::B: | ||
| pbf_press_button(context, BUTTON_B, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::A: | ||
| pbf_press_button(context, BUTTON_A, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::Y: | ||
| pbf_press_button(context, BUTTON_Y, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::X: | ||
| pbf_press_button(context, BUTTON_X, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::R: | ||
| pbf_press_button(context, BUTTON_R, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::L: | ||
| pbf_press_button(context, BUTTON_L, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::ZR: | ||
| pbf_press_button(context, BUTTON_ZR,cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::ZL: | ||
| pbf_press_button(context, BUTTON_ZL, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::PLUS: | ||
| pbf_press_button(context, BUTTON_PLUS, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::MINUS: | ||
| pbf_press_button(context, BUTTON_MINUS, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADLEFT: | ||
| pbf_press_dpad(context, DPAD_LEFT, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADRIGHT: | ||
| pbf_press_dpad(context, DPAD_RIGHT, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADUP: | ||
| pbf_press_dpad(context, DPAD_UP, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADDOWN: | ||
| pbf_press_dpad(context, DPAD_DOWN, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::WAIT: | ||
| pbf_wait(context, (cell.wait_ticks * TICKS_PER_SECOND)); | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void TurboMacro::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){ | ||
|
|
||
| // Connect the controller. | ||
| //pbf_press_button(context, BUTTON_LCLICK, 5, 5); | ||
|
|
||
| for (uint32_t c = 0; c < LOOP; c++){ | ||
| run_macro(env, context); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
| } | ||
| /* Turbo Macro | ||
| * | ||
| * From: https://github.com/PokemonAutomation/Arduino-Source | ||
| * | ||
| */ | ||
|
|
||
| #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" | ||
| #include "NintendoSwitch/Options/TurboMacroTable.h" | ||
| #include "NintendoSwitch_TurboMacro.h" | ||
|
|
||
| namespace PokemonAutomation{ | ||
| namespace NintendoSwitch{ | ||
|
|
||
|
|
||
| TurboMacro_Descriptor::TurboMacro_Descriptor() | ||
| : SingleSwitchProgramDescriptor( | ||
| "NintendoSwitch:TurboMacro", | ||
| "Nintendo Switch", "Turbo Macro", | ||
| "", | ||
| "Create macros", | ||
| FeedbackType::NONE, | ||
| AllowCommandsWhenRunning::DISABLE_COMMANDS, | ||
| PABotBaseLevel::PABOTBASE_12KB | ||
| ) | ||
| {} | ||
|
|
||
| TurboMacro::TurboMacro() | ||
| : LOOP( | ||
| "<b>Number of times to loop:</b>", | ||
| LockMode::UNLOCK_WHILE_RUNNING, | ||
| 100, 0 | ||
| ) | ||
| { | ||
| PA_ADD_OPTION(LOOP); | ||
| PA_ADD_OPTION(MACRO); | ||
| } | ||
|
|
||
| void TurboMacro::run_macro(SingleSwitchProgramEnvironment& env, BotBaseContext& context){ | ||
| std::vector<std::unique_ptr<TurboMacroRow>> table = MACRO.copy_snapshot(); | ||
| for (const std::unique_ptr<TurboMacroRow>& row : table){ | ||
| execute_action(env.console, context, *row); | ||
| } | ||
| } | ||
|
|
||
| void TurboMacro::execute_action(ConsoleHandle& console, BotBaseContext& context, const TurboMacroRow& row){ | ||
| console.log("Execute action " + row.action.current_display()); | ||
| const TurboMacroCell& cell = row.parameters; | ||
| switch(row.action){ | ||
| case TurboMacroAction::LEFT_JOYSTICK: | ||
| pbf_move_left_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::RIGHT_JOYSTICK: | ||
| pbf_move_right_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::LEFT_JOY_CLICK: | ||
| pbf_press_button(context, BUTTON_LCLICK, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::RIGHT_JOY_CLICK: | ||
| pbf_press_button(context, BUTTON_RCLICK, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::B: | ||
| pbf_press_button(context, BUTTON_B, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::A: | ||
| pbf_press_button(context, BUTTON_A, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::Y: | ||
| pbf_press_button(context, BUTTON_Y, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::X: | ||
| pbf_press_button(context, BUTTON_X, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::R: | ||
| pbf_press_button(context, BUTTON_R, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::L: | ||
| pbf_press_button(context, BUTTON_L, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::ZR: | ||
| pbf_press_button(context, BUTTON_ZR,cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::ZL: | ||
| pbf_press_button(context, BUTTON_ZL, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::PLUS: | ||
| pbf_press_button(context, BUTTON_PLUS, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::MINUS: | ||
| pbf_press_button(context, BUTTON_MINUS, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADLEFT: | ||
| pbf_press_dpad(context, DPAD_LEFT, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADRIGHT: | ||
| pbf_press_dpad(context, DPAD_RIGHT, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADUP: | ||
| pbf_press_dpad(context, DPAD_UP, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::DPADDOWN: | ||
| pbf_press_dpad(context, DPAD_DOWN, cell.button_hold_ticks, cell.button_release_ticks); | ||
| break; | ||
| case TurboMacroAction::WAIT: | ||
| pbf_wait(context, cell.wait_ticks); | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void TurboMacro::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){ | ||
|
|
||
| // Connect the controller. | ||
| //pbf_press_button(context, BUTTON_LCLICK, 5, 5); | ||
|
|
||
| for (uint32_t c = 0; c < LOOP; c++){ | ||
| run_macro(env, context); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
| } |