Changeset 1a53973 in orbit for android/src/info

Timestamp:

11/25/12 14:01:35 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

71aa88f

Parents:

41c4762

Message:

android:

• initial release for Instructable (Chapter 2)

arduino:

• disabling BlueSMiRF

Location:

android/src/info/puzzlebox/orbit

Files:

• MainActivity.java (modified) (1 diff)
• SerialDevice.java (modified) (3 diffs)

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

@@ -533 +533 @@
                 }
 
-                command = "hover";
+//              command = "hover";
+                command = "idle";
                 appendTextAndScroll("Command for serial device: " + command + "\n");
                 serial.setCommand(command);

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

@@ -30 +30 @@
         
         String commandNeutral = "x000";
-//      String commandHover = "x085";
-        String commandHover = "x085\r";
+        String commandHover = "x085";
+        String commandIdle = "x030";
         String commandMaximumThrust = "x100";
 
@@ -39 +39 @@
                 String response = "";
 //              byte[] setting = commandNeutral;
-//              String setting = commandNeutral;
-                String setting = commandHover;
+                String setting = commandNeutral;
+//              String setting = commandHover;
                 
                 while (keep_running) {
@@ -46 +46 @@
                         if (command == "neutral") {
                                 setting = commandNeutral;
+                        } else if (command == "idle") {
+                                setting = commandIdle;
                         } else if (command == "hover") {
                                 setting = commandHover;