Skip to content
This repository was archived by the owner on Dec 2, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed OpenRocket-15.03.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ To use ORBrake, it must be enabled on your simulation. To do this, create a new
## Contributing
ORBrake is written in Java. This section explains what dependencies are required to build the project as well as how to configure the development environment.
### Dependencies
1. [jdk 8](https://adoptopenjdk.net/): OpenRocket requires Java 8. More recent versions are incompatible. To compile code, jdk 8 is required.
1. [jdk 17](https://adoptopenjdk.net/): OpenRocket requires Java 17. Older versions are incompatible. To compile code, jdk 17 is required.
1. [Apache Ant](https://mkyong.com/ant/how-to-install-apache-ant-on-windows/): Ant is used to automate the build process. Note that if you are using Eclipse as your IDE, Ant is built in and you don't need to download it seperetly.
1. [Eclipse](https://github.com/WPIRoboticsEngineering/ESP32ArduinoEclipseInstaller) *[Recomended]*: While not explicetly required for this project, you can use the Sloeber Eclipse that is used for HPRC's embedded firmware programs. There is no reason you couldn't use other IDEs like IDEA or VIM (depending on how much of a hacker you are) but the environment setup will be up to you.
1. OpenRocket 15.03: For obvious reasons, this OpenRocket plugin requires OpenRocket to run. Version 15.03, the most recent official release, is included in this repo.
1. OpenRocket 23.09: For obvious reasons, this OpenRocket plugin requires OpenRocket to run. Version 23.09, the most recent official release, is included in this repo.

### Eclipse Setup
_Note: Some of these steps my automatically be done by importing from the repository. You may not have to do every one of them, but you should still verify they are completed. These instructions should enable you to configure the environment from scratch or in a different IDE._
1. Start by importing the project into Eclipse via `File->Import->Git->Projects from Git`.
1. Add `OpenRocket-15.03.jar` to the class path via `Project->Properties->Java Build Path->Libraries->Add External JARs...`
1. Add `OpenRocket-23.09.jar` to the class path via `Project->Properties->Java Build Path->Libraries->Add External JARs...`
1. Add `JUnit 5` to the class path via `Project->Properties->Java Build Path->Libraries->Add Library...`
1. Go to `Window->Preferences->Java->Installed JREs` and select jdk 8.
1. If jdk 8 is not on the list, select `Add...`
1. Go to `Window->Preferences->Java->Installed JREs` and select jdk 17.
1. If jdk 17 is not on the list, select `Add...`
1. Select `Standard VM` then click `Next >`
1. Click `Directory...` then navigate to and select `C:\Program Files\AdoptOpenJDK\jdk-8.0.275.1-hotspot\jre` or where ever you installed jdk 8 to.
1. Click `Directory...` then navigate to and select `C:\Program Files\AdoptOpenJDK\<your jdk 17 version>` or where ever you installed jdk 17 to.
1. Click `Finish`.
1. Configure Ant
1. Go to `Run->External Tools->External Tools Configurations...`
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<target name="build" description="Builds the plugin.">
<echo>Building...</echo>
<mkdir dir="${build.dir}"/>
<javac debug="true" srcdir="${src.dir}" destdir="${build.dir}" classpath="OpenRocket-15.03.jar" includeantruntime="false" source="1.8" target="1.8">
<javac debug="true" srcdir="${src.dir}" destdir="${build.dir}" classpath="OpenRocket-23.09.jar" includeantruntime="false" source="17" target="17">
<exclude name="**/ORBrakeTest.java"/>
</javac>
<echo>Done</echo>
Expand All @@ -22,7 +22,7 @@
<jar destfile="${env.APPDATA}/OpenRocket/Plugins/ORBrake.jar" basedir="${build.dir}"/>
<echo>Done</echo>
<echo>Running OpenRocket...</echo>
<java jar="OpenRocket-15.03.jar" fork="true"/>
<java jar="OpenRocket-23.09.jar" fork="true"/>
<echo>Done</echo>
</target>

Expand Down
2 changes: 1 addition & 1 deletion src/net/sf/openrocket/ORBrake/ORBrakeConfigurator.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected JComponent getConfigurationComponent(ORBrake extension, Simulation sim
panel.add(sliderTau, "w 75lp, wrap");


panel.add(new JLabel("Drag Coeficient:"));
panel.add(new JLabel("Drag Coefficient:"));
DoubleModel Cd = new DoubleModel(extension, "Cd", UnitGroup.UNITS_COEFFICIENT, 0);

JSpinner spinCd = new JSpinner(Cd.getSpinnerModel());
Expand Down
2 changes: 1 addition & 1 deletion src/net/sf/openrocket/ORBrake/ORBrakeProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class ORBrakeProvider extends AbstractSimulationExtensionProvider {
*/

public ORBrakeProvider() {
super(ORBrake.class, "WPI", "OR Brake");
super(ORBrake.class, "Flight", "OR Brake");
}

}