Skip to content

Commit b1a6e3f

Browse files
authored
Merge pull request #80 from DeepBlueRobotics/drivetrain-characterization-2/19/19
Merge drivetrain-characterization-2/19/19
2 parents 8281a91 + 0723859 commit b1a6e3f

3 files changed

Lines changed: 26 additions & 13 deletions

File tree

Robot2019/src/main/java/frc/robot/DrivetrainCharAnalysis.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
import java.io.IOException;
88
import java.io.Reader;
99
import java.util.ArrayList;
10+
import java.util.Arrays;
1011
import java.util.List;
1112

1213
import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression;
14+
import org.apache.commons.math3.linear.SingularMatrixException;
1315
import org.apache.commons.lang3.ArrayUtils;
1416
import org.apache.commons.csv.CSVRecord;
1517
import org.apache.commons.csv.CSVFormat;
@@ -64,9 +66,14 @@ public static void ordinaryLeastSquares(String file1, String file2, String outfi
6466
ys[i] = voltages[i];
6567
}
6668

67-
algorithm = new OLSMultipleLinearRegression();
68-
algorithm.newSampleData(ys, xs);
69-
params = algorithm.estimateRegressionParameters();
69+
try {
70+
algorithm = new OLSMultipleLinearRegression();
71+
algorithm.newSampleData(ys, xs);
72+
params = algorithm.estimateRegressionParameters();
73+
} catch (SingularMatrixException e) {
74+
System.out.println(Arrays.deepToString(xs));
75+
System.out.println(Arrays.toString(ys));
76+
}
7077
// System.out.println(params.length);
7178
rightKv = params[1];
7279
rightKa = params[2];

Robot2019/src/main/java/frc/robot/RobotMap.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ private static WPI_TalonSRX createConfiguredTalon(int port) {
120120
catchError(tsrx.configNeutralDeadband(0.001, 10));
121121
tsrx.setNeutralMode(NeutralMode.Brake);
122122

123-
ecDeadband = tsrx.configNeutralDeadband(0.001, 10);
124-
if (!ecDeadband.equals(ErrorCode.OK)) {
125-
throw new RuntimeException(ecDeadband.toString());
126-
}
127-
128123
return tsrx;
129124
}
130125

@@ -140,11 +135,6 @@ private static WPI_VictorSPX createConfiguredVictor(int port) {
140135
catchError(vspx.configNeutralDeadband(0.001, 10));
141136
vspx.setNeutralMode(NeutralMode.Brake);
142137

143-
ecDeadband = vspx.configNeutralDeadband(0.001, 10);
144-
if (!ecDeadband.equals(ErrorCode.OK)) {
145-
throw new RuntimeException(ecDeadband.toString());
146-
}
147-
148138
return vspx;
149139
}
150140

Robot2019/src/main/java/frc/robot/subsystems/Drivetrain.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,22 @@ public void updateDrivetrainParameters() {
209209
blKA = avg;
210210
brKA = avg;
211211
} catch (FileNotFoundException e) {
212+
flKV = 0.06369046755507658;
213+
flKA = 0.0215894793277297;
214+
flVI = 0.8403701236277824;
215+
216+
frKV = 0.0619423013628032;
217+
frKA = 0.04044703465602449;
218+
frVI = 0.810212379284332;
219+
220+
blKV = 0.06388520699977113;
221+
blKA = 0.025492804438184545;
222+
blVI = 0.8071078220643216;
223+
224+
brKV = 0.06140765089854154;
225+
brKA = 0.042046502553651215;
226+
brVI = 0.7929289166816246;
227+
212228
e.printStackTrace();
213229
}
214230
}

0 commit comments

Comments
 (0)