Changeset 30077ff in orbit for android/src


Ignore:
Timestamp:
12/08/12 01:34:22 (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • android/src/info/puzzlebox/orbit/MainActivity.java

    r2b4365b r30077ff  
    9999        //      private static final String MAC_ADDRESS = "9C:B7:0D:5E:E5:6A"; // UK So Television 
    100100        //      private static final String MAC_ADDRESS = "00:16:53:09:0B:B9"; 
     101        //      private static final String MAC_ADDRESS = "9C:B7:0D:75:A8:05"; // Discovery Channel Canada 
    101102        //      private static final String MAC_ADDRESS = "9C:B7:0D:90:EB:92"; // Steve Harvey 
    102103 
    103         int audioFile = R.raw.throttle_max_android_common; 
     104        //      int audioFile = R.raw.throttle_max_android_common; 
    104105        //      int audioFile = R.raw.throttle_min_android_common; 
     106        int audioFile = R.raw.throttle_hover_android_common; 
    105107        //      int audioFile = R.raw.throttle_hover_android_htc_one_x; 
    106108 
     
    409411                        tgDevice.connect(rawEnabled); 
    410412 
    411                 else if (tgDevice.getState() == TGDevice.STATE_CONNECTED) 
    412                         disconnectHeadset(); 
     413                //              else if (tgDevice.getState() == TGDevice.STATE_CONNECTED) 
     414                //                      disconnectHeadset(); 
    413415 
    414416 
Note: See TracChangeset for help on using the changeset viewer.