Merge branch '2001_Field' of git@github.com:WPIRoboticsEngineering/2001_Field_Controller.git into 2001_Field

madhephaestus · madhephaestus · commit 35882961b02c · 2019-02-06T18:15:12.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,9 @@ repositories {
 }
 
 dependencies {
-    //implementation "com.neuronrobotics:SimplePacketComsJava:0.6.0"
-    implementation project(":SimplePacketComsJava")
+    implementation "com.neuronrobotics:SimplePacketComsJava:0.8.1"
+    //implementation project(":SimplePacketComsJava")
+
 }
 
 checkstyle {
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-include ":SimplePacketComsJava"
-project(":SimplePacketComsJava").projectDir = file("../SimplePacketComsJava")
+//include ":SimplePacketComsJava"
+//project(":SimplePacketComsJava").projectDir = file("../SimplePacketComsJava")
diff --git a/src/main/java/edu/wpi/rbe/rbe2001/fieldsimulator/gui/InterfaceController.java b/src/main/java/edu/wpi/rbe/rbe2001/fieldsimulator/gui/InterfaceController.java
@@ -264,8 +264,8 @@ void onSetGains() {
 		double kpv = Double.parseDouble(kp.getText());
 		double kiv = Double.parseDouble(ki.getText());
 		double kdv = Double.parseDouble(kd.getText());
-		for (int i = 0; i < numPIDControllers; i++)
-			fieldSim.setPidGains(i, kpv, kiv, kdv);
+		//for (int i = 0; i < numPIDControllers; i++)
+			fieldSim.setPidGains(currentIndex, kpv, kiv, kdv);
 	}
 
 	@FXML
@@ -378,6 +378,7 @@ private void clearGraph() {
 			s.getData().clear();
 
 		}
+		fieldSim.updatConfig();
 	}
 
 	public static void disconnect() {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ repositories {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
`20`		`- //implementation "com.neuronrobotics:SimplePacketComsJava:0.6.0"`
`21`		`- implementation project(":SimplePacketComsJava")`
	`20`	`+ implementation "com.neuronrobotics:SimplePacketComsJava:0.8.1"`
	`21`	`+ //implementation project(":SimplePacketComsJava")`
	`22`	`+`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`checkstyle {`
Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,8 @@ void onSetGains() {`
`264`	`264`	`double kpv = Double.parseDouble(kp.getText());`
`265`	`265`	`double kiv = Double.parseDouble(ki.getText());`
`266`	`266`	`double kdv = Double.parseDouble(kd.getText());`
`267`		`- for (int i = 0; i < numPIDControllers; i++)`
`268`		`- fieldSim.setPidGains(i, kpv, kiv, kdv);`
	`267`	`+ //for (int i = 0; i < numPIDControllers; i++)`
	`268`	`+ fieldSim.setPidGains(currentIndex, kpv, kiv, kdv);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`@FXML`
`@@ -378,6 +378,7 @@ private void clearGraph() {`
`378`	`378`	`s.getData().clear();`
`379`	`379`
`380`	`380`	`}`
	`381`	`+ fieldSim.updatConfig();`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`public static void disconnect() {`