Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,6 @@ GlobalSettings::GlobalSettings()
, m_advanced_options(
"<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
)
, ENABLE_PABOTBASE1(
"<b>Enable PABotBase1:</b><br>Enable support for the legacy PABotBase 1 protocol.<br>"
"Turn this on if you are still using Arduino Uno R3, Arduino Leonardo, Teensy, or Pro Micro. "
"Note that this feature is slated to be removed in September 2026.",
LockMode::UNLOCK_WHILE_RUNNING,
false
)
, DUMP_VIDEO_FORMATS(
"<b>Dump Video Formats:</b><br>Log all video formats supported by your capture card.",
LockMode::UNLOCK_WHILE_RUNNING,
Expand Down Expand Up @@ -226,7 +219,6 @@ GlobalSettings::GlobalSettings()

PA_ADD_STATIC(m_advanced_options);
add_option(PokemonAutomation::LOG_EVERYTHING(), "LOG_EVERYTHING");
PA_ADD_OPTION(ENABLE_PABOTBASE1);
PA_ADD_OPTION(DUMP_VIDEO_FORMATS);
PA_ADD_OPTION(SAVE_DEBUG_IMAGES);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ class GlobalSettings : public BatchOption, private ConfigOption::Listener, priva

SectionDividerOption m_advanced_options;

BooleanCheckBoxOption ENABLE_PABOTBASE1;
BooleanCheckBoxOption DUMP_VIDEO_FORMATS;
BooleanCheckBoxOption SAVE_DEBUG_IMAGES;
BooleanCheckBoxOption SAVE_DEBUG_VIDEOS_ON_SWITCH;
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/CommonFramework/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
#include "CommonTools/OCR/OCR_Routines.h"
#include "ControllerInput/ControllerInput.h"
#include "Controllers/SerialPortPollerQt.h"
#include "Controllers/SerialPort/SerialPortPollerQt.h"
#include "Integrations/DiscordWebhook.h"
#include "Windows/MainWindow.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "PABotBase2/SerialPABotBase2_Descriptor.h"

#include "SerialPABotBase/SerialPABotBase_SelectorWidget.h"
#include "PABotBase2/SerialPABotBase2_SelectorWidget.h"
#include "NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h"

Expand Down Expand Up @@ -55,9 +54,6 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe

// Add all the supported interfaces.
{
if (GlobalSettings::instance().ENABLE_PABOTBASE1){
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase);
}
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase2);
m_interface_list.emplace_back(ControllerInterface::TcpSysbotBase);
// m_interface_list.emplace_back(ControllerInterface::UsbSysbotBase);
Expand Down Expand Up @@ -212,11 +208,6 @@ void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_t
// m_status_text->setText(QString::fromStdString(html_color_text("Not Connected", COLOR_RED)));

switch (interface_type){
case ControllerInterface::SerialPABotBase:
m_selector = new SerialPABotBase::SerialPABotBase_SelectorWidget(*this, m_session.descriptor().get());
m_dropdowns->insertWidget(1, m_selector, 1);
break;

case ControllerInterface::SerialPABotBase2:
m_selector = new SerialPABotBase::SerialPABotBase2_SelectorWidget(*this, m_session.descriptor().get());
m_dropdowns->insertWidget(1, m_selector, 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "Common/Cpp/ColoredText.h"
#include "Controllers/ControllerTypeStrings.h"
#include "Controllers/ControllerSettings.h"
#include "Controllers/SerialPABotBase/SerialPABotBase.h"
#include "Controllers/SerialPort/SerialPABotBase.h"
#include "PABotBase2_DeviceHandle.h"

//#include <iostream>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifdef QT_CORE_LIB
#include <QSerialPortInfo>
#include <QMessageBox>
#include "Controllers/SerialPortPollerQt.h"
#include "Controllers/SerialPort/SerialPortPollerQt.h"
#endif
#include "Common/Cpp/ScopeExit.h"
#include "Common/Cpp/PrettyPrint.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "Common/Cpp/Concurrency/AsyncTask.h"
#include "Common/Cpp/SerialConnection/SerialConnection.h"
#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h"
#include "Controllers/SerialPort/SerialLogger.h"
#include "Controllers/PABotBase2/PABotBase2_Connection.h"
#include "Controllers/SerialPABotBase/Connection/MessageLogger.h"

namespace PokemonAutomation{
namespace SerialPABotBase{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "Common/Cpp/Json/JsonValue.h"
#include "Controllers/ControllerTypeStrings.h"
#ifdef QT_CORE_LIB
#include "Controllers/SerialPortPollerQt.h"
#include "Controllers/SerialPort/SerialPortPollerQt.h"
#endif
#include "SerialPABotBase2_Connection.h"
#include "SerialPABotBase2_Descriptor.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
*/

#include "Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h"
#include <QFileInfo>
#include "SerialPABotBase2_Descriptor.h"
#include "SerialPABotBase2_SelectorWidget.h"

Expand All @@ -19,6 +19,45 @@ template class RegisterUiStateQtWidget<SerialPABotBase::SerialPABotBase2_Selecto
namespace SerialPABotBase{



bool filter_serial_port(const QSerialPortInfo& port){
#ifdef _WIN32
// COM1 is never the correct port on Windows.
if (port.portName() == "COM1"){
return false;
}
#endif

#if defined(__APPLE__)
// exlude tty
if (port.portName().startsWith("tty.")){
return false;
}
// exclude system builtin serial ports
if (port.portName() == "cu.debug-console" ||
port.portName() == "cu.Bluetooth-Incoming-Port"
){
return false;
}
#endif

#if defined(__linux__)
const QString path = port.systemLocation();

QFileInfo file(path);
// Exclude devices that don't have Read/Write access
if (!(file.isReadable() && file.isWritable()))
{
return false;
}
#endif

return true;
}




SerialPABotBase2_SelectorWidget::SerialPABotBase2_SelectorWidget(
ControllerSelectorWidget& parent,
const ControllerDescriptor* current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Common/Qt/NoWheelComboBox.h"
#include "Controllers/ControllerDescriptor.h"
#include "Controllers/ControllerSelectorWidget.h"
#include "Controllers/SerialPortPollerQt.h"
#include "Controllers/SerialPort/SerialPortPollerQt.h"
#include "SerialPABotBase2_Descriptor.h"

//#include <iostream>
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading