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

Android Debug Bridge Toggle #34092

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Android Debug Bridge Toggle #34092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ca7a401
Added ADB menu to Developer Tab
amoghmunikote Nov 21, 2024
c535b36
Updating adb enable logic
amoghmunikote Nov 22, 2024
760f406
Fixed toggle
amoghmunikote Nov 22, 2024
2ac293b
Testing out ADB over USB
amoghmunikote Nov 23, 2024
b3966ea
Fixed path to existing script
amoghmunikote Nov 23, 2024
e0f38d7
reverted to old logic
amoghmunikote Nov 23, 2024
3430144
Reverting to working state
amoghmunikote Nov 23, 2024
72e390c
Fixed ADB persistence
amoghmunikote Nov 23, 2024
7061e89
Changed persistence name to AdbEnabled
amoghmunikote Dec 4, 2024
9b9d634
Fixed ADB persistance in developer panel
amoghmunikote Dec 6, 2024
422e795
Re-added network support for adb
amoghmunikote Dec 11, 2024
3cdf30c
removed duplicate adb network support
amoghmunikote Dec 11, 2024
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
1 change: 1 addition & 0 deletions common/params.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class FileLock {

std::unordered_map<std::string, uint32_t> keys = {
{"AccessToken", CLEAR_ON_MANAGER_START | DONT_LOG},
{"AdbEnabled", PERSISTENT},
{"AlwaysOnDM", PERSISTENT},
{"ApiCache_Device", PERSISTENT},
{"AssistNowToken", PERSISTENT},
Expand Down
21 changes: 15 additions & 6 deletions selfdrive/ui/qt/offroad/developer_panel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include <QDebug>

#include <QProcess>
#include <cstdlib>
#include "selfdrive/ui/qt/offroad/developer_panel.h"
#include "selfdrive/ui/qt/widgets/ssh_keys.h"
#include "selfdrive/ui/qt/widgets/controls.h"
#include "common/util.h"

DeveloperPanel::DeveloperPanel(SettingsWindow *parent) : ListWidget(parent) {
// SSH keys
addItem(new SshToggle());
addItem(new SshControl());

Expand All @@ -24,10 +24,18 @@ DeveloperPanel::DeveloperPanel(SettingsWindow *parent) : ListWidget(parent) {
});
addItem(longManeuverToggle);

// Joystick and longitudinal maneuvers should be hidden on release branches
adbToggle = new ParamControl("AdbEnabled", tr("Android Debug Bridge"), tr("Enable ADB"), "");
QObject::connect(adbToggle, &ParamControl::toggleFlipped, [=](bool state) {
if (state) {
QProcess::startDetached("sh", {"-c", "setprop service.adb.tcp.port 5555 && sudo systemctl start adbd"});
} else {
QProcess::startDetached("sh", {"-c", "sudo systemctl stop adbd"});
}
});
addItem(adbToggle);

is_release = params.getBool("IsReleaseBranch");

// Toggles should be not available to change in onroad state
QObject::connect(uiState(), &UIState::offroadTransition, this, &DeveloperPanel::updateToggles);
}

Expand All @@ -37,7 +45,6 @@ void DeveloperPanel::updateToggles(bool _offroad) {
btn->setEnabled(_offroad);
}

// longManeuverToggle should not be toggleable if the car don't have longitudinal control
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason to delete this coment?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake, I'll re-add the comment.

auto cp_bytes = params.get("CarParamsPersistent");
if (!cp_bytes.empty()) {
AlignedBuffer aligned_buf;
Expand All @@ -48,9 +55,11 @@ void DeveloperPanel::updateToggles(bool _offroad) {
longManeuverToggle->setEnabled(false);
}

adbToggle->setEnabled(_offroad);
amoghmunikote marked this conversation as resolved.
Show resolved Hide resolved

offroad = _offroad;
}

void DeveloperPanel::showEvent(QShowEvent *event) {
updateToggles(offroad);
}
}
3 changes: 2 additions & 1 deletion selfdrive/ui/qt/offroad/developer_panel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ class DeveloperPanel : public ListWidget {
Params params;
ParamControl* joystickToggle;
ParamControl* longManeuverToggle;
ParamControl* adbToggle;
bool is_release;
bool offroad;

private slots:
void updateToggles(bool _offroad);
};
};
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation>وضع المناورة الطولية</translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation>Modo de maniobra longitudinal</translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_ko.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation>롱컨 기동 모드</translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_pt-BR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation>Modo Longitudinal Maneuver</translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_th.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_tr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_zh-CHS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
8 changes: 8 additions & 0 deletions selfdrive/ui/translations/main_zh-CHT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
<source>Longitudinal Maneuver Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ADB over TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable ADB over TCP on port 5555</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DevicePanel</name>
Expand Down
Loading