Add print vehicle to car-rs, update android gradle versions

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

.idea/gradle.xml

@@ -4,9 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +18,6 @@
             <option value="$PROJECT_DIR$/pycar" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

app/build.gradle

@@ -4,12 +4,11 @@ plugins{
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
-    buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "org.vato.carcontroller"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -27,24 +26,25 @@ android {
     buildFeatures {
         mlModelBinding true
     }
+    namespace 'org.vato.carcontroller'
 }
 
 dependencies {
     implementation project(':protobuf')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.0'
     implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
-    implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1'
+    implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2'
     implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-protobuf-lite:1.39.0' // CURRENT_GRPC_VERSION
-    implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION
+    implementation 'io.grpc:grpc-stub:1.39.0' // CURRENT_GRPC_VERSION
-    implementation 'javax.annotation:javax.annotation-api:1.2'
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'org.zeromq:jeromq:0.5.2'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.vato.carcontroller">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -12,7 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="org.vato.carcontroller.SLAM.SlamController"></activity>
+        <activity android:name="org.vato.carcontroller.SLAM.SlamController" />
         <activity android:name="org.vato.carcontroller.LIDAR.LidarTrackingController" />
         <activity
             android:name="org.vato.carcontroller.SettingsActivity"
@@ -20,6 +19,7 @@
             android:parentActivityName="org.vato.carcontroller.MainActivity" />
         <activity android:name="org.vato.carcontroller.SimpleController" />
         <activity
+            android:exported="true"
             android:name="org.vato.carcontroller.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

build.gradle

@@ -3,10 +3,9 @@
 buildscript {
     repositories {
         google()
-        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +16,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenLocal()
     }
 }

car-rs/src/lib.rs

@@ -173,3 +173,29 @@ impl<T: Servo> Vehicle for ServoVehicle<T> {
         self.steering_servo.set_value(steering);
     }
 }
+
+#[derive(Default, Debug)]
+pub struct PrintVehicle {
+    throttle: f64,
+    steering: f64,
+}
+
+impl Vehicle for PrintVehicle {
+    fn get_throttle(&self) -> f64 {
+        self.throttle
+    }
+
+    fn set_throttle(&mut self, throttle: f64) {
+        println!("New Throttle: {}", throttle);
+        self.throttle = throttle;
+    }
+
+    fn get_steering(&self) -> f64 {
+        self.steering
+    }
+
+    fn set_steering(&mut self, steering: f64) {
+        println!("New Steering: {}", steering);
+        self.steering = steering;
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists