TimeCrafters/UltimateGoal
1
0
Fork 0
mirror of https://github.com/TimeCrafters/UltimateGoal.git synced 2025-12-15 22:02:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FIRST-Tech-Challenge/FtcRobotController

Browse Source
This commit is contained in:
cyberarm
2021-07-24 15:10:46 +00:00
parent 59d79b117e cd037e0e74
commit 93fcfef1c6
16 changed files with 169 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FtcRobotController/build.gradle
View File

@@ -25,12 +25,4 @@ dependencies {
implementation project(path: ':TimeCraftersConfigurationTool')
}
repositories {
maven { url = "https://dl.bintray.com/first-tech-challenge/ftcsdk/" }
flatDir {
dirs '../libs'
}
}
apply from: 'build.release.gradle'
apply from: '../build.dependencies.gradle'

10
FtcRobotController/build.release.gradle
View File

@@ -1,10 +0,0 @@
dependencies {
implementation 'org.firstinspires.ftc:Inspection:6.1.1'
implementation 'org.firstinspires.ftc:Blocks:6.1.1'
implementation 'org.firstinspires.ftc:RobotCore:6.1.1'
implementation 'org.firstinspires.ftc:RobotServer:6.1.1'
implementation 'org.firstinspires.ftc:OnBotJava:6.1.1'
implementation 'org.firstinspires.ftc:Hardware:6.1.1'
implementation 'org.firstinspires.ftc:FtcCommon:6.1.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
}

4
FtcRobotController/src/main/AndroidManifest.xml
View File

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.qualcomm.ftcrobotcontroller"
android:versionCode="39"
android:versionName="6.1">
android:versionCode="40"
android:versionName="6.2">
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

9
FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/readme.md vendored
View File

@@ -2,9 +2,12 @@
## Caution
No Team-specific code should be placed or modified in this ``.../samples`` folder.
Full or partial Samples should be Copied from here, and then Pasted into
the team's folder, using the Android Studio cut and paste commands.
This automatically changes all file and class names to be consistent.
Samples should be Copied from here, and then Pasted into the team's
[/TeamCode/src/main/java/org/firstinspires/ftc/teamcode](../../../../../../../../../../TeamCode/src/main/java/org/firstinspires/ftc/teamcode)
folder, using the Android Studio cut and paste commands. This automatically changes all file and
class names to be consistent. From there, the sample can be modified to suit the team's needs.
For more detailed instructions see the /teamcode readme.
### Naming of Samples

15
FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/internal/FtcRobotControllerActivity.java
View File

@@ -387,6 +387,8 @@ public class FtcRobotControllerActivity extends Activity
new Backend();
Backend.instance().startServer();
}
// check to see if there is a preferred Wi-Fi to use.
checkPreferredChannel();
}
protected UpdateUI createUpdateUI() {
@@ -408,17 +410,6 @@ public class FtcRobotControllerActivity extends Activity
super.onStart();
RobotLog.vv(TAG, "onStart()");
// If we're start()ing after a stop(), then shut the old robot down so
// we can refresh it with new state (e.g., with new hw configurations)
shutdownRobot();
updateUIAndRequestRobotSetup();
cfgFileMgr.getActiveConfigAndUpdateUI();
// check to see if there is a preferred Wi-Fi to use.
checkPreferredChannel();
entireScreenLayout.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -666,7 +657,9 @@ public class FtcRobotControllerActivity extends Activity
// was some historical confusion about launch codes here, so we err safely
if (request == RequestCode.CONFIGURE_ROBOT_CONTROLLER.ordinal() || request == RequestCode.SETTINGS_ROBOT_CONTROLLER.ordinal()) {
// We always do a refresh, whether it was a cancel or an OK, for robustness
shutdownRobot();
cfgFileMgr.getActiveConfigAndUpdateUI();
updateUIAndRequestRobotSetup();
}
}