Changeset 4634b1d in orbit for android/src

Timestamp:

12/06/12 03:15:32 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

2b4365b

Parents:

c30c900

Message:

• Updated with HTC One X hover command
• Disconnect/Reconnect? but label update
• less verbose output to one-screen debug console (messages moved to Log)

Location:

android/src/info/puzzlebox/orbit

Files:

• AudioDevice.java (added)
• MainActivity.java (modified) (15 diffs)

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

@@ -34 +34 @@
 import android.widget.Button;
 import android.widget.ProgressBar;
+import android.widget.RemoteViews;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -78 +79 @@
         Button b;
 
+        String TAG = "MainActivity";
+
         int tgSignal = 0;
         int[] thresholdValuesAttention = new int[101];
@@ -98 +101 @@
         //      private static final String MAC_ADDRESS = "00:16:53:09:0B:B9";
 
-
+        //      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;
 
         String currentCommand = "neutral";
 
-        //      2012.11.28-orbit-hdmi-android-manual_from_untitled08.wav
         private SoundPool soundPool;
         private int soundID;
@@ -211 +216 @@
 
                 updatePowerThresholds();
-                //              updateNXTPower();
                 updatePower();
 
@@ -252 +256 @@
                         }
                 });
-                soundID = soundPool.load(this, R.raw.throttle_max_android_common, 1);
-//              soundID = soundPool.load(this, R.raw.throttle_min_android_common, 1);
-//              soundID = soundPool.load(this, R.raw.throttle_max_android_htc_one_x, 1);
+
+                soundID = soundPool.load(this, audioFile, 1);
 
 
@@ -266 +269 @@
                 //        Log.d(TAG, "Resumed, mSerialDevice=" + mSerialDevice);
                 if (mSerialDevice == null) {
-                        //          mTitleTextView.setText("No serial device.");
-                        //            tv.setText("No serial device.\n");
-                        appendTextAndScroll("No serial device.\n");
+                        Log.d(TAG, "No Serial device found");
+                        //                      appendTextAndScroll("No serial device found\n");
                 } else {
                         try {
@@ -276 +278 @@
                                 serial.execute(new String[] {""} );
                         } catch (IOException e) {
-                                //                Log.e(TAG, "Error setting up device: " + e.getMessage(), e);
-                                //              mTitleTextView.setText("Error opening device: " + e.getMessage());
-                                //                tv.setText("Error opening device: " + e.getMessage() + "\n");
-                                appendTextAndScroll("Error opening device: " + e.getMessage() + "\n");
+                                Log.e(TAG, "Error opening device: " + e.getMessage(), e);
+                                //                              appendTextAndScroll("Error opening device: " + e.getMessage() + "\n");
 
                                 try {
@@ -327 +327 @@
                                         break;
                                 case TGDevice.STATE_CONNECTING:
-                                        appendTextAndScroll("Connecting: " + MAC_ADDRESS + "\n");
+                                        Log.d(TAG, "Connecting to EEG: " + MAC_ADDRESS);
+                                        appendTextAndScroll("Connecting to EEG: " + MAC_ADDRESS + "\n");
                                         break;
                                 case TGDevice.STATE_CONNECTED:
-                                        appendTextAndScroll("Connected.\n");
+                                        Log.d(TAG, "EEG Connected");
+                                        appendTextAndScroll("Bluetooth Connected\n");
+                                        setButtonText(R.id.button1, "Disconnect");
                                         tgDevice.start();
                                         break;
                                 case TGDevice.STATE_NOT_FOUND:
-                                        appendTextAndScroll("Can't find\n");
+                                        Log.d(TAG, "EEG headset not found");
+                                        appendTextAndScroll("EEG headset not found\n");
                                         break;
                                 case TGDevice.STATE_NOT_PAIRED:
-                                        appendTextAndScroll("not paired\n");
+                                        Log.d(TAG, "EEG headset not paired");
+                                        appendTextAndScroll("EEG headset not paired\n");
                                         break;
                                 case TGDevice.STATE_DISCONNECTED:
-                                        appendTextAndScroll("Disconnected mang\n");
+                                        Log.d(TAG, "EEG Disconnected");
+//                                      appendTextAndScroll("EEG Disconnected\n");
                                         break;
                                 }
@@ -350 +356 @@
                                 //signal = msg.arg1;
                                 //              tv.append("PoorSignal: " + msg.arg1 + "\n");
-                                appendTextAndScroll("\nPoorSignal: " + msg.arg1 + "\n");
+                                Log.v(TAG, "PoorSignal: " + msg.arg1);
+                                //                              appendTextAndScroll("\nPoorSignal: " + msg.arg1 + "\n");
                                 progressBarSignal.setProgress(tgSignal);
 
-
-                                //                              updateNXTPower();
                                 updatePower();
 
@@ -364 +369 @@
                                 break;
                         case TGDevice.MSG_HEART_RATE:
-                                //                      tv.append("Heart rate: " + msg.arg1 + "\n");
-                                appendTextAndScroll("Heart rate: " + msg.arg1 + "\n");
+                                Log.v(TAG, "Heart rate: " + msg.arg1);
+                                //                              appendTextAndScroll("Heart rate: " + msg.arg1 + "\n");
                                 break;
                         case TGDevice.MSG_ATTENTION:
-                                //att = msg.arg1;
-                                //              tv.append("Attention: " + msg.arg1 + "\n");
-                                appendTextAndScroll("Attention: " + msg.arg1 + "\n");
+                                Log.v(TAG, "Attention: " + msg.arg1);
+                                //                              appendTextAndScroll("Attention: " + msg.arg1 + "\n");
                                 progressBarAttention.setProgress(msg.arg1);
-                                //Log.v("HelloA", "Attention: " + att + "\n");
-
-                                //                              updateNXTPower();
                                 updatePower();
 
                                 break;
                         case TGDevice.MSG_MEDITATION:
-                                //                      tv.append("Meditation: " + msg.arg1 + "\n");
-                                appendTextAndScroll("Meditation: " + msg.arg1 + "\n");
+                                Log.v(TAG, "Meditation: " + msg.arg1);
+                                //                              appendTextAndScroll("Meditation: " + msg.arg1 + "\n");
                                 progressBarMeditation.setProgress(msg.arg1);
-
-                                //                              updateNXTPower();
                                 updatePower();
 
@@ -408 +407 @@
         public void connectHeadset(View view) {
 
-                if(tgDevice.getState() != TGDevice.STATE_CONNECTING && tgDevice.getState() != TGDevice.STATE_CONNECTED)
+                if (tgDevice.getState() != TGDevice.STATE_CONNECTING && tgDevice.getState() != TGDevice.STATE_CONNECTED)
                         tgDevice.connect(rawEnabled);
 
+                else if (tgDevice.getState() == TGDevice.STATE_CONNECTED)
+                        disconnectHeadset();
+
 
         } // connectHeadset
+        
+        
+        public void disconnectHeadset() {
+                tgDevice.stop();
+                tgDevice.close();
+                stopControl();
+                progressBarAttention.setProgress(0);
+                progressBarMeditation.setProgress(0);
+                progressBarSignal.setProgress(0);
+                progressBarPower.setProgress(0);
+                setButtonText(R.id.button1, "Connect");
+                appendTextAndScroll("EEG Disconnected\n");
+        } // disconnectHeadset
+
+
+        public void setButtonText(int buttonId, String text) {
+
+                //              RemoteViews remoteViews = new RemoteViews(getApplicationContext().getPackageName(), R.layout.activity_main);
+                //              remoteViews.setTextViewText(buttonId, text);
+
+                Button button = (Button) findViewById(buttonId);
+                button.setText(text);
+
+        }
 
 
@@ -506 +532 @@
                                 thresholdValuesAttention[i] = power;
 
-                                //                              appendTextAndScroll(i + ":" + power + " ");
                         }
                 }
@@ -545 +570 @@
                 }
 
-                appendTextAndScroll("Command: " + command + "\n");
+                //              appendTextAndScroll("Command: " + command + "\n");
+                Log.v(TAG, "Command: " + command);
 
                 //              String command = getPowerCommand(new_speed);
@@ -573 +599 @@
                         command = "%000";
 
-                appendTextAndScroll("Command for serial device: " + command + "\n");
+                Log.v(TAG, "Command for serial device: " + command);
+                //              appendTextAndScroll("Command for serial device: " + command + "\n");
 
                 return(command);
@@ -614 +641 @@
                 //              playTone();
 
-                playControl();
-
-
+                                playControl();
 
                 //              String command = "neutral";