Changeset a32b629 in orbit for android/src
- Timestamp:
- 12/08/12 06:16:00 (10 years ago)
- Branches:
- master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
- Children:
- cd5d285
- Parents:
- 30077ff
- Location:
- android/src/info/puzzlebox/orbit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/src/info/puzzlebox/orbit/AudioDevice.java
r4634b1d ra32b629 1 1 package info.puzzlebox.orbit; 2 2 3 import java.io.IOException;3 //import java.io.IOException; 4 4 import java.lang.Math; 5 5 import java.util.ArrayList; -
android/src/info/puzzlebox/orbit/MainActivity.java
r30077ff ra32b629 1 1 package info.puzzlebox.orbit; 2 2 3 import java.io.IOException;4 import java.util.concurrent.ExecutorService;5 import java.util.concurrent.Executors;6 7 import com.hoho.android.usbserial.driver.UsbSerialDriver;8 import com.hoho.android.usbserial.driver.UsbSerialProber;9 import com.hoho.android.usbserial.util.SerialInputOutputManager;3 //import java.io.IOException; 4 //import java.util.concurrent.ExecutorService; 5 //import java.util.concurrent.Executors; 6 7 //import com.hoho.android.usbserial.driver.UsbSerialDriver; 8 //import com.hoho.android.usbserial.driver.UsbSerialProber; 9 //import com.hoho.android.usbserial.util.SerialInputOutputManager; 10 10 import com.neurosky.thinkgear.TGDevice; 11 11 … … 21 21 import android.app.Activity; 22 22 import android.bluetooth.BluetoothAdapter; 23 import android.content.Context;23 //import android.content.Context; 24 24 import android.graphics.Color; 25 25 import android.graphics.drawable.ClipDrawable; 26 26 import android.graphics.drawable.ShapeDrawable; 27 27 import android.graphics.drawable.shapes.RoundRectShape; 28 import android.hardware.usb.UsbManager;28 //import android.hardware.usb.UsbManager; 29 29 import android.util.Log; 30 30 import android.view.Gravity; … … 34 34 import android.widget.Button; 35 35 import android.widget.ProgressBar; 36 import android.widget.RemoteViews;36 //import android.widget.RemoteViews; 37 37 import android.widget.SeekBar; 38 38 import android.widget.TextView; … … 88 88 int maximumPower = 100; 89 89 90 SerialDevice serial;91 int serialBaudRate = 9600;90 // SerialDevice serial; 91 // int serialBaudRate = 9600; 92 92 // int serialBaudRate = 133333; 93 93 … … 98 98 private static final String MAC_ADDRESS = "D0:DF:9A:69:5D:42"; // MindWave Mobile Dev (p1-dev-60-01) 99 99 // private static final String MAC_ADDRESS = "9C:B7:0D:5E:E5:6A"; // UK So Television 100 // private static final String MAC_ADDRESS = "00:16:53:09:0B:B9";101 100 // private static final String MAC_ADDRESS = "9C:B7:0D:75:A8:05"; // Discovery Channel Canada 102 // private static final String MAC_ADDRESS = "9C:B7:0D:90:EB:92"; // Steve Harvey 101 // private static final String MAC_ADDRESS = "9C:B7:0D:90:EB:92"; // Steve Harvey Show 103 102 104 103 // int audioFile = R.raw.throttle_max_android_common; … … 128 127 * The device currently in use, or {@code null}. 129 128 */ 130 private UsbSerialDriver mSerialDevice;129 // private UsbSerialDriver mSerialDevice; 131 130 132 131 /** 133 132 * The system's USB service. 134 133 */ 135 private UsbManager mUsbManager; 136 137 138 private final ExecutorService mExecutor = Executors.newSingleThreadExecutor(); 139 140 private SerialInputOutputManager mSerialIoManager; 141 142 private final SerialInputOutputManager.Listener mListener = 143 new SerialInputOutputManager.Listener() { 144 145 public void onRunError(Exception e) { 146 // Log.d(TAG, "Runner stopped."); 147 } 148 149 public void onNewData(final byte[] data) { 150 // PuzzleboxBrainstormsHelicopter.this.runOnUiThread(new Runnable() { 151 // @Override 152 // public void run() { 153 // PuzzleboxBrainstormsHelicopter.this.updateReceivedData(data); 154 // } 155 // }); 156 } 157 }; 158 159 160 @SuppressWarnings("deprecation") 134 // private UsbManager mUsbManager; 135 136 137 // private final ExecutorService mExecutor = Executors.newSingleThreadExecutor(); 138 139 // private SerialInputOutputManager mSerialIoManager; 140 141 // private final SerialInputOutputManager.Listener mListener = 142 // new SerialInputOutputManager.Listener() { 143 // 144 // public void onRunError(Exception e) { 145 // // Log.d(TAG, "Runner stopped."); 146 // } 147 // 148 // public void onNewData(final byte[] data) { 149 // // PuzzleboxBrainstormsHelicopter.this.runOnUiThread(new Runnable() { 150 // // @Override 151 // // public void run() { 152 // // PuzzleboxBrainstormsHelicopter.this.updateReceivedData(data); 153 // // } 154 // // }); 155 // } 156 // }; 157 158 161 159 @Override 162 160 public void onCreate(Bundle savedInstanceState) { … … 166 164 setContentView(R.layout.activity_main); 167 165 168 mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);166 // mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE); 169 167 170 168 progressBarAttention = (ProgressBar)findViewById(R.id.progressBarAttention); … … 216 214 217 215 218 updatePowerThresholds();219 updatePower();220 221 222 216 tv = (TextView)findViewById(R.id.textViewDebugConsole); 223 217 tv.setMovementMethod(new ScrollingMovementMethod()); 224 218 tv.setText(""); 225 219 appendTextAndScroll("Android version: " + Integer.valueOf(android.os.Build.VERSION.SDK) + "\n" ); 220 221 222 updatePowerThresholds(); 223 updatePower(); 226 224 227 225 … … 238 236 239 237 240 serial = new SerialDevice();241 serial.setSerialDevice(mSerialDevice);238 // serial = new SerialDevice(); 239 // serial.setSerialDevice(mSerialDevice); 242 240 243 241 … … 267 265 protected void onResume() { 268 266 super.onResume(); 269 mSerialDevice = UsbSerialProber.acquire(mUsbManager);270 // Log.d(TAG, "Resumed, mSerialDevice=" + mSerialDevice);271 if (mSerialDevice == null) {272 Log.d(TAG, "No Serial device found");273 // appendTextAndScroll("No serial device found\n");274 } else {275 try {276 mSerialDevice.open();277 mSerialDevice.setBaudRate(serialBaudRate);278 serial.setSerialDevice(mSerialDevice);279 serial.execute(new String[] {""} );280 } catch (IOException e) {281 Log.e(TAG, "Error opening device: " + e.getMessage(), e);282 // appendTextAndScroll("Error opening device: " + e.getMessage() + "\n");283 284 try {285 mSerialDevice.close();286 } catch (IOException e2) {287 // Ignore.288 }289 mSerialDevice = null;290 serial.setSerialDevice(null);291 return;292 }293 appendTextAndScroll("Serial device: " + mSerialDevice + "\n");294 }267 // mSerialDevice = UsbSerialProber.acquire(mUsbManager); 268 // // Log.d(TAG, "Resumed, mSerialDevice=" + mSerialDevice); 269 // if (mSerialDevice == null) { 270 // Log.d(TAG, "No Serial device found"); 271 // // appendTextAndScroll("No serial device found\n"); 272 // } else { 273 // try { 274 // mSerialDevice.open(); 275 // mSerialDevice.setBaudRate(serialBaudRate); 276 // serial.setSerialDevice(mSerialDevice); 277 // serial.execute(new String[] {""} ); 278 // } catch (IOException e) { 279 // Log.e(TAG, "Error opening device: " + e.getMessage(), e); 280 // // appendTextAndScroll("Error opening device: " + e.getMessage() + "\n"); 281 // 282 // try { 283 // mSerialDevice.close(); 284 // } catch (IOException e2) { 285 // // Ignore. 286 // } 287 // mSerialDevice = null; 288 // serial.setSerialDevice(null); 289 // return; 290 // } 291 // appendTextAndScroll("Serial device: " + mSerialDevice + "\n"); 292 // } 295 293 onDeviceStateChange(); 296 294 } … … 300 298 public void onDestroy() { 301 299 tgDevice.close(); 302 if (mSerialDevice != null) {303 try {304 mSerialDevice.close();305 } catch (IOException e) {306 // TODO Auto-generated catch block307 e.printStackTrace();308 }309 }300 // if (mSerialDevice != null) { 301 // try { 302 // mSerialDevice.close(); 303 // } catch (IOException e) { 304 // // TODO Auto-generated catch block 305 // e.printStackTrace(); 306 // } 307 // } 310 308 super.onDestroy(); 311 309 } … … 318 316 */ 319 317 320 // @SuppressLint({ "HandlerLeak", "HandlerLeak" })318 @SuppressLint("HandlerLeak") 321 319 @Override 322 320 public void handleMessage(Message msg) { … … 411 409 tgDevice.connect(rawEnabled); 412 410 413 //else if (tgDevice.getState() == TGDevice.STATE_CONNECTED)414 //disconnectHeadset();411 else if (tgDevice.getState() == TGDevice.STATE_CONNECTED) 412 disconnectHeadset(); 415 413 416 414 … … 579 577 // writeCommand(command); 580 578 581 if (mSerialDevice != null) {582 serial.setCommand(command);583 }579 // if (mSerialDevice != null) { 580 // serial.setCommand(command); 581 // } 584 582 585 583 currentCommand = command; … … 601 599 command = "%000"; 602 600 603 Log.v(TAG, "Command for serial device: " + command); 601 Log.v(TAG, "Power command: " + command); 602 // Log.v(TAG, "Command for serial device: " + command); 604 603 // appendTextAndScroll("Command for serial device: " + command + "\n"); 605 604 … … 703 702 704 703 private void stopIoManager() { 705 if (mSerialIoManager != null) {706 // Log.i(TAG, "Stopping io manager ..");707 mSerialIoManager.stop();708 mSerialIoManager = null;709 }704 // if (mSerialIoManager != null) { 705 // // Log.i(TAG, "Stopping io manager .."); 706 // mSerialIoManager.stop(); 707 // mSerialIoManager = null; 708 // } 710 709 } // stopIoManager 711 710 712 711 713 712 private void startIoManager() { 714 if (mSerialDevice != null) {715 // Log.i(TAG, "Starting io manager ..");716 mSerialIoManager = new SerialInputOutputManager(mSerialDevice, mListener);717 mExecutor.submit(mSerialIoManager);718 }713 // if (mSerialDevice != null) { 714 // // Log.i(TAG, "Starting io manager .."); 715 // mSerialIoManager = new SerialInputOutputManager(mSerialDevice, mListener); 716 // mExecutor.submit(mSerialIoManager); 717 // } 719 718 } // startIoManager 720 719 … … 747 746 748 747 void playTone(){ 749 @SuppressWarnings("deprecation")750 748 final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, 751 749 // sampleRate, AudioFormat.CHANNEL_CONFIGURATION_MONO,
Note: See TracChangeset
for help on using the changeset viewer.