Changeset 2b4365b in orbit for android/src

Timestamp:

12/07/12 09:51:36 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

30077ff

Parents:

4634b1d

Message:

• fixed classpath for usb-serial library

File:

• android/src/info/puzzlebox/orbit/MainActivity.java (modified) (5 diffs)

android/src/info/puzzlebox/orbit/MainActivity.java

@@ -96 +96 @@
         final boolean rawEnabled = false;
 
-
         private static final String MAC_ADDRESS = "D0:DF:9A:69:5D:42"; // MindWave Mobile Dev (p1-dev-60-01)
         //      private static final String MAC_ADDRESS = "9C:B7:0D:5E:E5:6A"; // UK So Television
         //      private static final String MAC_ADDRESS = "00:16:53:09:0B:B9";
-
-        //      int audioFile = R.raw.throttle_max_android_common;
+        //      private static final String MAC_ADDRESS = "9C:B7:0D:90:EB:92"; // Steve Harvey
+
+        int audioFile = R.raw.throttle_max_android_common;
         //      int audioFile = R.raw.throttle_min_android_common;
-        //      int audioFile = R.raw.throttle_max_android_htc_one_x;
-        int audioFile = R.raw.throttle_hover_android_htc_one_x;
+        //      int audioFile = R.raw.throttle_hover_android_htc_one_x;
 
         String currentCommand = "neutral";
@@ -346 +345 @@
                                 case TGDevice.STATE_DISCONNECTED:
                                         Log.d(TAG, "EEG Disconnected");
-//                                      appendTextAndScroll("EEG Disconnected\n");
+                                        //                                      appendTextAndScroll("EEG Disconnected\n");
                                         break;
                                 }
@@ -415 +414 @@
 
         } // connectHeadset
-        
-        
+
+
         public void disconnectHeadset() {
                 tgDevice.stop();
@@ -563 +562 @@
                 } else {
 
-                        if (currentCommand == "hover") {
-                                stopControl();
-                        }
+                        //                      if (currentCommand == "hover") {
+                        //                              stopControl();
+                        //                      }
+                        stopControl();
 
                         command = "neutral";
@@ -641 +641 @@
                 //              playTone();
 
-                                playControl();
+                playControl();
 
                 //              String command = "neutral";