changed meters to feet

Circuit-Wizardry · Feb 13, 2024 · a22bb12 · a22bb12
1 parent f87048c
commit a22bb12
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 37 deletions.
diff --git a/flight_data.txt b/flight_data.txt
diff --git a/graphs/Altitude.png b/graphs/Altitude.png
diff --git a/graphs/Pitch.png b/graphs/Pitch.png
diff --git a/graphs/Roll.png b/graphs/Roll.png
diff --git a/graphs/Temperature.png b/graphs/Temperature.png
diff --git a/graphs/X Acceleration.png b/graphs/X Acceleration.png
diff --git a/graphs/Y Acceleration.png b/graphs/Y Acceleration.png
diff --git a/graphs/Z Acceleration.png b/graphs/Z Acceleration.png
diff --git a/src/main/java/com/circuitwizardry/missioncontrol/Debrief.java b/src/main/java/com/circuitwizardry/missioncontrol/Debrief.java
@@ -465,13 +465,13 @@ private void downloadGraphActionPerformed(java.awt.event.ActionEvent evt) {//GEN
             showGraph(data, 2, "X Acceleration", "Acceleration");
             showGraph(data, 3, "Y Acceleration", "Acceleration");
             showGraph(data, 4, "Z Acceleration", "Acceleration");
-            showGraph(data, 5, "Altitude", "Altitude (meters)");
+            showGraph(data, 5, "Altitude", "Altitude (feet)");
             showGraph(data, 6, "Temperature", "Temperature (C)");
             showGraph(data, 7, "Roll", "Roll");
             showGraph(data, 8, "Pitch", "Pitch"); 
         }
         if (boardId == 100) {
-            showGraph(data, 2, "Altitude", "Altitude (meters)");
+            showGraph(data, 2, "Altitude", "Altitude (feet)");
             showGraph(data, 3, "Temperature", "Temperature (C)"); 
         }
 

diff --git a/src/main/java/com/circuitwizardry/missioncontrol/MainScreen.form b/src/main/java/com/circuitwizardry/missioncontrol/MainScreen.form
@@ -25,7 +25,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" attributes="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
+                  <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="1" attributes="0">
                           <Component id="jScrollPane1" min="-2" pref="380" max="-2" attributes="0"/>
@@ -41,11 +41,11 @@
                       </Group>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" pref="79" max="-2" attributes="0"/>
-                      <Component id="jLabel1" min="-2" pref="247" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                   </Group>
               </Group>
-              <EmptySpace pref="25" max="32767" attributes="0"/>
+              <EmptySpace pref="24" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -74,7 +74,7 @@
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Segoe UI Black" size="24" style="1"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="CW MissionControl"/>
+        <Property name="text" type="java.lang.String" value="CircuitWizardry MissionControl"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="programButton">

diff --git a/src/main/java/com/circuitwizardry/missioncontrol/MainScreen.java b/src/main/java/com/circuitwizardry/missioncontrol/MainScreen.java
@@ -40,7 +40,7 @@ private void initComponents() {
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
 
         jLabel1.setFont(new java.awt.Font("Segoe UI Black", 1, 24)); // NOI18N
-        jLabel1.setText("CW MissionControl");
+        jLabel1.setText("CircuitWizardry MissionControl");
 
         programButton.setText("Program");
         programButton.addActionListener(new java.awt.event.ActionListener() {
@@ -90,9 +90,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .addGap(18, 18, 18)
                                 .addComponent(docsButton))))
                     .addGroup(layout.createSequentialGroup()
-                        .addGap(79, 79, 79)
-                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 247, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap(25, Short.MAX_VALUE))
+                        .addContainerGap()
+                        .addComponent(jLabel1)))
+                .addContainerGap(24, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

diff --git a/src/main/java/com/circuitwizardry/missioncontrol/Missioncontrol.java b/src/main/java/com/circuitwizardry/missioncontrol/Missioncontrol.java
@@ -10,8 +10,12 @@
  */
 public class Missioncontrol {
 
+    // This project relies on jSerialComm 2.0.0 (for some reason). The newest version is 2.10.0 but we're using a version from 2018.
+    // If you're trying to load the source code, you can use jSerialComm 2.0.2 because that's the only one you can still find.
+    // It works fine.
+
     public static void main(String[] args) {
-        System.out.println("Hello World!");
+        System.out.println("MissionControl - Made by Marcelo");
         var frame = new MainScreen();
         frame.setVisible(true);
     }

diff --git a/src/main/java/com/circuitwizardry/missioncontrol/ProgramConfirm.java b/src/main/java/com/circuitwizardry/missioncontrol/ProgramConfirm.java
@@ -23,6 +23,8 @@ public class ProgramConfirm extends javax.swing.JFrame {
     SerialPort port;
     /**
      * Creates new form ProgramConfirm
+     * @param c
+     * @param port
      */
     public ProgramConfirm(String c, SerialPort port) {
         String text = c.replaceAll("'", "\"");
@@ -33,7 +35,7 @@ public ProgramConfirm(String c, SerialPort port) {
         codeFrame.setText(text);
         this.port = port;
 
-        // DONT CLOSE ALL
+        // DONT CLOSE ALL windows, only this one
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
             @Override

diff --git a/target/classes/com/circuitwizardry/missioncontrol/MainScreen.class b/target/classes/com/circuitwizardry/missioncontrol/MainScreen.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/Missioncontrol.class b/target/classes/com/circuitwizardry/missioncontrol/Missioncontrol.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$1.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$1.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$2.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$2.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$3.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$3.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$4.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$4.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$5.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm$5.class
diff --git a/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm.class b/target/classes/com/circuitwizardry/missioncontrol/ProgramConfirm.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,23 +1,23 @@
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\PyroFeature.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\EmulatePyro.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\PyroCharge.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\Feature.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\input\Button.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\input\InputFeature.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\DrogueChute.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\Output.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\MainScreen.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\Input.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\Buzzer.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\GPIOFeature.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\ThrustVectoring.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\Missioncontrol.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\OutputFeature.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\Debrief.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\LED.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\GPIO.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\AudioCues.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\CustomPyro.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\MainChute.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\ProgramConfirm.java
-C:\Users\marce\OneDrive\Documents\NetBeansProjects\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\ProgramScreen.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\MainChute.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\EmulatePyro.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\Feature.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\OutputFeature.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\Output.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\DrogueChute.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\PyroCharge.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\Debrief.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\ThrustVectoring.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\LED.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\MainScreen.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\GPIOFeature.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\ProgramScreen.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\input\InputFeature.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\ProgramConfirm.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\AudioCues.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\CustomPyro.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\GPIO.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\input\Button.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\Input.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\gpio\output\Buzzer.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\Missioncontrol.java
+C:\Users\marce\Documents\GitHub\missioncontrol\src\main\java\com\circuitwizardry\missioncontrol\features\pyro\PyroFeature.java