Changeset 2b4365b in orbit for android/src
- Timestamp:
- 12/07/12 09:51:36 (8 years ago)
- Branches:
- master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
- Children:
- 30077ff
- Parents:
- 4634b1d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
android/src/info/puzzlebox/orbit/MainActivity.java
r4634b1d r2b4365b 96 96 final boolean rawEnabled = false; 97 97 98 99 98 private static final String MAC_ADDRESS = "D0:DF:9A:69:5D:42"; // MindWave Mobile Dev (p1-dev-60-01) 100 99 // private static final String MAC_ADDRESS = "9C:B7:0D:5E:E5:6A"; // UK So Television 101 100 // private static final String MAC_ADDRESS = "00:16:53:09:0B:B9"; 102 103 // int audioFile = R.raw.throttle_max_android_common; 101 // private static final String MAC_ADDRESS = "9C:B7:0D:90:EB:92"; // Steve Harvey 102 103 int audioFile = R.raw.throttle_max_android_common; 104 104 // int audioFile = R.raw.throttle_min_android_common; 105 // int audioFile = R.raw.throttle_max_android_htc_one_x; 106 int audioFile = R.raw.throttle_hover_android_htc_one_x; 105 // int audioFile = R.raw.throttle_hover_android_htc_one_x; 107 106 108 107 String currentCommand = "neutral"; … … 346 345 case TGDevice.STATE_DISCONNECTED: 347 346 Log.d(TAG, "EEG Disconnected"); 348 // appendTextAndScroll("EEG Disconnected\n");347 // appendTextAndScroll("EEG Disconnected\n"); 349 348 break; 350 349 } … … 415 414 416 415 } // connectHeadset 417 418 416 417 419 418 public void disconnectHeadset() { 420 419 tgDevice.stop(); … … 563 562 } else { 564 563 565 if (currentCommand == "hover") { 566 stopControl(); 567 } 564 // if (currentCommand == "hover") { 565 // stopControl(); 566 // } 567 stopControl(); 568 568 569 569 command = "neutral"; … … 641 641 // playTone(); 642 642 643 643 playControl(); 644 644 645 645 // String command = "neutral";
Note: See TracChangeset
for help on using the changeset viewer.