Skip to content

Commit 6175bbf

Browse files
MysticialMysticial
committed
Merge branch 'main' into pr/1101
2 parents d65389b + 1e81733 commit 6175bbf

16 files changed

Lines changed: 68 additions & 60 deletions

File tree

‎.azure-pipelines/azure-pipelines.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ stages:
241241
}
242242
Write-Host "=== Archive created ==="
243243
displayName: 'Archive Windows build artifact'
244-
condition: and(succeeded(), ne('${{ parameters.buildType }}', 'Commit'))
244+
condition: succeeded()
245245
env:
246246
ARTIFACT_PASSWORD: $(ARTIFACT_PASSWORD)
247247
@@ -262,7 +262,7 @@ stages:
262262
- task: PublishPipelineArtifact@1
263263
displayName: 'Publish Windows artifact (PrivateBeta)'
264264
inputs:
265-
targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/SerialPrograms-Windows-$(compiler)-$(architecture).zip'
265+
targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build/SerialPrograms-Windows-$(compiler)-$(architecture).zip'
266266
artifactName: 'SerialPrograms-Windows-$(compiler)-$(architecture)'
267267
publishLocation: 'pipeline'
268268
condition: and(succeeded(), eq('${{ parameters.buildType }}', 'PrivateBeta'))
@@ -461,7 +461,7 @@ stages:
461461
- task: PublishPipelineArtifact@1
462462
displayName: 'Publish Linux artifact (PrivateBeta)'
463463
inputs:
464-
targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/SerialPrograms-Ubuntu-$(compiler)-$(architecture).zip'
464+
targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build/SerialPrograms-Ubuntu-$(compiler)-$(architecture).zip'
465465
artifactName: 'SerialPrograms-Linux-$(compiler)-$(architecture)'
466466
publishLocation: 'pipeline'
467467
condition: and(succeeded(), eq('${{ parameters.buildType }}', 'PrivateBeta'))

