Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for 0 based joysticks and joystick axes in simulation.

Browse Source 
Change-Id: I67608450d0818b38f6d5b5c709190433f2dc5cf5
This commit is contained in:
Alex Henning
2014-11-06 18:54:30 -05:00
parent 18de3aebdd
commit 3b53f84c8f
7 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulation/SimDS/src/main/java/edu/wpi/first/wpilibj/simulation/ds/DS.java
View File

@@ -105,7 +105,7 @@ public class DS {
public void scanForJoysticks() {
joysticks.removeAll();
List<ISimJoystick> sticks = joystickProvider.scanForJoysticks();
while (sticks.size() < 4) {
while (sticks.size() < 6) {
sticks.add(new FakeJoystick());
}
joysticks.setListData(sticks);

2
simulation/SimDS/src/main/java/edu/wpi/first/wpilibj/simulation/ds/Main.java
View File

@@ -42,7 +42,7 @@ public class Main {
final double start = simTime;
for (int i = 0; i < provider.getJoysticks().size(); i++) {
ISimJoystick joystick = provider.getJoysticks().get(i);
joystick.advertise(node, i+1);
joystick.advertise(node, i);
joystick.publish();
}
ds.publish();

1
simulation/debs/Makefile
View File

@@ -66,6 +66,7 @@ clean:
-rm frcsim-eclipse-toolchain-plugin/frcsim-eclipse-toolchain-plugin_$(eclipse-toolchain-package-version)_all.deb
-rm frcsim-libwpilibsim-cpp/frcsim-libwpilibsim-cpp_$(libwpilibsim-package-version)_amd64.deb
-rm frcsim-libwpilibsim-cpp/frcsim-libwpilibsim-cpp_$(libwpilibsim-package-version)_i386.deb
-rm -r frcsim-libwpilibsim-cpp/frcsim-libwpilibsim-cpp/allwpilib
-rm frcsim/frcsim_$(frcsim-package-version)_all.deb
install: