Skip to content

Rebuild networking to use TCP vs UDP #6

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

Open
dmssargent wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Rebuild networking to use TCP vs UDP #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
63f3625
Start work on porting the connection to TCP
dmssargent Jul 28, 2015
4df1447
Build a basic mirror server
dmssargent Jul 30, 2015
bb9d56a
Add heartbeating, remove old UDP code from client, change ASCII from …
dmssargent Aug 1, 2015
d13c9e9
Work on server
dmssargent Aug 2, 2015
c19457f
Start squishing those pesky bugs :)
dmssargent Aug 3, 2015
cb52e25
Squish those bugs :)
dmssargent Aug 3, 2015
53a1b1b
Re-package and got some of it working. Yipee!
dmssargent Aug 4, 2015
9509dcc
Re-package and got some of it working. Yipee!
dmssargent Aug 4, 2015
1e3ee76
Work on bug-fixing
dmssargent Aug 5, 2015
bc9b948
Work on bug-fixing
dmssargent Aug 5, 2015
f9b80f0
Fix some more problems
dmssargent Aug 5, 2015
945b4be
Squish those bugs :)
dmssargent Aug 5, 2015
029d905
Fix deadspins, Exceptions, and change the App queue object types from…
dmssargent Aug 6, 2015
52209cf
Fix deadspins, Exceptions, and change the App queue object types from…
dmssargent Aug 6, 2015
108c108
Merge remote-tracking branch 'remotes/upstream/onboard' into develop
dmssargent Aug 10, 2015
ccf9894
Merge branch 'develop' of https://github.com/HagertyRobotics/ftc_app_…
dmssargent Aug 10, 2015
445c711
Sync with upstream
dmssargent Aug 10, 2015
99f1141
Sync with upstream
dmssargent Aug 10, 2015
992b781
Sync with upstream
dmssargent Aug 10, 2015
7eb4b75
Get a working XML parser, fix some bugs
dmssargent Aug 10, 2015
a00e230
Get a working XML parser, fix some bugs
dmssargent Aug 10, 2015
a4ec72d
Refactor for lower memory usage on server side
dmssargent Aug 11, 2015
614ae6b
Refactor for lower memory usage on server side
dmssargent Aug 11, 2015
a9ea7e0
Add more types to be available via the protocol
dmssargent Aug 11, 2015
fb75994
Rebuild how encoding functions to try to prevent constant memory leak…
dmssargent Aug 12, 2015
781f2f8
Rebuild how encoding functions to try to prevent constant memory leak…
dmssargent Aug 12, 2015
2b4d45f
Add an pre-built copy of SimulatorData.java
dmssargent Aug 12, 2015
9d514a0
Add gradle module to allow deintergration of components
dmssargent Aug 12, 2015
983c149
Move where the encoding operations take place to the pipeline
dmssargent Aug 12, 2015
8805c19
Workout the encoding issues; something is not sending yet
dmssargent Aug 13, 2015
50458a8
Cleanup old code; somewhat working
dmssargent Aug 13, 2015
46eecd0
Add start/stop behavior to the networking client
dmssargent Aug 13, 2015
28ac820
Correct the behavior the logger, so that it outputs severe error mess…
dmssargent Aug 13, 2015
9e4ab3a
Correct an issue where the Brick Simulator is not returning valid dat…
dmssargent Aug 13, 2015
afb2fac
Add PROTOCOL.md to describe the TCP protocol, update README.md
dmssargent Aug 13, 2015
7e0694d
Add more missing files to Git, attempt to identify the bug
dmssargent Aug 14, 2015
4cdfa34
Make some changes to code layout
dmssargent Aug 15, 2015
f5d0af5
Sync PC with upstream
dmssargent Aug 15, 2015
c7b6132
Cleanup, add more debugging, test some bugfixes
dmssargent Aug 17, 2015
f989237
Seem to fix big bug, correct some other behaviors, move code around
dmssargent Aug 17, 2015
f577ba6
Work on library, find one more bug (data corruption over send), resol…
dmssargent Aug 29, 2015
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
42 changes: 28 additions & 14 deletions Android/App/FtcRobotController/FtcRobotController.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
Expand All @@ -24,23 +26,23 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
Expand Down Expand Up @@ -69,6 +71,12 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/Analytics-release/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/FtcCommon-release/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/ModernRobotics-release/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/RobotCore-release/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/WirelessP2p-release/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
Expand All @@ -84,13 +92,19 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android 5.0.1 Google APIs" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android 5.1.1 Google APIs" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="protobuf" level="project" />
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
<orderEntry type="library" exported="" name="RobotCore-release-" level="project" />
<orderEntry type="library" exported="" name="ModernRobotics-release-" level="project" />
<orderEntry type="library" exported="" name="WirelessP2p-release-" level="project" />
<orderEntry type="library" exported="" name="Analytics-release-" level="project" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="annotations-12.0" level="project" />
<orderEntry type="library" exported="" name="netty-all-4.0.30.Final" level="project" />
<orderEntry type="library" exported="" name="FtcCommon-release-" level="project" />
</component>
</module>
23 changes: 14 additions & 9 deletions Android/App/FtcRobotController/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion = 'Google Inc.:Google APIs:21'
compileSdkVersion = 'Google Inc.:Google APIs:22'
buildToolsVersion = '21.1.2'

