diff --git a/FtcRobotController/FtcRobotController.iml b/FtcRobotController/FtcRobotController.iml
index 8a0cd07ba8f..63d071be8b5 100644
--- a/FtcRobotController/FtcRobotController.iml
+++ b/FtcRobotController/FtcRobotController.iml
@@ -23,6 +23,7 @@
+
@@ -95,7 +96,6 @@
boolean
isOkToRead()
-public int getIregFirst()
public int getIregMax()
public int getCreg()
public II2cDeviceClient.READ_MODE getReadMode()
public boolean getReadIssued()
public boolean isOkToRead()-
setReadIssued()
has been called on them.public boolean sameAsIncludingMode(II2cDeviceClient.ReadWindow him)
him
- the other window to compare toTeleOp
or Autonomous
annotations, as appropriate.
- NOTE: To make this work, for the moment at least you need to add your library module - 'YourCodeHere' to the 'build.gradle' file in the FtcRobotController library. That build.gradle - (be aware: each Android Studio module has its own) is found in $PROJECT_DIR$\FtcRobotController\build.gradle, - where $PROJECT_DIR$ is the directory which contains SwerveRoboticsLibrary and YourCodeHere in addition to - FtcRobotController. In that 'build.gradle', make sure the 'dependencies' section has a line - compile project(':YourCodeHere') in addition to compile project(':SwerveRoboticsLibrary') - and other things.
+NOTE: if you previously cloned YourCodeHere for your team and per the then-current + instructions edited FtcRobotController\build.gradle to mention your project, you should + now remove that: FtcRobotController\build.gradle should now always be the original, verbatim + version as currently found here. Then, in your own project's build.gradle make necessary + changes to match the now-current YourCodeHere\build.gradle. Specifically, ensure that: +
apply plugin: 'com.android.application'
not ...android.module'
defaultConfig
section contains the followingapplicationId 'com.qualcomm.ftcrobotcontroller'
versionCode
line with the version three or greater: versionCode 3
dependencies
section contains the line compile project(':FtcRobotController')
For the YourCodeHere module specifically, this has already been done for you. If you - create your own sibling modules, you'll have to do that for yourself. We hope in the future - to obviate the need for this step.
- -UPDATE: at the moment, this is slightly broken, in that you cannot here reference - the OpModes in the FtcRobotController module written by FTC HQ. Until that is fixed (we're - working on it), if you want to use any of those OpModes you'll have to go back to the old - way of modifying FtcOpModeRegister.register() directly. We apologize for the inconvenience.
+If you're new to us here, these updates have already been done for you.
TeleOp
,
Autonomous
,
-OpModeRegistrar
OpModeRegistrar
,
+SynchTeleOp
NOTE: To make this work, for the moment at least you need to add your library module - * 'YourCodeHere' to the 'build.gradle' file in the FtcRobotController library. That build.gradle - * (be aware: each Android Studio module has its own) is found in $PROJECT_DIR$\FtcRobotController\build.gradle, - * where $PROJECT_DIR$ is the directory which contains SwerveRoboticsLibrary and YourCodeHere in addition to - * FtcRobotController. In that 'build.gradle', make sure the 'dependencies' section has a line - * compile project(':YourCodeHere') in addition to compile project(':SwerveRoboticsLibrary') - * and other things.
+ *NOTE: if you previously cloned YourCodeHere for your team and per the then-current + * instructions edited FtcRobotController\build.gradle to mention your project, you should + * now remove that: FtcRobotController\build.gradle should now always be the original, verbatim + * version as currently found here. Then, in your own project's build.gradle make necessary + * changes to match the now-current YourCodeHere\build.gradle. Specifically, ensure that: + *
apply plugin: 'com.android.application'
not ...android.module'
defaultConfig
section contains the followingapplicationId 'com.qualcomm.ftcrobotcontroller'
versionCode
line with the version three or greater: versionCode 3
dependencies
section contains the line compile project(':FtcRobotController')
For the YourCodeHere module specifically, this has already been done for you. If you - * create your own sibling modules, you'll have to do that for yourself. We hope in the future - * to obviate the need for this step.
- * - *UPDATE: at the moment, this is slightly broken, in that you cannot here reference - * the OpModes in the FtcRobotController module written by FTC HQ. Until that is fixed (we're - * working on it), if you want to use any of those OpModes you'll have to go back to the old - * way of modifying FtcOpModeRegister.register() directly. We apologize for the inconvenience.
+ *If you're new to us here, these updates have already been done for you.
* * @see TeleOp * @see Autonomous * @see OpModeRegistrar + * @see SynchTeleOp */ public class MyOpModeRegistrar { @@ -44,11 +46,11 @@ public class MyOpModeRegistrar @OpModeRegistrar public static void Register(IOpModeManager manager) { - // As an example, we here register some examples from the Swerve library. - // You'll probably want to change that. + // As an example, we here register some examples from the Swerve library + // and one of the FTC HQ example opmodes. You'll probably want to change that. manager.register(SynchTeleOp.class); manager.register(SynchTelemetryOp.class); - // manager.register("HQ NxtTeleoP", com.qualcomm.ftcrobotcontroller.opmodes.NxtTeleOp); // need to make this work! + manager.register("FTC HQ NxtTeleOp", NxtTeleOp.class); } } diff --git a/YourCodeHere/src/main/res/values/strings.xml b/YourCodeHere/src/main/res/values/strings.xml index 28c85f4479f..9ca6ccf07fc 100644 --- a/YourCodeHere/src/main/res/values/strings.xml +++ b/YourCodeHere/src/main/res/values/strings.xml @@ -1,3 +1,3 @@