‎Common/PABotBase2/PABotBase2_MessageProtocol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace PABotBase2{
2323

2424

2525

26-
#define PABB2_MESSAGE_PROTOCOL_VERSION 2026050800
26+
#define PABB2_MESSAGE_PROTOCOL_VERSION 2026050900
2727

2828

2929
struct PABB_PACK MessageHeader{

‎SerialPrograms/Source/CommonFramework/Globals.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace PokemonAutomation{
3939
#endif
4040

4141
#ifndef PA_VERSION_PATCH
42-
#define PA_VERSION_PATCH 3
42+
#define PA_VERSION_PATCH 5
4343
#endif
4444

4545
const bool IS_BETA_VERSION = PA_IS_BETA;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ const std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>>& SUPPORTED_VERSIONS(
5757
// These version #'s are for the MLC layer.
5858
const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES2(){
5959
static const std::map<pabb_ProgramID, uint32_t> database{
60-
{PABB_PID_UNSPECIFIED, 2026050800},
61-
{PABB_PID_PABOTBASE_ESP32, 2026050800},
62-
{PABB_PID_PABOTBASE_ESP32S3, 2026050800},
63-
{PABB_PID_PABOTBASE_Pico1, 2026050800},
64-
{PABB_PID_PABOTBASE_Pico2, 2026050800},
60+
{PABB_PID_UNSPECIFIED, 2026050900},
61+
{PABB_PID_PABOTBASE_ESP32, 2026050900},
62+
{PABB_PID_PABOTBASE_ESP32S3, 2026050900},
63+
{PABB_PID_PABOTBASE_Pico1, 2026050900},
64+
{PABB_PID_PABOTBASE_Pico2, 2026050900},
6565
};
6666
return database;
6767
}

‎SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
#include "CommonTools/Images/ImageTools.h"
175175
#include "PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
176176
#include "Controllers/RumbleListener.h"
177+
#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
177178

178179

179180

@@ -335,8 +336,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
335336

336337
auto snapshot = feed.snapshot();
337338

338-
YCommIconWatcher detector;
339-
cout << detector.process_frame(snapshot, current_time()) << endl;
339+
SelectionArrowFinder arrow(overlay, {0.462377, 0.332039, 0.388222, 0.640777});
340+
341+
cout << arrow.detect(snapshot) << endl;
342+
343+
auto arrows = arrow.last_detection();
344+
if (!arrows.empty()){
345+
cout << arrows[0].y << endl;
346+
}
340347

341348
// WhiteDialogBoxDetector detector;
342349
// detector.make_overlays(overlays);

‎SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
6767
ret.emplace_back("---- Testing ----");
6868
ret.emplace_back(make_single_switch_program<BoxDraw_Descriptor, BoxDraw>());
6969
ret.emplace_back(make_single_switch_program<SnapshotDumper_Descriptor, SnapshotDumper>());
70-
ret.emplace_back(make_single_switch_program<MenuStabilityTester_Descriptor, MenuStabilityTester>());
7170

7271
if (PreloadSettings::instance().DEVELOPER_MODE){
7372
ret.emplace_back("---- Developer Tools ----");
73+
ret.emplace_back(make_single_switch_program<MenuStabilityTester_Descriptor, MenuStabilityTester>());
7474
ret.emplace_back(make_computer_program<TestProgramComputer_Descriptor, TestProgramComputer>());
7575
ret.emplace_back(make_multi_switch_program<TestProgram_Descriptor, TestProgram>());
7676
ret.emplace_back(make_single_switch_program<JoyconProgram_Descriptor, JoyconProgram>());

‎SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ ConsoleSettings::ConsoleSettings()
123123
LockMode::UNLOCK_WHILE_RUNNING,
124124
false
125125
)
126-
, DATE_MENU_OPEN_SWITCH2(
126+
, DATE_MENU_OPEN_SWITCH2_0(
127127
"<b>Open Date Menu (Switch 2):</b>",
128128
LockMode::LOCK_WHILE_RUNNING,
129129
"208 ms"
130130
)
131-
, DATE_MENU_CLOSE_SWITCH2(
131+
, DATE_MENU_CLOSE_SWITCH2_0(
132132
"<b>Close Date Menu (Switch 2):</b>",
133133
LockMode::LOCK_WHILE_RUNNING,
134-
"288 ms"
134+
"264 ms"
135135
)
136136
, CODEBOARD_ENTRY_SWITCH1_WIRED(
137137
"Fast Code Entry Timings (Switch 1 Wired Controller)",
@@ -166,8 +166,8 @@ ConsoleSettings::ConsoleSettings()
166166
PA_ADD_OPTION(ENABLE_SBB3_PINGS);
167167
PA_ADD_OPTION(ENABLE_SBB3_LOGGING);
168168
PA_ADD_OPTION(TIMING_OPTIONS);
169-
PA_ADD_OPTION(DATE_MENU_OPEN_SWITCH2);
170-
PA_ADD_OPTION(DATE_MENU_CLOSE_SWITCH2);
169+
PA_ADD_OPTION(DATE_MENU_OPEN_SWITCH2_0);
170+
PA_ADD_OPTION(DATE_MENU_CLOSE_SWITCH2_0);
171171
if (PreloadSettings::instance().DEVELOPER_MODE){
172172
PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH1_WIRED);
173173
PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH1_WIRELESS);

‎SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class ConsoleSettings : public BatchOption{
5555

5656
TimingOptions TIMING_OPTIONS;
5757

58-
MillisecondsOption DATE_MENU_OPEN_SWITCH2;
59-
MillisecondsOption DATE_MENU_CLOSE_SWITCH2;
58+
MillisecondsOption DATE_MENU_OPEN_SWITCH2_0;
59+
MillisecondsOption DATE_MENU_CLOSE_SWITCH2_0;
6060

6161
CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH1_WIRED;
6262
CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH1_WIRELESS;

‎SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void init_view(ProControllerContext& context){
3737
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
3838
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
3939
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
40-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2.get() + tv, 80ms);
40+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
4141
}
4242

4343

@@ -50,15 +50,15 @@ void increment_day_us(ProControllerContext& context){
5050
Milliseconds tv = context->timing_variation();
5151
Milliseconds unit = 24ms + tv;
5252

53-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2.get() + tv, 80ms);
53+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
5454
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
5555
ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
5656
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
5757
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
5858
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
5959
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
6060
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
61-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2.get() + tv, 80ms);
61+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
6262
}
6363
void increment_day_eu(ProControllerContext& context){
6464
ThrottleScope scope(context->logging_throttler());
@@ -69,14 +69,14 @@ void increment_day_eu(ProControllerContext& context){
6969
Milliseconds tv = context->timing_variation();
7070
Milliseconds unit = 24ms + tv;
7171

72-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2.get() + tv, 80ms);
72+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
7373
ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
7474
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7575
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7676
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7777
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7878
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
79-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2.get() + tv, 80ms);
79+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
8080
}
8181
void increment_day_jp(ProControllerContext& context){
8282
ThrottleScope scope(context->logging_throttler());
@@ -87,14 +87,14 @@ void increment_day_jp(ProControllerContext& context){
8787
Milliseconds tv = context->timing_variation();
8888
Milliseconds unit = 24ms + tv;
8989

90-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2.get() + tv, 80ms);
90+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
9191
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
9292
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
9393
ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
9494
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
9595
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
9696
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
97-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2.get() + tv, 80ms);
97+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
9898
}
9999

100100

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,47 +72,47 @@ void neutral_date_skip_switch1_sbb(ProControllerContext& context){
7272
ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
7373
}
7474
void neutral_date_skip_switch2_wired(ProControllerContext& context){
75-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2, 80ms);
75+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
7676
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
7777
ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
7878
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
7979
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8080
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8181
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8282
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
83-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2, 80ms);
84-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2, 80ms);
83+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
84+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
8585
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8686
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
8787
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8888
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
8989
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
9090
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
9191
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
92-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2, 80ms);
92+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
9393
}
9494
void neutral_date_skip_switch2_wireless(ProControllerContext& context){
9595
Milliseconds tv = context->timing_variation();
9696
Milliseconds unit = 24ms + tv;
9797

98-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2, 80ms);
98+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
9999
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
100100
ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
101101
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
102102
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
103103
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
104104
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
105105
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
106-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2, 80ms);
107-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2, 80ms);
106+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
107+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
108108
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
109109
ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
110110
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
111111
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
112112
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
113113
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
114114
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
115-
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2, 80ms);
115+
ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
116116
}
117117

118118

0 commit comments

Comments
 (0)