Skip to content

Commit fd019c0

Browse files
committed
Don't hang if internet is broken. Require fixed ESP32-S3.
1 parent 77e7336 commit fd019c0

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ std::string download_file(Logger& logger, const std::string& url){
5252
);
5353

5454
QNetworkRequest request(QUrl(QString::fromStdString(url)));
55+
request.setTransferTimeout(std::chrono::seconds(5));
5556
reply.reset(network_access_manager.get(request));
5657

5758
#if 0

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,6 @@ const std::map<
160160
}},
161161
}},
162162
{2025081700, {
163-
{PABB_PID_PABOTBASE_ESP32S3, {
164-
{ControllerType::NintendoSwitch_WiredController, {
165-
ControllerFeature::TickPrecise,
166-
ControllerFeature::NintendoSwitch_ProController,
167-
ControllerFeature::NintendoSwitch_DateSkip,
168-
}},
169-
{ControllerType::NintendoSwitch2_WiredController, {
170-
ControllerFeature::TickPrecise,
171-
ControllerFeature::NintendoSwitch_ProController,
172-
ControllerFeature::NintendoSwitch_DateSkip,
173-
}},
174-
}},
175163
{PABB_PID_PABOTBASE_ESP32, {
176164
{ControllerType::NintendoSwitch_WirelessProController, {
177165
ControllerFeature::TickPrecise,
@@ -187,6 +175,20 @@ const std::map<
187175
}},
188176
}},
189177
}},
178+
{2025081711, {
179+
{PABB_PID_PABOTBASE_ESP32S3, {
180+
{ControllerType::NintendoSwitch_WiredController, {
181+
ControllerFeature::TickPrecise,
182+
ControllerFeature::NintendoSwitch_ProController,
183+
ControllerFeature::NintendoSwitch_DateSkip,
184+
}},
185+
{ControllerType::NintendoSwitch2_WiredController, {
186+
ControllerFeature::TickPrecise,
187+
ControllerFeature::NintendoSwitch_ProController,
188+
ControllerFeature::NintendoSwitch_DateSkip,
189+
}},
190+
}},
191+
}},
190192
};
191193

192194

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const std::vector<JoyconColors>& OFFICIAL_JOYCON_COLORS0(){
163163
const std::vector<ProconColors>& OFFICIAL_PROCON_COLORS0(){
164164
// From: https://gbatemp.net/threads/people-with-special-edition-pro-controllers-i-need-your-help-with-colors.627413/
165165
const static std::vector<ProconColors> database{
166-
{"Procon: Stock Black", 0x323232, 0x323232, 0x323232, 0xFFFFFF},
166+
{"Procon: Stock Black", 0x323232, 0x323232, 0x323232, 0xFFFFFF}, // This is just a guess.
167167
{"Procon: Super Smash Bros. Ultimate", 0xFFFFFF, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},
168168
{"Procon: Monster Hunter Rise", 0x474646, 0x474646, 0x2D2D2D, 0xE7E6E6},
169169
{"Procon: Zelda Tears of the Kingdom", 0x464646, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},

0 commit comments

Comments
 (0)