From ad72a19c36cb9347eb9db35c56938604491e5a94 Mon Sep 17 00:00:00 2001
From: Brendan <brendan.haines@gmail.com>
Date: Mon, 2 Mar 2015 14:45:13 -0700
Subject: [PATCH] adds *.class to .gitignore

---
 .gitignore                               |   1 +
 CopterController/TCPexample/Client.class | Bin 1048 -> 0 bytes
 CopterController/TCPexample/Server.class | Bin 1764 -> 0 bytes
 GroundStation/v1/GroundStation.class     | Bin 11350 -> 0 bytes
 GroundStation/v1/SmartScroller$1.class   | Bin 629 -> 0 bytes
 GroundStation/v1/SmartScroller.class     | Bin 2918 -> 0 bytes
 GroundStation/v2/ConnectionPanel.java    |  43 +++++++++++++++++++----
 GroundStation/v2/Display3d.java          |  23 ++++++++----
 GroundStation/v2/DisplayController.java  |  26 ++++++++++++++
 GroundStation/v2/EStopWindow.java        |  11 ++++--
 GroundStation/v2/GroundStation.java      |   4 ++-
 11 files changed, 92 insertions(+), 16 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 CopterController/TCPexample/Client.class
 delete mode 100644 CopterController/TCPexample/Server.class
 delete mode 100644 GroundStation/v1/GroundStation.class
 delete mode 100644 GroundStation/v1/SmartScroller$1.class
 delete mode 100644 GroundStation/v1/SmartScroller.class
 create mode 100644 GroundStation/v2/DisplayController.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5241a72
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.class
\ No newline at end of file
diff --git a/CopterController/TCPexample/Client.class b/CopterController/TCPexample/Client.class
deleted file mode 100644
index 21fd188fcc2a3633a9d83518eba0587a0594ae07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmZuw+fvg|6kVsZO&Y?jrGO|JyiqQ;QW3d{N-a_?>QL0FK856ffi~&1Dax<-13cqH
zJ7Y&bz(@ba2gQ97kdD%s?z3-aU)EXq{`<=}0BPhE#Boi+bs0Al1aMQrn1qB-#}$Mz
zp&*3G2&QmLMp8ivw}od~h_o>8$e0nvT?w-??n#)FFwYQPvTVy;X6Q(azh($#9FsHj
z<Sm;&ua~!YbyMFektbNzEt_E=@h-os@9U|OZttWDZq>4P7RAM`f~y;Q>w3k@r#Zd(
z7N{A6QgG^3gRfemP-muOaobIbDk=srNZq`OHg{76$Jpa8gE~E*PEOCxC1>amS&P)#
z%d(u*N_~5qSGl>tb(2>aE}RB(cBSspOk6MfF%?U=FRm{O@j${u6_2pO5Z&MgxAwWI
z)w~rJGy*fD;xV!+R`Eo|8geS0BFhjMQ&c<?bH=<z-sahl2Cul5Ly!!;dG9!t+NhRu
zHPbTfF<1NGRQE;|0@vS_q4(_Oi>+O5(2B8hfE4)t4{uK3+r7ixw*43e6XSj=A<`Bg
zpoUIr{1XsWVrL;AA@A+lrYjuOTwW$NICYva{<p(Rdgv2qse=y$)o*h%geoG5Zk@A(
zXda@6F%LYZy=9PvC1}Rbf4WLLsTd@$UWp(M86~I2p`o8X0`UvbpQr;`mb4K%8J(et
zCfE@v#0ipN--!r@aglV9`jx(b4mw}85GY1F`hq{22<BS|6<Y`wCmWEOkei6Ce})q6
zY(SlApz9ODhsQt3Lq>N4JtEfY$NCPT=7k+2`^am!Mr4W7gkppwI!Vgtq9HWW6Qrfl
xO|<MKuJsYi;*=djo;KU0jV@94FoM63kT4?Qa^#q%W)iLlp~+N#lrjRi`UhD+=>-4)

diff --git a/CopterController/TCPexample/Server.class b/CopterController/TCPexample/Server.class
deleted file mode 100644
index f3ef10a77868cb9d643e60119def26dbbf3d5a61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1764
zcmZuxSx*~R6#g!Fe1~CJV#4Aq&5)$Q5SE6nK$@ly(zs<wF%2<v8$1^nuxFf^F@$bX
zpQ=h#-`hXHL!T0<wiKj1^dVBx$M(;(s!GqDv4csm<TH29@||<ObM8F*_t9ejqxeQc
z3S&(e$ApTj8s5e=j&~Y?XNm>|*QIz@#U#fR#|;hBxT&ET?`hC*iz6*H?`vqo2P$Ty
za#o5tj(H887*lauK0j2kAfFi(iyA({9TiI|?yAVj&}AuBWE_cUDHN=5e5~RVj!!v0
zV~Ah19Xq(j(3tAK!w{QtEy2(>V>@E5R9F?>qPdzUO{`$r4ntRJWoFadHb?TNvp$ju
zJlk2Hkby0kz|3vUn#Itc<8x}3!wkDibF5NU1})>3yqvgcOT^}k@V13FEa7zYV}K*4
z!vdKS84(18Y?O+IA9`sVYdY4k!O$7zcSJA}0c70VmIx$*tz#2gRAgi@Hca2hxsD@p
zfv|ctGK8VFJ2F{XTN9qJ7KCXDk0Dtzq@7|Zptgirh-}n@jywty-;u&)=%{($ruKs+
z&klsAqlkObPH5dbrX7~Q=6Xg!_`bO=hKGkW9X_bg61K@F#HeF&vSjDOS`yU=!xK4S
zZwqVO(6NL242%$VWw3T5otc`So130mBx-ehfiD?aE!(elOVm-fCo;mZB#VAHrg5W>
zp`nj3zQTr%uQ5>TB&=fkeohnv+od7*EN!@M(eE|VfnnK}(-#;!uD2x_j7QWmv>(<#
zzq&~b6WB4UL8}xxhT{qcbtE)eprfi?KM)1lN4G?nozb?@$U?58$xPG=KdNR>igF+n
zl{$V&W2v;<)wr3Hy%I{QKXN=QkFZ<UMNqc~G^?5$<*PH0Yfm-N3kI2_<IogsQg}_;
z2z$O1JYO;iQLTY6>MewR>JZ|HWm)1Yw4>H;cyE^(RQV<^EyKwgVBK;NSllcYX&)Gd
zjw9!Pd{x(x0@c8+jVUhfmCU^V0>RPzC;F)j9u6Q+JEY|Dt}kGqk3NI)*Fb-|<Y2f=
zr?d2A^i&2aU=QfPFi0{UDba)>4AYrh*?08Oij(cnhiFJNmJ!>Bl1;=b;4_!YP-msO
zDO79OeKcnW%g`%msi1XkA8qorJyyYq@tAZ>kmFDp9X}(!ckmaTPL3<2-$!S*g04h&
z89hmbL?TI|j8o*ER1&AlIP())CBRwI>|wAj=B4K`=MG~istjZA;KyXFj9$ufp6a+j
z^<LaVOPDfoiI5(I{XW4{yi5d123FBSvIQzyk)W@4H`;NIPNV3+b#&ntX%@)mE|T<7
zIE`;{2Hz8%KM>WwpcfBu9>3xO9^oP$6Y6icgeOG%QyRnXG=M*d(-F#W1^j>j6^>Up
mu5gTUyvp$!z?=TT7{}{>BXvMI897MtMiZ6#CIvR&t^WYTgsR>E

diff --git a/GroundStation/v1/GroundStation.class b/GroundStation/v1/GroundStation.class
deleted file mode 100644
index eee607233f8af5d8f2a56380ae1f74525e31a69d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11350
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
H6fgdNA}`@?

diff --git a/GroundStation/v1/SmartScroller$1.class b/GroundStation/v1/SmartScroller$1.class
deleted file mode 100644
index dfed3b3ae33dc47cb3e93b86eb36e41a2a061651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 629
zcma)4TT2^36#iy&S+kuqtJd^}HLVLxQ)!~FmO=>@3aLUPzE3uT*|3>~y~N*DFtqfc
zKfoU)ev=j@zSxC5=gc|h`_5(N>iYK|00#(asNks;&pcG|+`|@LxOnN}m5UvL%3Q^P
z7HAEoYOcEKBJb+CHhK5+cv@unjOLL&9|~0SNt6XWfyQ7sQ)xa7(<F{{YC|6*6Xl--
z4%+u(57E9m6DaqSF<WR1BBPIs*+{3SY82B`N()2Twn^SFDbi4XiELnFrGXE&b>fdq
z7$;d|&cEq=l8jxnBwpi<goj5GYp6*`tV`^o&g>P6U|#?N@~bgA?Z+z1bSB_0cM>ae
z-aQ#jb(pjAo$GsH%-=riD_jCib-TPX6&JccA%z|b?6&`BAD#+BopIH@9$LJ)Dm!!G
z_`aP1pyoilU5CF!ozcg%-tt_cZgk!+AUb;sIGvv;{h*7}Qd$}yq4cr-57Z{edS&O5
lm`ganP`*QW%MvMzWu)F<o`X$1p)T_oHL*?0Bfdh-?*>#`j8gyr

diff --git a/GroundStation/v1/SmartScroller.class b/GroundStation/v1/SmartScroller.class
deleted file mode 100644
index 95926ce3d90fb3272947d5a1b081764c442e0c35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2918
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
G|NaAdow2R}

diff --git a/GroundStation/v2/ConnectionPanel.java b/GroundStation/v2/ConnectionPanel.java
index 0b04c8f..b5c643b 100644
--- a/GroundStation/v2/ConnectionPanel.java
+++ b/GroundStation/v2/ConnectionPanel.java
@@ -137,6 +137,10 @@ class ConnectionPanel extends JPanel implements ActionListener {
             for( int i = 0; i < contentOut.controlValues.length; i++ )
                 out.print( "C" + i + "_" + contentOut.controlValues[i] + " " );
         }
+        if( contentOut.orientation ) {
+            for( int i = 0; i < contentOut.orientValues.length; i++ )
+                out.print( "O" + i + "_" + contentOut.orientValues[i] + " " );
+        }
         out.println();
     }
 
@@ -148,18 +152,43 @@ class ConnectionPanel extends JPanel implements ActionListener {
             if( in.ready() ) {
                 String messageIn = in.readLine();
                 Scanner temp = new Scanner( messageIn );
+                boolean motorsEnabled = false;
+
+                contentIn.motorTesting = false;
+                contentIn.controls = false;
+                contentIn.orientation = false;
+
                 while( temp.hasNext() ) {
                     String next = temp.next();
-                    if( next.indexOf( "H" ) == 0 ) System.out.print( "\nH" );
-                    System.out.print( next );
-                    if( next.indexOf( "M" ) > 0 ) {
-                        Scanner motorScan = new Scanner( next );
-
+                    if( next.indexOf( "H" ) == 0 ) {
+                        System.out.print( "\nH " );
+                    }
+                    else if( next.indexOf( "E" ) == 0 ) {
+                        motorsEnabled = true;
+                        System.out.print( "E " );
+                    }
+                    else if( next.indexOf( "M" ) == 0 ) {
+                        contentIn.motorTesting = true;
+                        //int motorNum = Integer.parseInt( next.substring( 1 ) );
+                        //int motorVal = Integer.parseInt( next.substring( 3, next.length() ) );
+                        //contentIn.motorValues[ motorNum ] = motorVal;
+                        System.out.print( "M " );
+                    }
+                    else if( next.indexOf( "C" ) == 0 ) {
+                        contentIn.controls = true;
+                        //int controlNum = Integer.parseInt( next.substring( 1 ) );
+                        //int controlVal = Integer.parseInt( next.substring( 3, next.length() ) );
+                        //contentIn.controlValues[ controlNum ] = controlVal;
+                        System.out.print( "C " );
+                    }
+                    else if( next.indexOf( "O" ) == 0 ) {
+                        contentIn.orientation = true;
+                        System.out.print( "O " );
                     }
                 }
+                contentIn.setMotorsEnabled( motorsEnabled );
+                contentIn.fireActionPerformed( new ActionEvent(contentIn, ActionEvent.ACTION_PERFORMED, "" ) );
             }
-            contentIn.orientation = true;
-            contentIn.fireActionPerformed( new ActionEvent(contentIn, ActionEvent.ACTION_PERFORMED, "" ) );
         }
         catch( IOException ex ) {}
     }
diff --git a/GroundStation/v2/Display3d.java b/GroundStation/v2/Display3d.java
index e9f6dc9..8104dd3 100644
--- a/GroundStation/v2/Display3d.java
+++ b/GroundStation/v2/Display3d.java
@@ -10,7 +10,7 @@ class Display3d extends JPanel implements ActionListener, ChangeListener {
 
     private JSlider slider;
     private MessageContent source = new MessageContent();
-    private Font normalFont = new Font( "Normal", Font.PLAIN, 15 );
+    private Font normalFont = new Font( "Normal", Font.BOLD, 15 );
 
     /**
      * no-args constructor
@@ -60,12 +60,23 @@ class Display3d extends JPanel implements ActionListener, ChangeListener {
             g.setColor( Color.GREEN );
             //g.drawLine( centerX, centerY, X, Y );
             
-            g.setColor( Color.BLACK );
+            g.setColor( Color.LIGHT_GRAY );
             g.setFont( normalFont );
-            g.drawString( "w = " + source.orientValues[ 0 ], 10, 35 );
-            g.drawString( "x = " + source.orientValues[ 1 ], 10, 60 );
-            g.drawString( "y = " + source.orientValues[ 2 ], 10, 85 );
-            g.drawString( "z = " + source.orientValues[ 3 ], 10, 110 );
+
+            double w = source.orientValues[ 0 ];
+            double x = source.orientValues[ 1 ];
+            double y = source.orientValues[ 2 ];
+            double z = source.orientValues[ 3 ];
+
+            g.drawString( "w = " + w, 11, 35 );
+            g.drawString( "x = " + x, 15, 50 );
+            g.drawString( "y = " + y, 15, 65 );
+            g.drawString( "z = " + z, 15, 80 );
+
+            double[] gravity = { 2 * ( x*z - w*y ), 2 * ( w*x + y*z ), w*w - x*x - y*y + z*z };
+
+            g.drawString( "Pitch: " + Math.toRadians( Math.atan( x / Math.sqrt( y*y + z*z ) ) ), 15, 100 );
+            g.drawString( "Roll:  " + Math.toRadians( Math.atan( y / Math.sqrt( x*x + z*z ) ) ), 15, 115 );
         }
         else {
             g.setColor( Color.RED );
diff --git a/GroundStation/v2/DisplayController.java b/GroundStation/v2/DisplayController.java
new file mode 100644
index 0000000..a22d088
--- /dev/null
+++ b/GroundStation/v2/DisplayController.java
@@ -0,0 +1,26 @@
+import javax.swing.*;
+import java.awt.event.*;
+
+class DisplayController.java extends JPanel implements ActionListener {
+
+    private MessageContent source = new MessageContent();
+
+    public DisplayController() {
+        setBackground( Color.DARK_GRAY );
+        setPerferredSize( new Dimension( 0, 100 ) );
+    }
+
+    public void paintComponent( Graphics g ) {
+        super.paintComponent( g );
+        
+        g.setColor( Color.LIGHT_GRAY );
+
+    }
+
+    /**
+     *
+     */
+    public void actionPerformed( ActionEvent evt ) {
+        redraw();
+    }
+}
\ No newline at end of file
diff --git a/GroundStation/v2/EStopWindow.java b/GroundStation/v2/EStopWindow.java
index 3dbf817..5b78cfe 100644
--- a/GroundStation/v2/EStopWindow.java
+++ b/GroundStation/v2/EStopWindow.java
@@ -20,7 +20,7 @@ class EStopWindow extends JFrame implements ActionListener {
     /**
      *
      */
-    public EStopWindow() {
+    public EStopWindow( boolean visible) {
         super("Emergency Stop");
         setDefaultCloseOperation( JFrame.DO_NOTHING_ON_CLOSE );
         setAlwaysOnTop( true );
@@ -33,7 +33,14 @@ class EStopWindow extends JFrame implements ActionListener {
 
         setEnabled( true );
         pack();
-        setVisible( true );
+        setVisible( visible );
+    }
+
+    /**
+     *
+     */
+    public EStopWindow() {
+        this( true );
     }
 
     /**
diff --git a/GroundStation/v2/GroundStation.java b/GroundStation/v2/GroundStation.java
index 7d60718..5447c60 100644
--- a/GroundStation/v2/GroundStation.java
+++ b/GroundStation/v2/GroundStation.java
@@ -11,7 +11,7 @@ class GroundStation implements ActionListener {
     /** main window to hold everything */
     private JFrame mainWindow;
     /** window to hold emergency stop button */
-    private EStopWindow eStopWindow;
+    private EStopWindow eStopWindow = new EStopWindow( false );
 
     /** connection options section of window */
     private ConnectionPanel connectPanel;
@@ -52,6 +52,8 @@ class GroundStation implements ActionListener {
 
         mainWindow.pack();
         mainWindow.setVisible( true );
+
+        sendContent.orientation = true;
     }
 
     public void disableMotors() {