Skip to content

Commit 45c7c6d

Browse files
committed
Fix the Home Page Swap.
1 parent 0203de0 commit 45c7c6d

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
2626
const bool IS_BETA_VERSION = true;
2727
const int PROGRAM_VERSION_MAJOR = 0;
2828
const int PROGRAM_VERSION_MINOR = 52;
29-
const int PROGRAM_VERSION_PATCH = 3;
29+
const int PROGRAM_VERSION_PATCH = 4;
3030

3131
const std::string PROGRAM_VERSION_BASE =
3232
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

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, "Switch: Wired Pro Controller"},
23-
{ControllerType::NintendoSwitch_WirelessProController, "Switch: Wireless Pro Controller"},
24-
{ControllerType::NintendoSwitch_LeftJoycon, "Switch: Left Joycon"},
25-
{ControllerType::NintendoSwitch_RightJoycon, "Switch: Right Joycon"},
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"},
2626
};
2727

2828
const EnumStringMap<ControllerFeature> CONTROLLER_FEATURE_STRINGS{

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@
138138
//#include "Kernels/ImageScaling/Kernels_ImageScaling_Default.h"
139139
//#include "Kernels/ImageScaling/Kernels_ImageScaling_x64_SSE41.h"
140140
#endif
141+
#include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
142+
//#include "Common/SerialPABotBase/LightweightWallClock_StdChrono.h"
141143

142144
//#include <opencv2/core.hpp>
143145
#include <random>
@@ -259,6 +261,21 @@ std::atomic<size_t> CheckedObject<Type>::m_instances(0);
259261

260262

261263

264+
#if 0
265+
struct RequestManagerConfig{
266+
using ClockType = LightweightWallClock_StdChrono;
267+
using ClockDuration = LightweightDuration_StdChrono;
268+
using SeqnumType = seqnum_t;
269+
using MessageSizeType = uint8_t;
270+
static constexpr size_t MAX_MESSAGE_SIZE = 64;
271+
static constexpr size_t QUEUE_SIZE = 64;
272+
};
273+
#endif
274+
275+
276+
277+
278+
262279

263280

264281

@@ -273,8 +290,6 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
273290

274291
using namespace std::chrono_literals;
275292

276-
277-
278293
SparseArray data{
279294
{100, "0123456789"},
280295
{120, {'a', 0x20, 'd'}},

SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void PageSwap::program(SingleSwitchProgramEnvironment& env, ProControllerContext
5050
pbf_press_button(context, BUTTON_RCLICK, 5, 5);
5151
}
5252

53-
const uint16_t PICKUP_DELAY = 125;
53+
const uint16_t PICKUP_DELAY = 250;
5454
const uint16_t SCROLL_DELAY = 20;
5555

5656
for (uint8_t i = 0; i < 2; i++){

0 commit comments

Comments
 (0)