brianhansonxyz/clearpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-04-28 15:44:33 -05:00
parent 244b27e467
commit 0ec0d8368f
4 changed files with 49 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
selfdrive/ui/qt/home.cc
View File

@@ -17,9 +17,8 @@
// HomeWindow: the container for the offroad and onroad UIs // HomeWindow: the container for the offroad and onroad UIs
HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) { HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
_parent = parent;
// Start hidden at first // Start hidden at first
// _parent->setVisible(false); parent->setVisible(false)
// CLEARPILOT Sidebar set to invisible in drive view. // CLEARPILOT Sidebar set to invisible in drive view.
params.putBool("Sidebar", false); params.putBool("Sidebar", false);
@@ -29,7 +28,6 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
main_layout->setSpacing(0); main_layout->setSpacing(0);
sidebar = new Sidebar(this); sidebar = new Sidebar(this);
sidebar->setVisible(false);
main_layout->addWidget(sidebar); main_layout->addWidget(sidebar);
QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings); QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings);
@@ -38,7 +36,6 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
home = new OffroadHome(this); home = new OffroadHome(this);
QObject::connect(home, &OffroadHome::openSettings, this, &HomeWindow::openSettings); QObject::connect(home, &OffroadHome::openSettings, this, &HomeWindow::openSettings);
home->setVisible(false);
slayout->addWidget(home); slayout->addWidget(home);
onroad = new OnroadWindow(this); onroad = new OnroadWindow(this);
@@ -100,11 +97,9 @@ void HomeWindow::offroadTransition(bool offroad) {
slayout->setCurrentWidget(onroad); slayout->setCurrentWidget(onroad);
uiState()->scene.map_open = onroad->isMapVisible(); uiState()->scene.map_open = onroad->isMapVisible();
} }
// _parent->setVisible(true);
} }
void HomeWindow::showDriverView(bool show, bool started) { void HomeWindow::showDriverView(bool show, bool started) {
// _parent->setVisible(true);
if (show) { if (show) {
emit closeSettings(); emit closeSettings();
slayout->setCurrentWidget(driver_view); slayout->setCurrentWidget(driver_view);
@@ -131,11 +126,9 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) {
// params.putBool("Sidebar", sidebar->isVisible()); // params.putBool("Sidebar", sidebar->isVisible());
// } // }
// CLEARPILOT - click ready shows home // CLEARPILOT - click ready shows home
if (!onroad->isVisible() && ready->isVisible()) { if (!onroad->isVisible() && ready->isVisible()) {
sidebar->setVisible(true); sidebar->setVisible(true);
home->setVisible(false);
slayout->setCurrentWidget(home); slayout->setCurrentWidget(home);
} }
@@ -272,7 +265,9 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) {
void OffroadHome::showEvent(QShowEvent *event) { void OffroadHome::showEvent(QShowEvent *event) {
refresh(); refresh();
// CLEARPILOT changed timeout to 2 min // CLEARPILOT changed timeout to 2 min
// What does this even do?
timer->start(120 * 1000); timer->start(120 * 1000);
// slayout->addWidget(ready);
} }
void OffroadHome::hideEvent(QHideEvent *event) { void OffroadHome::hideEvent(QHideEvent *event) {

2
selfdrive/ui/ui.cc
View File

@@ -390,7 +390,7 @@ void ui_update_frogpilot_params(UIState *s) {
scene.screen_brightness = screen_management ? params.getInt("ScreenBrightness") : 101; scene.screen_brightness = screen_management ? params.getInt("ScreenBrightness") : 101;
scene.screen_brightness_onroad = screen_management ? params.getInt("ScreenBrightnessOnroad") : 101; scene.screen_brightness_onroad = screen_management ? params.getInt("ScreenBrightnessOnroad") : 101;
scene.screen_recorder = screen_management && params.getBool("ScreenRecorder"); scene.screen_recorder = screen_management && params.getBool("ScreenRecorder");
scene.screen_timeout = screen_management ? params.getInt("ScreenTimeout") : 30; scene.screen_timeout = screen_management ? params.getInt("ScreenTimeout") : 120;
scene.screen_timeout_onroad = screen_management ? params.getInt("ScreenTimeoutOnroad") : 10; scene.screen_timeout_onroad = screen_management ? params.getInt("ScreenTimeoutOnroad") : 10;
scene.standby_mode = screen_management && params.getBool("StandbyMode"); scene.standby_mode = screen_management && params.getBool("StandbyMode");

1
system/clearpilot/configure/defaults.sh Normal file
View File

@@ -0,0 +1 @@
echo 120 > /data/params/d/ScreenTimeout

391
system/clearpilot/tools/wifimanager.cc
View File

@@ -72,369 +72,62 @@ static const int ICON_WIDTH = 49;
// Networking functions // Networking functions
Networking::Networking(QWidget* parent, bool show_advanced) : QFrame(parent) {
main_layout = new QStackedLayout(this);
wifi = new WifiManager(this); QWidget * Setup::network_setup() {
connect(wifi, &WifiManager::refreshSignal, this, &Networking::refresh); QWidget *widget = new QWidget();
connect(wifi, &WifiManager::wrongPassword, this, &Networking::wrongPassword); QVBoxLayout *main_layout = new QVBoxLayout(widget);
main_layout->setContentsMargins(55, 50, 55, 50);
wifiScreen = new QWidget(this); // title
QVBoxLayout* vlayout = new QVBoxLayout(wifiScreen); QLabel *title = new QLabel(tr("Connect to Wi-Fi"));
vlayout->setContentsMargins(20, 20, 20, 20); title->setStyleSheet("font-size: 90px; font-weight: 500;");
if (show_advanced) { main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop);
QPushButton* advancedSettings = new QPushButton(tr("Advanced"));
advancedSettings->setObjectName("advanced_btn");
advancedSettings->setStyleSheet("margin-right: 30px;");
advancedSettings->setFixedSize(400, 100);
connect(advancedSettings, &QPushButton::clicked, [=]() { main_layout->setCurrentWidget(an); });
vlayout->addSpacing(10);
vlayout->addWidget(advancedSettings, 0, Qt::AlignRight);
vlayout->addSpacing(10);
}
wifiWidget = new WifiUI(this, wifi); main_layout->addSpacing(25);
wifiWidget->setObjectName("wifiWidget");
connect(wifiWidget, &WifiUI::connectToNetwork, this, &Networking::connectToNetwork);
ScrollView *wifiScroller = new ScrollView(wifiWidget, this); // wifi widget
wifiScroller->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); Networking *networking = new Networking(this, false);
vlayout->addWidget(wifiScroller, 1); networking->setStyleSheet("Networking {background-color: #292929; border-radius: 13px;}");
main_layout->addWidget(wifiScreen); main_layout->addWidget(networking, 1);
an = new AdvancedNetworking(this, wifi); main_layout->addSpacing(35);
connect(an, &AdvancedNetworking::backPress, [=]() { main_layout->setCurrentWidget(wifiScreen); });
connect(an, &AdvancedNetworking::requestWifiScreen, [=]() { main_layout->setCurrentWidget(wifiScreen); });
main_layout->addWidget(an);
QPalette pal = palette(); // back + continue buttons
pal.setColor(QPalette::Window, QColor(0x29, 0x29, 0x29)); QHBoxLayout *blayout = new QHBoxLayout;
setAutoFillBackground(true); main_layout->addLayout(blayout);
setPalette(pal); blayout->setSpacing(50);
setStyleSheet(R"(
#wifiWidget > QPushButton, #back_btn, #advanced_btn {
font-size: 50px;
margin: 0px;
padding: 15px;
border-width: 0;
border-radius: 30px;
color: #dddddd;
background-color: #393939;
}
#back_btn:pressed, #advanced_btn:pressed {
background-color: #4a4a4a;
}
)");
main_layout->setCurrentWidget(wifiScreen);
}
void Networking::refresh() {
wifiWidget->refresh();
an->refresh();
}
void Networking::connectToNetwork(const Network n) {
if (wifi->isKnownConnection(n.ssid)) {
wifi->activateWifiConnection(n.ssid);
} else if (n.security_type == SecurityType::OPEN) {
wifi->connect(n, false);
} else if (n.security_type == SecurityType::WPA) {
QString pass = InputDialog::getText(tr("Enter password"), this, tr("for \"%1\"").arg(QString::fromUtf8(n.ssid)), true, 8);
if (!pass.isEmpty()) {
wifi->connect(n, false, pass);
}
}
}
void Networking::wrongPassword(const QString &ssid) {
if (wifi->seenNetworks.contains(ssid)) {
const Network &n = wifi->seenNetworks.value(ssid);
QString pass = InputDialog::getText(tr("Wrong password"), this, tr("for \"%1\"").arg(QString::fromUtf8(n.ssid)), true, 8);
if (!pass.isEmpty()) {
wifi->connect(n, false, pass);
}
}
}
void Networking::showEvent(QShowEvent *event) {
wifi->start();
}
void Networking::hideEvent(QHideEvent *event) {
main_layout->setCurrentWidget(wifiScreen);
wifi->stop();
}
// AdvancedNetworking functions
AdvancedNetworking::AdvancedNetworking(QWidget* parent, WifiManager* wifi): QWidget(parent), wifi(wifi) {
QVBoxLayout* main_layout = new QVBoxLayout(this);
main_layout->setMargin(40);
main_layout->setSpacing(20);
// Back button
QPushButton *back = new QPushButton(tr("Back")); QPushButton *back = new QPushButton(tr("Back"));
back->setObjectName("back_btn"); back->setObjectName("navBtn");
back->setFixedSize(400, 100); QObject::connect(back, &QPushButton::clicked, this, &Setup::prevPage);
connect(back, &QPushButton::clicked, [=]() { emit backPress(); }); blayout->addWidget(back);
main_layout->addWidget(back, 0, Qt::AlignLeft);
ListWidget *list = new ListWidget(this); QPushButton *cont = new QPushButton();
// Enable tethering layout cont->setObjectName("navBtn");
tetheringToggle = new ToggleControl(tr("Enable Tethering"), "", "", wifi->isTetheringEnabled()); cont->setProperty("primary", true);
list->addItem(tetheringToggle); QObject::connect(cont, &QPushButton::clicked, this, &Setup::nextPage);
QObject::connect(tetheringToggle, &ToggleControl::toggleFlipped, this, &AdvancedNetworking::toggleTethering); blayout->addWidget(cont);
if (params.getBool("TetheringEnabled")) {
tetheringToggle->refresh();
uiState()->scene.tethering_enabled = true;
}
// Change tethering password // setup timer for testing internet connection
ButtonControl *editPasswordButton = new ButtonControl(tr("Tethering Password"), tr("EDIT")); HttpRequest *request = new HttpRequest(this, false, 2500);
connect(editPasswordButton, &ButtonControl::clicked, [=]() { QObject::connect(request, &HttpRequest::requestDone, [=](const QString &, bool success) {
QString pass = InputDialog::getText(tr("Enter new tethering password"), this, "", true, 8, wifi->getTetheringPassword()); cont->setEnabled(success);
if (!pass.isEmpty()) { if (success) {
wifi->changeTetheringPassword(pass); const bool wifi = networking->wifi->currentNetworkType() == NetworkType::WIFI;
} cont->setText(wifi ? tr("Continue") : tr("Continue without Wi-Fi"));
});
list->addItem(editPasswordButton);
// IP address
ipLabel = new LabelControl(tr("IP Address"), wifi->ipv4_address);
list->addItem(ipLabel);
// SSH keys
list->addItem(new SshToggle());
list->addItem(new SshControl());
// Roaming toggle
const bool roamingEnabled = params.getBool("GsmRoaming");
roamingToggle = new ToggleControl(tr("Enable Roaming"), "", "", roamingEnabled);
QObject::connect(roamingToggle, &ToggleControl::toggleFlipped, [=](bool state) {
params.putBool("GsmRoaming", state);
wifi->updateGsmSettings(state, QString::fromStdString(params.get("GsmApn")), params.getBool("GsmMetered"));
});
list->addItem(roamingToggle);
// APN settings
editApnButton = new ButtonControl(tr("APN Setting"), tr("EDIT"));
connect(editApnButton, &ButtonControl::clicked, [=]() {
const QString cur_apn = QString::fromStdString(params.get("GsmApn"));
QString apn = InputDialog::getText(tr("Enter APN"), this, tr("leave blank for automatic configuration"), false, -1, cur_apn).trimmed();
if (apn.isEmpty()) {
params.remove("GsmApn");
} else { } else {
params.put("GsmApn", apn.toStdString()); cont->setText(tr("Waiting for internet"));
} }
wifi->updateGsmSettings(params.getBool("GsmRoaming"), apn, params.getBool("GsmMetered")); repaint();
}); });
list->addItem(editApnButton); request->sendRequest(OPENPILOT_URL);
QTimer *timer = new QTimer(this);
// Metered toggle QObject::connect(timer, &QTimer::timeout, [=]() {
const bool metered = params.getBool("GsmMetered"); if (!request->active() && cont->isVisible()) {
meteredToggle = new ToggleControl(tr("Cellular Metered"), tr("Prevent large data uploads when on a metered connection"), "", metered); request->sendRequest(OPENPILOT_URL);
QObject::connect(meteredToggle, &SshToggle::toggleFlipped, [=](bool state) {
params.putBool("GsmMetered", state);
wifi->updateGsmSettings(params.getBool("GsmRoaming"), QString::fromStdString(params.get("GsmApn")), state);
});
list->addItem(meteredToggle);
// Hidden Network
hiddenNetworkButton = new ButtonControl(tr("Hidden Network"), tr("CONNECT"));
connect(hiddenNetworkButton, &ButtonControl::clicked, [=]() {
QString ssid = InputDialog::getText(tr("Enter SSID"), this, "", false, 1);
if (!ssid.isEmpty()) {
QString pass = InputDialog::getText(tr("Enter password"), this, tr("for \"%1\"").arg(ssid), true, -1);
Network hidden_network;
hidden_network.ssid = ssid.toUtf8();
if (!pass.isEmpty()) {
hidden_network.security_type = SecurityType::WPA;
wifi->connect(hidden_network, true, pass);
} else {
wifi->connect(hidden_network, true);
}
emit requestWifiScreen();
} }
}); });
list->addItem(hiddenNetworkButton); timer->start(1000);
// Set initial config return widget;
wifi->updateGsmSettings(roamingEnabled, QString::fromStdString(params.get("GsmApn")), metered);
connect(uiState(), &UIState::primeTypeChanged, this, [=](PrimeType prime_type) {
bool gsmVisible = prime_type == PrimeType::NONE || prime_type == PrimeType::LITE;
roamingToggle->setVisible(gsmVisible);
editApnButton->setVisible(gsmVisible);
meteredToggle->setVisible(gsmVisible);
});
main_layout->addWidget(new ScrollView(list, this));
main_layout->addStretch(1);
}
void AdvancedNetworking::refresh() {
ipLabel->setText(wifi->ipv4_address);
tetheringToggle->setEnabled(true);
update();
}
void AdvancedNetworking::toggleTethering(bool enabled) {
wifi->setTetheringEnabled(enabled);
tetheringToggle->setEnabled(false);
params.putBool("TetheringEnabled", enabled);
uiState()->scene.tethering_enabled = enabled;
}
// WifiUI functions
WifiUI::WifiUI(QWidget *parent, WifiManager* wifi) : QWidget(parent), wifi(wifi) {
QVBoxLayout *main_layout = new QVBoxLayout(this);
main_layout->setContentsMargins(0, 0, 0, 0);
main_layout->setSpacing(0);
// load imgs
for (const auto &s : {"low", "medium", "high", "full"}) {
QPixmap pix(ASSET_PATH + "/offroad/icon_wifi_strength_" + s + ".svg");
strengths.push_back(pix.scaledToHeight(68, Qt::SmoothTransformation));
}
lock = QPixmap(ASSET_PATH + "offroad/icon_lock_closed.svg").scaledToWidth(ICON_WIDTH, Qt::SmoothTransformation);
checkmark = QPixmap(ASSET_PATH + "offroad/icon_checkmark.svg").scaledToWidth(ICON_WIDTH, Qt::SmoothTransformation);
circled_slash = QPixmap(ASSET_PATH + "img_circled_slash.svg").scaledToWidth(ICON_WIDTH, Qt::SmoothTransformation);
scanningLabel = new QLabel(tr("Scanning for networks..."));
scanningLabel->setStyleSheet("font-size: 65px;");
main_layout->addWidget(scanningLabel, 0, Qt::AlignCenter);
wifi_list_widget = new ListWidget(this);
wifi_list_widget->setVisible(false);
main_layout->addWidget(wifi_list_widget);
setStyleSheet(R"(
QScrollBar::handle:vertical {
min-height: 0px;
border-radius: 4px;
background-color: #8A8A8A;
}
#forgetBtn {
font-size: 32px;
font-weight: 600;
color: #292929;
background-color: #BDBDBD;
border-width: 1px solid #828282;
border-radius: 5px;
padding: 40px;
padding-bottom: 16px;
padding-top: 16px;
}
#forgetBtn:pressed {
background-color: #828282;
}
#connecting {
font-size: 32px;
font-weight: 600;
color: white;
border-radius: 0;
padding: 27px;
padding-left: 43px;
padding-right: 43px;
background-color: black;
}
#ssidLabel {
text-align: left;
border: none;
padding-top: 50px;
padding-bottom: 50px;
}
#ssidLabel:disabled {
color: #696969;
}
)");
}
void WifiUI::refresh() {
bool is_empty = wifi->seenNetworks.isEmpty();
scanningLabel->setVisible(is_empty);
wifi_list_widget->setVisible(!is_empty);
if (is_empty) return;
setUpdatesEnabled(false);
const bool is_tethering_enabled = wifi->isTetheringEnabled();
QList<Network> sortedNetworks = wifi->seenNetworks.values();
std::sort(sortedNetworks.begin(), sortedNetworks.end(), compare_by_strength);
int n = 0;
for (Network &network : sortedNetworks) {
QPixmap status_icon;
if (network.connected == ConnectedType::CONNECTED) {
status_icon = checkmark;
} else if (network.security_type == SecurityType::UNSUPPORTED) {
status_icon = circled_slash;
} else if (network.security_type == SecurityType::WPA) {
status_icon = lock;
}
bool show_forget_btn = wifi->isKnownConnection(network.ssid) && !is_tethering_enabled;
QPixmap strength = strengths[strengthLevel(network.strength)];
auto item = getItem(n++);
item->setItem(network, status_icon, show_forget_btn, strength);
item->setVisible(true);
}
for (; n < wifi_items.size(); ++n) wifi_items[n]->setVisible(false);
setUpdatesEnabled(true);
}
WifiItem *WifiUI::getItem(int n) {
auto item = n < wifi_items.size() ? wifi_items[n] : wifi_items.emplace_back(new WifiItem(tr("CONNECTING..."), tr("FORGET")));
if (!item->parentWidget()) {
QObject::connect(item, &WifiItem::connectToNetwork, this, &WifiUI::connectToNetwork);
QObject::connect(item, &WifiItem::forgotNetwork, [this](const Network n) {
if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(n.ssid)), tr("Forget"), this))
wifi->forgetConnection(n.ssid);
});
wifi_list_widget->addItem(item);
}
return item;
}
// WifiItem
WifiItem::WifiItem(const QString &connecting_text, const QString &forget_text, QWidget *parent) : QWidget(parent) {
QHBoxLayout *hlayout = new QHBoxLayout(this);
hlayout->setContentsMargins(44, 0, 73, 0);
hlayout->setSpacing(50);
hlayout->addWidget(ssidLabel = new ElidedLabel());
ssidLabel->setObjectName("ssidLabel");
ssidLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
hlayout->addWidget(connecting = new QPushButton(connecting_text), 0, Qt::AlignRight);
connecting->setObjectName("connecting");
hlayout->addWidget(forgetBtn = new QPushButton(forget_text), 0, Qt::AlignRight);
forgetBtn->setObjectName("forgetBtn");
hlayout->addWidget(iconLabel = new QLabel(), 0, Qt::AlignRight);
hlayout->addWidget(strengthLabel = new QLabel(), 0, Qt::AlignRight);
iconLabel->setFixedWidth(ICON_WIDTH);
QObject::connect(forgetBtn, &QPushButton::clicked, [this]() { emit forgotNetwork(network); });
QObject::connect(ssidLabel, &ElidedLabel::clicked, [this]() {
if (network.connected == ConnectedType::DISCONNECTED) emit connectToNetwork(network);
});
}
void WifiItem::setItem(const Network &n, const QPixmap &status_icon, bool show_forget_btn, const QPixmap &strength_icon) {
network = n;
ssidLabel->setText(n.ssid);
ssidLabel->setEnabled(n.security_type != SecurityType::UNSUPPORTED);
ssidLabel->setFont(InterFont(55, network.connected == ConnectedType::DISCONNECTED ? QFont::Normal : QFont::Bold));
connecting->setVisible(n.connected == ConnectedType::CONNECTING);
forgetBtn->setVisible(show_forget_btn);
iconLabel->setPixmap(status_icon);
strengthLabel->setPixmap(strength_icon);
} }