Changeset 41c4762 in orbit

Timestamp:

11/22/12 15:55:01 (10 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

6aa182f, 1a53973

Parents:

60b4520

Message:

• Working version
• Control via Arduino UNO

Location:

android

Files:

• libs/usb-serial-for-android-v010.jar (added)
• src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java (deleted)
• src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java (deleted)
• src/com/hoho/android/usbserial/driver/UsbSerialDriver.java (deleted)
• src/com/hoho/android/usbserial/driver/UsbSerialProber.java (deleted)
• src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java (deleted)
• src/com/hoho/android/usbserial/util/HexDump.java (deleted)
• src/com/hoho/android/usbserial/util/SerialInputOutputManager.java (deleted)
• src/info/puzzlebox/orbit/MainActivity.java (modified) (3 diffs)
• src/info/puzzlebox/orbit/SerialDevice.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import android.hardware.usb.UsbManager;
 import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
+//import android.view.Menu;
+//import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -31 +31 @@
 import android.widget.TextView;
 import android.widget.Toast;
-import android.support.v4.app.NavUtils;
+//import android.support.v4.app.NavUtils;
 import android.text.Layout;
 import android.text.method.ScrollingMovementMethod;
@@ -80 +80 @@
 
         SerialDevice serial;
-        //      int serialBaudRate = 9600;
-        int serialBaudRate = 133333;
+        int serialBaudRate = 9600;
+//      int serialBaudRate = 133333;
 
 

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

@@ -18 +18 @@
 class SerialDevice extends AsyncTask<String, Void, String> {
 
-        int device_frame_cycle = 21; // 22ms frame cycle for Blade mCX2 (MLP4DSM RC)
+//      int device_frame_cycle = 21; // 22ms frame cycle for Blade mCX2 (MLP4DSM RC)
+//      int device_frame_cycle = 500; // 0.5s frame cycle for Arduino
+        int device_frame_cycle = 1000; // 1s frame cycle for Arduino
         boolean keep_running = true;
         private UsbSerialDriver mSerialDevice;
         //      TextView tv;
 
-        byte[] commandNeutral = {0x00, 0x00, 0x00, (byte) 0xaa, 0x05, (byte) 0xff, 0x09, (byte) 0xff, 0x0d, (byte) 0xff, 0x13, 0x54, 0x14, (byte) 0xaa};
-        byte[] commandHover = {0x00, 0x00, 0x01, 0x7d, 0x05, (byte) 0xc5, 0x09, (byte) 0xde, 0x0e, 0x0b, 0x13, 0x54, 0x14, (byte) 0xaa};
-        byte[] commandMaximumThrust = {0x00, 0x00, 0x03, 0x54, 0x05, (byte) 0xc5, 0x09, (byte) 0xde, 0x0e, 0x0b, 0x13, 0x54, 0x14, (byte) 0xaa};
+//      byte[] commandNeutral = {0x00, 0x00, 0x00, (byte) 0xaa, 0x05, (byte) 0xff, 0x09, (byte) 0xff, 0x0d, (byte) 0xff, 0x13, 0x54, 0x14, (byte) 0xaa};
+//      byte[] commandHover = {0x00, 0x00, 0x01, 0x7d, 0x05, (byte) 0xc5, 0x09, (byte) 0xde, 0x0e, 0x0b, 0x13, 0x54, 0x14, (byte) 0xaa};
+//      byte[] commandMaximumThrust = {0x00, 0x00, 0x03, 0x54, 0x05, (byte) 0xc5, 0x09, (byte) 0xde, 0x0e, 0x0b, 0x13, 0x54, 0x14, (byte) 0xaa};
+        
+        String commandNeutral = "x000";
+//      String commandHover = "x085";
+        String commandHover = "x085\r";
+        String commandMaximumThrust = "x100";
 
         String command = "neutral";
@@ -31 +38 @@
         protected String doInBackground(String... buffers) {
                 String response = "";
-                byte[] setting = commandNeutral;
-
+//              byte[] setting = commandNeutral;
+//              String setting = commandNeutral;
+                String setting = commandHover;
+                
                 while (keep_running) {
 
@@ -43 +52 @@
                         }
 
-
                         if (mSerialDevice != null) {
 
                                 try {
-                                        //mSerialDevice.write(setting, 1000);
-                                        mSerialDevice.write(setting, device_frame_cycle);
+                                        mSerialDevice.write(setting.getBytes(), device_frame_cycle);
                                 } catch (IOException e) {
                                         // TODO Auto-generated catch block