Changeset 30077ff in orbit for android/src

Timestamp:

12/08/12 01:34:22 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

a32b629

Parents:

2b4365b

Message:

• settings for Discovery Channel Canada

File:

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

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

@@ -99 +99 @@
         //      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";
+        //      private static final String MAC_ADDRESS = "9C:B7:0D:75:A8:05"; // Discovery Channel Canada
         //      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_max_android_common;
         //      int audioFile = R.raw.throttle_min_android_common;
+        int audioFile = R.raw.throttle_hover_android_common;
         //      int audioFile = R.raw.throttle_hover_android_htc_one_x;
 
@@ -409 +411 @@
                         tgDevice.connect(rawEnabled);
 
-                else if (tgDevice.getState() == TGDevice.STATE_CONNECTED)
-                        disconnectHeadset();
+                //              else if (tgDevice.getState() == TGDevice.STATE_CONNECTED)
+                //                      disconnectHeadset();