diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts
index ae7f4fb..44343fa 100644
--- a/desktop-app/src/app/adb-client.service.ts
+++ b/desktop-app/src/app/adb-client.service.ts
@@ -12,6 +12,7 @@ export enum ConnectionStatus {
CONNECTED,
OFFLINE,
UNAUTHORIZED,
+ DEV_MODE,
DISCONNECTED,
LINUX_PERMS,
}
@@ -82,6 +83,7 @@ export class AdbClientService {
'connection-status-unauthorized': this.deviceStatus === ConnectionStatus.UNAUTHORIZED,
'connection-status-disconnected': this.deviceStatus === ConnectionStatus.DISCONNECTED,
'connection-status-too-many': this.deviceStatus === ConnectionStatus.LINUX_PERMS,
+ 'connection-status-dev-mode': this.deviceStatus === ConnectionStatus.DEV_MODE,
};
}
@@ -287,7 +289,16 @@ export class AdbClientService {
}
getConnectedStatus() {
if (!this.devices.length) {
- return ConnectionStatus.DISCONNECTED;
+ if (
+ this.diagnostics &&
+ this.diagnostics.usb &&
+ !this.diagnostics.usb.is_dev_mode_enabled &&
+ this.diagnostics.usb.is_connected
+ ) {
+ return ConnectionStatus.DEV_MODE;
+ } else {
+ return ConnectionStatus.DISCONNECTED;
+ }
} else {
if (!this.deviceSerial) {
let readyDevice = this.devices.filter(d => d.type === 'device');
@@ -313,6 +324,7 @@ export class AdbClientService {
}
async updateConnectedStatus() {
+ this.diagBegin();
this.deviceStatus = this.getConnectedStatus();
this.setConnectionCssClass();
for (let i = 0; i < this.devices.length; i++) {
@@ -320,7 +332,6 @@ export class AdbClientService {
}
this.displayDevices = this.devices;
document.getElementById('connection-status').className = 'connection-status-' + status;
- this.diagBegin();
switch (this.deviceStatus) {
case ConnectionStatus.LINUX_PERMS:
this.deviceStatusMessage = 'Warning: no permissions. ADB udev rules missing.';
@@ -378,6 +389,17 @@ export class AdbClientService {
this.deviceIp
: '');
break;
+ case ConnectionStatus.DEV_MODE:
+ this.deviceStatusMessage =
+ 'Dev Mode: Enable dev mode in the Oculus phone app. ' +
+ (this.deviceIp
+ ? ' ' +
+ ' wifi' +
+ ' ' +
+ this.deviceIp
+ : '');
+ break;
}
}
diff --git a/desktop-app/src/app/app.module.ts b/desktop-app/src/app/app.module.ts
index 0acc618..1f3abb3 100644
--- a/desktop-app/src/app/app.module.ts
+++ b/desktop-app/src/app/app.module.ts
@@ -27,6 +27,8 @@ import { CurrentTasksComponent } from './current-tasks/current-tasks.component';
import { CurrentTaskItemComponent } from './current-task-item/current-task-item.component';
import { VirtualScrollerModule } from 'ngx-virtual-scroller';
import { HeadsetSettingsComponent } from './headset-settings/headset-settings.component';
+import { SetupGuideComponent } from './setup-guide/setup-guide.component';
+import { ConnectionStatusComponent } from './connection-status/connection-status.component';
@NgModule({
declarations: [
AppComponent,
@@ -46,6 +48,8 @@ import { HeadsetSettingsComponent } from './headset-settings/headset-settings.co
CurrentTasksComponent,
CurrentTaskItemComponent,
HeadsetSettingsComponent,
+ SetupGuideComponent,
+ ConnectionStatusComponent,
],
imports: [
BrowserModule,
diff --git a/desktop-app/src/app/app.routes.ts b/desktop-app/src/app/app.routes.ts
index 91caffd..9cdc214 100644
--- a/desktop-app/src/app/app.routes.ts
+++ b/desktop-app/src/app/app.routes.ts
@@ -5,13 +5,15 @@ import { WebviewComponent } from './webview/webview.component';
import { FilesComponent } from './files/files.component';
import { CurrentTasksComponent } from './current-tasks/current-tasks.component';
import { HeadsetSettingsComponent } from './headset-settings/headset-settings.component';
+import { SetupGuideComponent } from './setup-guide/setup-guide.component';
export const AppRoutes: Routes = [
- { path: 'setup', component: SetupComponent },
+ // { path: 'setup', component: SetupComponent },
{ path: 'tasks', component: CurrentTasksComponent },
{ path: 'packages', component: PackagesComponent },
{ path: 'packages/:packageName', component: PackagesComponent },
{ path: 'tools', component: HeadsetSettingsComponent },
+ { path: 'setup', component: SetupGuideComponent },
{ path: 'webview', component: WebviewComponent },
{ path: 'device-files', component: FilesComponent },
{ path: '**', component: WebviewComponent },
diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts
index aaccbfc..8983eb7 100644
--- a/desktop-app/src/app/app.service.ts
+++ b/desktop-app/src/app/app.service.ts
@@ -26,6 +26,7 @@ export class AppService {
showTaskActions: boolean;
updateAvailable: boolean;
showRepo: boolean;
+ isSetupOpen: boolean;
isFilesOpen: boolean;
isPackagesOpen: boolean;
isSettingsOpen: boolean;
diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html
index af3b58b..7aa09b0 100644
--- a/desktop-app/src/app/header/header.component.html
+++ b/desktop-app/src/app/header/header.component.html
@@ -85,6 +85,7 @@
+