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

usb2sock.c: stream goggles video out to vlc or the network #109

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

usb2sock.c: stream goggles video out to vlc or the network #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d767631
Update gradle from gradle-6.7.1 to gradle-7.5
davidhubbard Aug 2, 2024
ac156b5
Update target SDK to 33 (Android S) from sdk 31
davidhubbard Aug 2, 2024
74e0b1c
macOS utility for sharing Goggles v1/v2 on laptops
davidhubbard Aug 3, 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
23 changes: 12 additions & 11 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ android {
}
}
}
compileSdk 33

compileSdkVersion 31
buildToolsVersion "30.0.3"
buildToolsVersion '34.0.0'

defaultConfig {
applicationId "com.fpvout.digiview"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 33
versionCode 3
versionName '1.0.0'
resConfigs "en", "de", "fr", "es", "zh", "pt"
resConfigs 'en', 'de', 'fr', 'es', 'zh', 'pt'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -62,18 +62,19 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.fpvout.digiview'
}

dependencies {

implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
implementation 'io.sentry:sentry-android:4.3.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.preference:preference:1.2.1'

testImplementation 'junit:junit:4.+'
testImplementation 'junit:junit:4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.fpvout.digiview">
xmlns:tools="http://schemas.android.com/tools">

<uses-feature android:name="android.hardware.usb.host" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
Expand All @@ -26,6 +25,7 @@
android:launchMode="singleTask"
android:name="com.fpvout.digiview.MainActivity"
android:screenOrientation="sensorLandscape"
android:exported="true"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/fpvout/digiview/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ protected void onCreate(Bundle savedInstanceState) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
permissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
permissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
usbDeviceBroadcastReceiver = new UsbDeviceBroadcastReceiver(this);

IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
Expand Down Expand Up @@ -402,4 +402,4 @@ private void checkDataCollectionAgreement() {
}
}

}
}
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'


// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -22,4 +22,4 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri May 21 03:24:22 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
Loading