defaultConfig {
minSdkVersion 16
targetSdkVersion 19
minSdkVersion 19
targetSdkVersion 22
}
}

Expand All @@ -18,10 +18,15 @@ repositories {

dependencies {
compile files('libs/android-support-v4.jar')
// compile (name:'d2xx', ext:'jar')
compile (name:'RobotCore-release', ext:'aar')
compile (name:'ModernRobotics-release', ext:'aar')
compile (name:'FtcCommon-release', ext:'aar')
compile (name:'WirelessP2p-release', ext:'aar')
compile (name:'Analytics-release', ext:'aar')
// compile (name:'d2xx', ext:'jar')
compile 'com.android.support:support-v4:22.2.0'
compile(name: 'RobotCore-release', ext: 'aar')
compile(name: 'ModernRobotics-release', ext: 'aar')
compile(name: 'FtcCommon-release', ext: 'aar')
compile(name: 'WirelessP2p-release', ext: 'aar')
compile(name: 'Analytics-release', ext: 'aar')
compile 'com.intellij:annotations:12.0'
compile files('libs/guava-18.0.jar')
compile files('libs/netty-all-4.0.30.Final.jar')
compile files('libs/protobuf.jar')
}
Binary file added Android/App/FtcRobotController/libs/guava-18.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added Android/App/FtcRobotController/libs/netty-all-4.0.30.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file added Android/App/FtcRobotController/libs/protobuf.jar
View file
Open in desktop
Binary file not shown.
216 changes: 106 additions & 110 deletions Android/App/FtcRobotController/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,122 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.qualcomm.ftcrobotcontroller"
android:versionCode="1"
android:versionName="1.0" >
package="com.qualcomm.ftcrobotcontroller"
android:versionCode="1"
android:versionName="1.0">

<uses-permission
android:name="android.permission.ACCESS_WIFI_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.CHANGE_WIFI_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.CHANGE_NETWORK_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.INTERNET"
android:required="true" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:required="true" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:required="true" />
<uses-permission
android:name="android.permission.WRITE_SETTINGS"
android:required="true" />
<uses-permission
android:name="android.permission.ACCESS_WIFI_STATE"
android:required="true" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission
android:name="android.permission.CHANGE_WIFI_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.CHANGE_NETWORK_STATE"
android:required="true" />
<uses-permission
android:name="android.permission.INTERNET"
android:required="true" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:required="true" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:required="true" />
<uses-permission
android:name="android.permission.WRITE_SETTINGS"
android:required="true" />

<uses-feature android:name="android.hardware.usb.accessory" />
<uses-feature android:name="android.hardware.usb.accessory" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".FtcRobotControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name=".FtcRobotControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER" />

<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>

<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter" />
</activity>
<activity
android:name=".FtcWifiChannelSelectorActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="ActionWifiChannelSelection"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".AboutActivity"
android:label="@string/about_activity" >
</activity>
<activity
android:name=".FtcRobotControllerSettingsActivity"
android:label="@string/settings_activity" >
</activity>
<activity
android:name=".FtcConfigurationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/configure_activity" >
</activity>
<activity
android:name=".EditMotorControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_motor_controller_activity"
android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name=".EditServoControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_servo_controller_activity"
android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name=".EditLegacyModuleControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_legacy_module_controller_activity"
android:windowSoftInputMode="stateHidden" >
</activity>
<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter" />
</activity>
<activity
android:name=".FtcWifiChannelSelectorActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="ActionWifiChannelSelection" />

<service
android:name="com.qualcomm.ftccommon.FtcRobotControllerService"
android:enabled="true" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".AboutActivity"
android:label="@string/about_activity"></activity>
<activity
android:name=".FtcRobotControllerSettingsActivity"
android:label="@string/settings_activity"></activity>
<activity
android:name=".FtcConfigurationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/configure_activity"></activity>
<activity
android:name=".EditMotorControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_motor_controller_activity"
android:windowSoftInputMode="stateHidden"></activity>
<activity
android:name=".EditServoControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_servo_controller_activity"
android:windowSoftInputMode="stateHidden"></activity>
<activity
android:name=".EditLegacyModuleControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/edit_legacy_module_controller_activity"
android:windowSoftInputMode="stateHidden"></activity>

<activity
android:name=".FtcLoadFileActivity"
android:label="@string/title_activity_load" >
</activity>
<activity
android:name=".AutoConfigureActivity"
android:label="@string/title_activity_autoconfigure" >
</activity>
<activity
android:name=".ConfigWifiDirectActivity"
android:label="@string/title_activity_config_wifi_direct" />
<activity
android:name=".ViewLogsActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_view_logs">
<intent-filter>
<action android:name="com.qualcomm.ftcrobotcontroller.VIEW_LOGS"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>
<service
android:name="com.qualcomm.ftccommon.FtcRobotControllerService"
android:enabled="true" />

<activity
android:name=".FtcLoadFileActivity"
android:label="@string/title_activity_load"></activity>
<activity
android:name=".AutoConfigureActivity"
android:label="@string/title_activity_autoconfigure"></activity>
<activity
android:name=".ConfigWifiDirectActivity"
android:label="@string/title_activity_config_wifi_direct" />
<activity
android:name=".ViewLogsActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_view_logs">
<intent-filter>
<action android:name="com.qualcomm.ftcrobotcontroller.VIEW_LOGS" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>

</manifest>
24 changes: 23 additions & 1 deletion Android/App/FtcRobotController/src/main/assets/robot_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><Robot><MOTOR_CONTROLLER name="Motor Controller 1" serialNumber="7" port="0"><MOTOR name="NO DEVICE ATTACHED" port="1" /><MOTOR name="NO DEVICE ATTACHED" port="2" /></MOTOR_CONTROLLER><SERVO_CONTROLLER name="Servo Controller 2" serialNumber="6" port="0"><SERVO name="NO DEVICE ATTACHED" port="1" /><SERVO name="NO DEVICE ATTACHED" port="2" /><SERVO name="NO DEVICE ATTACHED" port="3" /><SERVO name="NO DEVICE ATTACHED" port="4" /><SERVO name="NO DEVICE ATTACHED" port="5" /><SERVO name="NO DEVICE ATTACHED" port="6" /></SERVO_CONTROLLER><LEGACY_MODULE_CONTROLLER name="Legacy Module 3" serialNumber="5"><NOTHING name="NO DEVICE ATTACHED" port="1" /><NOTHING name="NO DEVICE ATTACHED" port="2" /><NOTHING name="NO DEVICE ATTACHED" port="3" /><NOTHING name="NO DEVICE ATTACHED" port="4" /><NOTHING name="NO DEVICE ATTACHED" port="5" /><NOTHING name="NO DEVICE ATTACHED" port="6" /></LEGACY_MODULE_CONTROLLER></Robot>
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
<Robot>
<MOTOR_CONTROLLER name="Motor Controller 1" port="0" serialNumber="7">
<MOTOR name="NO DEVICE ATTACHED" port="1" />
<MOTOR name="NO DEVICE ATTACHED" port="2" />
</MOTOR_CONTROLLER>
<SERVO_CONTROLLER name="Servo Controller 2" port="0" serialNumber="6">
<SERVO name="NO DEVICE ATTACHED" port="1" />
<SERVO name="NO DEVICE ATTACHED" port="2" />
<SERVO name="NO DEVICE ATTACHED" port="3" />
<SERVO name="NO DEVICE ATTACHED" port="4" />
<SERVO name="NO DEVICE ATTACHED" port="5" />
<SERVO name="NO DEVICE ATTACHED" port="6" />
</SERVO_CONTROLLER>
<LEGACY_MODULE_CONTROLLER name="Legacy Module 3" serialNumber="5">
<NOTHING name="NO DEVICE ATTACHED" port="1" />
<NOTHING name="NO DEVICE ATTACHED" port="2" />
<NOTHING name="NO DEVICE ATTACHED" port="3" />
<NOTHING name="NO DEVICE ATTACHED" port="4" />
<NOTHING name="NO DEVICE ATTACHED" port="5" />
<NOTHING name="NO DEVICE ATTACHED" port="6" />
</LEGACY_MODULE_CONTROLLER>
</Robot>
Loading