Skip to content

Commit 9cf3c44

Browse files
committed
Fix build.
1 parent 15a7937 commit 9cf3c44

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

SerialPrograms/Source/Integrations/DiscordWebhook.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void DiscordWebhookSender::process_reply(QNetworkReply* reply){
176176
}else{
177177
QString error_string = reply->errorString();
178178
QString url = reply->url().toString();
179-
size_t index = error_string.indexOf(url);
179+
qsizetype index = error_string.indexOf(url);
180180
if (index >= 0){
181181
error_string.replace(index, url.size(), "****************");
182182
}

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ TestProgram::TestProgram()
269269
// PA_ADD_OPTION(battle_AI);
270270
PA_ADD_OPTION(DATE0);
271271
PA_ADD_OPTION(DATE1);
272+
PA_ADD_OPTION(CONSOLE_MODEL);
272273
PA_ADD_OPTION(DURATION);
273274
PA_ADD_OPTION(COLOR);
274275
PA_ADD_OPTION(CONTROLLER_TABLE);
@@ -317,7 +318,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
317318
VideoOverlaySet overlays(overlay);
318319

319320

320-
#if 1
321+
322+
323+
324+
325+
326+
327+
328+
#if 0
321329
home_to_date_time(console, context, false);
322330
#endif
323331

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "PokemonSV/Options/PokemonSV_SinglesAIOption.h"
2525
#include "Common/Cpp/Options/ColorOption.h"
2626
#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h"
27+
#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
2728

2829
namespace PokemonAutomation{
2930
namespace NintendoSwitch{
@@ -77,6 +78,7 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
7778
// PokemonSV::PlayerListTable PLAYER_LIST;
7879
DateTimeOption DATE0;
7980
DateTimeOption DATE1;
81+
ConsoleModelOption CONSOLE_MODEL;
8082

8183
MillisecondsOption DURATION;
8284
ColorCell COLOR;

SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_ModelType.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ConsoleModelOption : public EnumDropdownOption<ConsoleModel>{
2727
: EnumDropdownOption<ConsoleModel>(
2828
std::move("Console Type:"),
2929
{
30-
{ConsoleModel::Switch1, "switch1", "Switch 1 + OLED."},
30+
{ConsoleModel::Switch1, "switch1", "Switch 1 + OLED"},
3131
{ConsoleModel::Switch2_International, "switch2", "Switch 2 (international)"},
3232
{ConsoleModel::Switch2_JapanLocked, "switch2-japan", "Switch 2 (Japan-locked)"},
3333
},

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp

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

7-
#include "Controllers/ControllerTypes.h"
87
#include "CommonFramework/Exceptions/OperationFailedException.h"
8+
//#include "CommonFramework/ImageTools/ImageStats.h"
9+
//#include "CommonFramework/VideoPipeline/VideoFeed.h"
10+
//#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
11+
#include "CommonTools/Async/InferenceRoutines.h"
12+
#include "Controllers/ControllerTypes.h"
913
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
1014
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
1115
#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
12-
#include "CommonTools/Async/InferenceRoutines.h"
13-
#include "CommonFramework/ImageTools/ImageStats.h"
14-
#include "CommonFramework/VideoPipeline/VideoFeed.h"
15-
#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
1616
#include "NintendoSwitch_Navigation.h"
1717

18-
#include <cmath>
19-
2018
namespace PokemonAutomation{
2119
namespace NintendoSwitch{
2220

0 commit comments

Comments
 (0)