Skip to content
This repository was archived by the owner on Sep 12, 2023. It is now read-only.

Commit e618a7e

Browse files
committed
I think I finally fixed my !@#$ build issues
1 parent 9998a11 commit e618a7e

File tree

7 files changed

+33
-8
lines changed

7 files changed

+33
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,4 @@ lint/tmp/
8888

8989
.DS_Store
9090
.idea
91+
*.hprof

TechnoCommonCode/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626

2727
implementation 'com.acmerobotics.roadrunner:core:0.5.4'
2828

29-
implementation 'org.openftc:easyopencv:1.4.4'
29+
implementation 'org.openftc:easyopencv:1.5.0'
3030

3131
}
3232

TechnoTwoCode/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ dependencies {
2323
implementation project(':RobotLibrary')
2424
implementation project(':Vision')
2525
implementation project(':Path')
26+
// We don't need Team two depending on Team one's code. Bad Things (tm) happen
27+
// implementation project(path: ':TechnoOneCode')
2628

2729
annotationProcessor files('lib/OpModeAnnotationProcessor.jar')
2830

@@ -32,6 +34,8 @@ dependencies {
3234

3335
implementation 'org.openftc:easyopencv:1.5.0'
3436

37+
implementation 'com.acmerobotics.dashboard:dashboard:0.4.3'
38+
3539
//implementation 'com.github.technototes:TechnoLib:0.9.11'
3640
}
3741

TechnoTwoCode/src/main/java/org/firstinspires/ftc/teamcode/Hardware.java

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.firstinspires.ftc.teamcode.Robot.RobotConstants.VISION_CONNECTED;
1010
import static org.firstinspires.ftc.teamcode.Robot.RobotConstants.CAP_CONNECTED;
1111

12+
import com.acmerobotics.dashboard.config.Config;
1213
import com.qualcomm.robotcore.hardware.DcMotorEx;
1314
import com.technototes.library.hardware.motor.EncodedMotor;
1415
import com.technototes.library.hardware.motor.Motor;
@@ -67,6 +68,9 @@ public static class HardwareConstants{
6768
public static EncodedMotor<DcMotorEx> rlDriveMotor;
6869
public static EncodedMotor<DcMotorEx> rrDriveMotor;
6970
public static IMU imu;
71+
public static RangeSensor leftRangeSensor;
72+
public static RangeSensor rightRangeSensor;
73+
7074

7175
public static Motor<DcMotorEx> intakeMotor;
7276

TechnoTwoCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public static class RobotConstants {
3030
public VisionSubsystem visionSubsystem;
3131
public ArmSubsystem armSubsystem;
3232
public Robot() {
33-
if (DEPOSIT_CONNECTED) depositSubsystem = new DepositSubsystem(Hardware.dumpServo);
34-
if (DRIVE_CONNECTED) drivebaseSubsystem = new DrivebaseSubsystem(Hardware.flDriveMotor, Hardware.frDriveMotor, Hardware.rlDriveMotor, Hardware.rrDriveMotor, Hardware.imu);
33+
if (DEPOSIT_CONNECTED) depositSubsystem = new DepositSubsystem(Hardware.DumpServo);
34+
if (DRIVE_CONNECTED) drivebaseSubsystem = new DrivebaseSubsystem(Hardware.flDriveMotor, Hardware.frDriveMotor, Hardware.rlDriveMotor, Hardware.rrDriveMotor, Hardware.imu, Hardware.leftRangeSensor, Hardware.rightRangeSensor);
3535
if (CAROUSEL_CONNECTED) carouselSubsystem = new CarouselSubsystem(Hardware.carouselMotor);
3636
if (INTAKE_CONNECTED) intakeSubsystem = new IntakeSubsystem(Hardware.intakeMotor, Hardware.intakeDistSensor);
3737
if (VISION_CONNECTED) visionSubsystem = new VisionSubsystem(Hardware.camera);

build.common.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,13 @@ android {
137137
jniLibs.srcDir rootProject.file('libs')
138138
}
139139
ndkVersion '21.3.6528147'
140+
141+
/*
142+
dexOptions {
143+
javaMaxHeapSize "8G"
144+
}
145+
*/
146+
140147
}
141148

142149
repositories {

gradle.properties

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
# AndroidX package structure to make it clearer which packages are bundled with the
2-
# Android operating system, and which are packaged with your app's APK
3-
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1+
## For more details on how to configure your build environment visit
2+
# http://www.gradle.org/docs/current/userguide/build_environment.html
3+
#
4+
# Specifies the JVM arguments used for the daemon process.
5+
# The setting is particularly useful for tweaking memory settings.
6+
# Default value: -Xmx1024m -XX:MaxPermSize=256m
7+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
8+
#
9+
# When configured, Gradle will run in incubating parallel mode.
10+
# This option should only be used with decoupled projects. More details, visit
11+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
12+
# org.gradle.parallel=true
13+
#Sat Nov 06 15:05:49 PDT 2021
14+
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
415
android.useAndroidX=true
5-
6-
# Automatically convert third-party libraries to use AndroidX
716
android.enableJetifier=true

0 commit comments

Comments
 (0)