Skip to content
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.

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

there is something wrong with the encodings.. try this #1

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
cbfc9e0
unknown
cesine Feb 27, 2013
bd25319
bug in rover lexicon
cesine Feb 27, 2013
c1802aa
Merge pull request #11 from cesine/master
cesine Feb 27, 2013
dcb3f65
Merge pull request #1 from AndroidMontreal/master
cesine Feb 27, 2013
0bcdb51
fixing missing accent in pronunciation of arrêter
cesine Feb 27, 2013
bef7410
Merge branch 'master' of github.com:cesine/UpAndRunningWithAndroid
cesine Feb 27, 2013
e351792
adding readmes
cesine Feb 27, 2013
6064b4d
Update README.md
cesine Feb 27, 2013
507b88b
removing checked in v2.6 of pyserial
cesine Aug 11, 2015
303117a
updating to github milestone url changes
cesine Aug 20, 2015
81df884
Merge branch 'master' of github.com:AndroidMontreal/UpAndRunningWithA…
cesine Aug 30, 2015
93aeb68
fixes #13 imported in android studio
cesine Aug 30, 2015
3d62da1
moved speak into a function
cesine Aug 30, 2015
dcaf5fd
formatting in android studio
cesine Aug 30, 2015
dcd5251
handling cases where speech recognition is not avail
cesine Aug 30, 2015
d6ee432
added instructions to look at the menu
cesine Aug 30, 2015
20f2b83
improving rover's french vocab
cesine Aug 30, 2015
bf48b94
updating apks to have new french vocab and catch if missing speech recog
cesine Aug 30, 2015
0d3f258
added wear app to control robots with a watch
cesine Dec 12, 2015
e372282
using icon for watch background
cesine Dec 12, 2015
f76491a
adding presto watch sdk forces min version 18
cesine Dec 12, 2015
ce59c65
added presto listeners
cesine Dec 12, 2015
30bbfd7
apk which can listen to wear events from presto sdk
cesine Dec 13, 2015
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
4962ec7
Merge pull request #5 from cesine/bluetooth
cesine Feb 8, 2016
93397a3
Merge branch 'master' into wear
cesine Feb 9, 2016
cbe4fcf
using recogntion activity as main
cesine Feb 9, 2016
80b5f92
subscribing to tilt events, working on the watch but not receiving on…
cesine Feb 9, 2016
27fbf19
simple app name as Controller
cesine Feb 9, 2016
0ceed89
Merge pull request #4 from cesine/wear
cesine Feb 9, 2016
764d501
updating apk to current version
cesine Feb 9, 2016
e22c820
Merge pull request #14 from cesine/master
cesine Sep 25, 2020
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
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,40 @@ target
ehthumbs.db
Icon?
Thumbs.db


# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/
.idea
*.iml

# Android Studio captures folder
captures/

19 changes: 10 additions & 9 deletions AndroidArduinoOpenCV/res/values/strings.xml
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>
Binary file modified GestureVoiceCommander/res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading