Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ui: show tethering status in sidebar #33786

Merged
merged 1 commit into from
Oct 14, 2024
+11 −4
Merged

ui: show tethering status in sidebar #33786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions selfdrive/ui/qt/network/wifi_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ void WifiManager::tetheringActivated(QDBusPendingCallWatcher *call) {
});
}
call->deleteLater();
tethering_on = true;
}

void WifiManager::setTetheringEnabled(bool enabled) {
Expand All @@ -465,6 +466,7 @@ void WifiManager::setTetheringEnabled(bool enabled) {

} else {
deactivateConnectionBySsid(tethering_ssid);
tethering_on = false;
}
}

Expand Down
1 change: 1 addition & 0 deletions selfdrive/ui/qt/network/wifi_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class WifiManager : public QObject {
QMap<QString, Network> seenNetworks;
QMap<QDBusObjectPath, QString> knownConnections;
QString ipv4_address;
bool tethering_on = false;
bool ipv4_forward = false;

explicit WifiManager(QObject* parent);
Expand Down
10 changes: 6 additions & 4 deletions selfdrive/ui/qt/sidebar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@ void Sidebar::updateState(const UIState &s) {

auto &sm = *(s.sm);

networking = networking ? networking : window()->findChild<Networking *>("");
bool tethering_on = networking && networking->wifi->tethering_on;
auto deviceState = sm["deviceState"].getDeviceState();
setProperty("netType", network_type[deviceState.getNetworkType()]);
int strength = (int)deviceState.getNetworkStrength();
setProperty("netType", tethering_on ? "Hotspot": network_type[deviceState.getNetworkType()]);
int strength = tethering_on ? 4 : (int)deviceState.getNetworkStrength();
setProperty("netStrength", strength > 0 ? strength + 1 : 0);

ItemStatus connectStatus;
Expand Down Expand Up @@ -131,8 +133,8 @@ void Sidebar::paintEvent(QPaintEvent *event) {

p.setFont(InterFont(35));
p.setPen(QColor(0xff, 0xff, 0xff));
const QRect r = QRect(50, 247, 100, 50);
p.drawText(r, Qt::AlignCenter, net_type);
const QRect r = QRect(58, 247, width() - 100, 50);
p.drawText(r, Qt::AlignLeft | Qt::AlignVCenter, net_type);

// metrics
drawMetric(p, temp_status.first, temp_status.second, 338);
Expand Down
2 changes: 2 additions & 0 deletions selfdrive/ui/qt/sidebar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <QMap>

#include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/network/networking.h"

typedef QPair<QPair<QString, QString>, QColor> ItemStatus;
Q_DECLARE_METATYPE(ItemStatus);
Expand Down Expand Up @@ -59,4 +60,5 @@ public slots:

private:
std::unique_ptr<PubMaster> pm;
Networking *networking = nullptr;
};
Loading