Changeset 1a53973 in orbit for android/src


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • android/src/info/puzzlebox/orbit/MainActivity.java

    r41c4762 r1a53973  
    533533                } 
    534534 
    535                 command = "hover"; 
     535//              command = "hover"; 
     536                command = "idle"; 
    536537                appendTextAndScroll("Command for serial device: " + command + "\n"); 
    537538                serial.setCommand(command); 
  • android/src/info/puzzlebox/orbit/SerialDevice.java

    r41c4762 r1a53973  
    3030         
    3131        String commandNeutral = "x000"; 
    32 //      String commandHover = "x085"; 
    33         String commandHover = "x085\r"; 
     32        String commandHover = "x085"; 
     33        String commandIdle = "x030"; 
    3434        String commandMaximumThrust = "x100"; 
    3535 
     
    3939                String response = ""; 
    4040//              byte[] setting = commandNeutral; 
    41 //              String setting = commandNeutral; 
    42                 String setting = commandHover; 
     41                String setting = commandNeutral; 
     42//              String setting = commandHover; 
    4343                 
    4444                while (keep_running) { 
     
    4646                        if (command == "neutral") { 
    4747                                setting = commandNeutral; 
     48                        } else if (command == "idle") { 
     49                                setting = commandIdle; 
    4850                        } else if (command == "hover") { 
    4951                                setting = commandHover; 
Note: See TracChangeset for help on using the changeset viewer.