mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
merged from frcsim branch
verified to work on real robots adds sim eclipse plugins, fixed JavaGazebo, made wpilibC++Sim build on windows - Java and C++ simulation robot programs run on windows - simulation eclipse plugin delivers models and gazebo plugins - Java Gazebo now respects GAZEBO_IP variables and can work across networks - hal and network tables win32 hacked to work on windows - smart dashboard broken on windows due to network tables hacks - wpilibC++Sim, gz_msgs, and frcsim_gazebo_plugins build with CMake - removed constexpr for cross platform compatibility - msgs generated using .protos as a part of build process - some spare and unused cmake/pom files deleted - simulation ubuntu debians removed entirely - refactored CMake project flags and macros - updated to match non-sim C++ API - fixed and updated documentation - servo added to simulation Change-Id: Ia702ff0f1fee10d77f543810ad88f56696443b05
This commit is contained in:
@@ -14,3 +14,9 @@ roboRIOAllowedImages=23
|
||||
wpilib.ant.dir=${wpilib}/ant
|
||||
jsch.jar=${wpilib.ant.dir}/jsch-0.1.50.jar
|
||||
classloadertask.jar=${wpilib.ant.dir}/ant-classloadertask.jar
|
||||
|
||||
#simulation stuff
|
||||
sim.exe=Simulate/${out}
|
||||
wpilib.sim=${wpilib}/sim
|
||||
sim.tools=${wpilib.sim}/tools
|
||||
sim.lib=${wpilib.sim}/lib
|
||||
|
||||
@@ -104,17 +104,15 @@
|
||||
<target name="simulate">
|
||||
<parallel>
|
||||
<sequential>
|
||||
<echo>[simulate] Running Gazebo.</echo>
|
||||
<exec executable="frcsim">
|
||||
<arg value="${simulation.world.file}"/>
|
||||
</exec>
|
||||
<!-- windows uses a batch file to run frcsim, linux uses a shell script -->
|
||||
<condition property="frcsim.executable" value="frcsim.bat" else="frcsim">
|
||||
<os family="windows" />
|
||||
</condition>
|
||||
<!-- TODO: launch gazebo once? -->
|
||||
<echo>[simulate] You may now run Gazebo</echo>
|
||||
</sequential>
|
||||
<sequential>
|
||||
<sleep seconds="5"/>
|
||||
<echo>[simulate] Running DriverStation.</echo>
|
||||
<java jar="${sim.tools}/SimDS.jar" fork="true">
|
||||
<jvmarg value="-Djava.library.path=${sim.lib}" />
|
||||
</java>
|
||||
<echo>[simulate] You can now run your DriverStation!</echo>
|
||||
</sequential>
|
||||
<sequential>
|
||||
<sleep seconds="5"/>
|
||||
|
||||
Reference in New Issue
Block a user