Skip to content

Commit

Permalink
v2.62 with changes to improve USB comm to Modern Robotics DC Motor Co…
Browse files Browse the repository at this point in the history
…ntroller.
  • Loading branch information
ftctechnh committed Jan 7, 2017
1 parent 2fdc96a commit 32474ab
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 8 deletions.
1 change: 0 additions & 1 deletion FtcRobotController/build.release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dependencies {
compile (name:'RobotCore-release', ext: 'aar')
compile (name:'Hardware-release', ext: 'aar')
compile (name:'FtcCommon-release', ext: 'aar')
compile (name:'ModernRobotics-release', ext:'aar')
compile (name:'Analytics-release', ext:'aar')
compile (name:'WirelessP2p-release', ext:'aar')
}
4 changes: 2 additions & 2 deletions FtcRobotController/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="18"
android:versionName="2.61">
android:versionCode="19"
android:versionName="2.62">

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import com.qualcomm.ftccommon.LaunchActivityConstantsList;
import com.qualcomm.ftccommon.ProgrammingModeController;
import com.qualcomm.ftccommon.Restarter;
import org.firstinspires.ftc.ftccommon.external.SoundPlayingRobotMonitor;
import com.qualcomm.ftccommon.UpdateUI;
import com.qualcomm.ftccommon.configuration.EditParameters;
import com.qualcomm.ftccommon.configuration.FtcLoadFileActivity;
Expand All @@ -90,6 +89,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import com.qualcomm.robotcore.wifi.NetworkType;
import com.qualcomm.robotcore.wifi.WifiDirectAssistant;

import org.firstinspires.ftc.ftccommon.external.SoundPlayingRobotMonitor;
import org.firstinspires.ftc.robotcore.internal.AppUtil;
import org.firstinspires.inspection.RcInspectionActivity;

Expand All @@ -102,7 +102,6 @@ public class FtcRobotControllerActivity extends Activity {
public static final String TAG = "RCActivity";

private static final int REQUEST_CONFIG_WIFI_CHANNEL = 1;
private static final boolean USE_DEVICE_EMULATION = false;
private static final int NUM_GAMEPADS = 2;

public static final String NETWORK_TYPE_FILENAME = "ftc-network-type.txt";
Expand Down Expand Up @@ -253,8 +252,6 @@ public void onClick(View v) {

hittingMenuButtonBrightensScreen();

if (USE_DEVICE_EMULATION) { HardwareFactory.enableDeviceEmulation(); }

wifiLock.acquire();
callback.networkConnectionUpdate(WifiDirectAssistant.Event.DISCONNECTED);
readNetworkType(NETWORK_TYPE_FILENAME);
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ For technical questions regarding the SDK, please visit the FTC Technology forum

**************************************************************************************

Version 2.62 (built on 17.01.07)
* Added no pointer check before calling modeToByte() in finishModeSwitchIfNecessary method for ModernRoboticsUsbDcMotorController class.
* Changes to enhance Modern Robotics USB protocol robustness.

**************************************************************************************

Version 2.61 (released on 16.12.19)
* Blocks Programming mode changes:
- Fix to correct issue when an exception was thrown because an OpticalDistanceSensor object appears twice in the hardware map (the second time as a LightSensor).
Expand Down
1 change: 0 additions & 1 deletion TeamCode/build.release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ dependencies {
compile (name: 'RobotCore-release', ext: 'aar')
compile (name: 'Hardware-release', ext: 'aar')
compile (name: 'FtcCommon-release', ext: 'aar')
compile (name:'ModernRobotics-release', ext:'aar')
compile (name:'Analytics-release', ext:'aar')
compile (name:'WirelessP2p-release', ext:'aar')
}
Binary file modified doc/apk/FtcDriverStation-release.apk
Binary file not shown.
Binary file modified doc/apk/FtcRobotController-release.apk
Binary file not shown.
Binary file modified libs/Blocks-release.aar
Binary file not shown.
Binary file modified libs/FtcCommon-release-sources.jar
Binary file not shown.
Binary file modified libs/FtcCommon-release.aar
Binary file not shown.
Binary file modified libs/Hardware-release-sources.jar
Binary file not shown.
Binary file modified libs/Hardware-release.aar
Binary file not shown.
Binary file modified libs/Inspection-release.aar
Binary file not shown.
Binary file modified libs/RobotCore-release-sources.jar
Binary file not shown.
Binary file modified libs/RobotCore-release.aar
Binary file not shown.

0 comments on commit 32474ab

Please sign in to comment.