Skip to content

Bluetooth #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 8, 2016
Merged

Bluetooth #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84a95e9
using bluetooth from hackathon
cesine Jan 2, 2016
08011b9
updating bluetooth sample code sdk 23
cesine Jan 2, 2016
cc213f6
prefixing bluetooth strings
cesine Jan 2, 2016
e392486
asking user to turn on bluetooth if device has bluetooth
cesine Jan 2, 2016
62ac66e
dividing lexicon from rover lexicon
cesine Jan 2, 2016
c7fc2fb
renaming makeitunderstand to a robot
cesine Jan 2, 2016
4bfc08f
practice makeItUnderstand
cesine Jan 2, 2016
d17eb45
sending understood commands to a blue tooth device
cesine Jan 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions AndroidArduinoOpenCV/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
<string name="hello">Roogle rover</string>
<string name="app_name">Roogle rover</string>






<!-- BluetoothChat -->
<string name="send">Send</string>
<string name="not_connected">You are not connected to a device</string>
<string name="not_connected">You are not connected to a device.</string>
<string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
<string name="title_connecting">connecting...</string>
<string name="title_connected_to">connected: </string>
<string name="title_not_connected">not connected</string>
<string name="title_connecting">Connecting...</string>
<string name="title_connected_to">Connected: </string>
<string name="title_not_connected">Not connected.</string>

<!-- DeviceListActivity -->
<string name="scanning">scanning for devices...</string>
<string name="select_device">select a device to connect</string>
<string name="scanning">Scanning for devices...</string>
<string name="select_device">Select a device to connect</string>
<string name="none_paired">No devices have been paired</string>
<string name="none_found">No devices found</string>
<string name="title_paired_devices">Paired Devices</string>
Expand All @@ -26,4 +27,4 @@
<!-- Options Menu -->
<string name="connect">Connect a device</string>
<string name="discoverable">Make discoverable</string>
</resources>
</resources>
12 changes: 12 additions & 0 deletions Tutorial/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.androidmontreal.gesturevoicecommander" >

<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<uses-sdk
Expand All @@ -43,6 +45,10 @@
</activity>
<activity
android:name=".practice.MakeItUnderstandGestures"
android:label="Speech Recognition" >
</activity>
<activity
android:name=".robots.Robot"
android:label="Gesture or Speech Recognition" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -51,6 +57,12 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".robots.DeviceListActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/select_device"
android:theme="@android:style/Theme.Holo.Dialog">
</activity>
</application>

</manifest>
7 changes: 3 additions & 4 deletions ...ain/java/com/androidmontreal/gesturevoicecommander/practice/MakeItUnderstandGestures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import com.androidmontreal.gesturevoicecommander.GestureBuilderActivity;
import com.androidmontreal.gesturevoicecommander.R;
import com.androidmontreal.gesturevoicecommander.robots.RoverLexicon;
import com.androidmontreal.gesturevoicecommander.robots.Lexicon;

/**
* Building on what we saw in MakeItListenAndRepeat, now lets make it understand
Expand Down Expand Up @@ -52,7 +52,7 @@ public class MakeItUnderstandGestures extends Activity implements OnInitListener
private GestureLibrary gestureLib;

/* A little lexicon we made for the DFR Rover at Cloud Robotics Hackathon */
private RoverLexicon lexicon;
private Lexicon lexicon;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -71,8 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
}
setContentView(gestureOverlayView);

lexicon = new RoverLexicon();

lexicon = new Lexicon();
}

protected void promptTheUserToTalk() {
Expand Down
Loading