Skip to content

Commit 71f57cb

Browse files
committedMar 22, 2014
Fix build warnings
1 parent b836e3f commit 71f57cb

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed
 

‎input.rst

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ gestureCallback(String event, Function callback) : void
66

77
Event Types
88
Each of these follows the `parameters provided by the GDK <https://developers.google.com/glass/develop/gdk/reference/com/google/android/glass/touchpad/GestureDetector>`_
9+
910
:onGesture(String gesture): The gestures that can be returned are `listed here <https://developers.google.com/glass/develop/gdk/reference/com/google/android/glass/touchpad/Gesture>`_: LONG_PRESS, SWIPE_DOWN, SWIPE_LEFT, SWIPE_RIGHT, TAP, THREE_LONG_PRESS, THREE_TAP, TWO_LONG_PRESS, TWO_SWIPE_RIGHT, TWO_SWIPE_UP, TWO_TAP
1011
:onGesture<GESTURE>(): Shorthand for a specific gesture (e.g., onGestureTAP).
1112
:onFingerCountChanged(int previousCount, int currentCount):

‎setup-server.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Server Setup
66
.. _our-server:
77

88
0a. Using Our Server
9-
----------------
9+
--------------------
1010
* Visit https://api.picar.us/wearscript/, then sign-in using your Google acccount
1111
* Alternatively, we provide a server that tracks the 'dev' branch https://api.picar.us/wearscriptdev/
1212

1313
.. _your-server:
1414

1515
0b. Install Server
16-
--------------
16+
------------------
1717
* Server code is located at https://github.com/wearscript/wearscript-server.git
1818
* Playground webapp is located at https://github.com/wearscript/wearscript-playground.git (you need both)
1919
* Linux is highly recommended, we have not tested this on OSX or Windows (feel free to try)
@@ -25,12 +25,12 @@ Server Setup
2525
* Start with ./server and continue with "Connecting the Client to the Server"
2626

2727
Alternate: Installing Go (manually)
28-
------------------------
28+
-----------------------------------
2929
* wget https://go.googlecode.com/files/go1.1.1.linux-amd64.tar.gz
3030
* tar -xzf go1.1.1.linux-amd64.tar.gz
3131
* Put "export GOROOT=<yourpath>/go" and "export GOPATH=<yourpath>/gocode" in your .bashrc
3232
* The "gocode" is where packages will be stored and "go" is the location of the extracted folder.
3333

3434
Alternate: Install Redis
35-
------------------
35+
------------------------
3636
* Follow instructions here http://redis.io/download (tested on 2.6.*)

‎setup-vm.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Virtual Machine
55
By using the VM you will get a full development environment and server. This makes it easier to assist with any problems you run into since we can replicate the environment and fixes only need to be applied once to the VM. If you intend to run this on your personal computer use Vagrant and for servers we recommend EC2.
66

77
0a. Install WearScript VM using Vagrant
8-
--------------------------------------
8+
---------------------------------------
99
* with one click: `Click to Download ZIP <https://github.com/OpenShades/wearscript/archive/master.zip>`_ or using git: git clone https://github.com/OpenShades/wearscript.git
1010
* Install virtual box and the "Oracle VM VirtualBox Extension Pack" (needed for usb) from https://www.virtualbox.org/wiki/Downloads
1111
* Get/install Vagrant (go here http://downloads.vagrantup.com/ get the newest version for your platform)

‎wire.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Motivation and Goals
1313
* Keep local data local if possible (e.g., glass -> phone shouldn't need to go through a server if they are connected)
1414
* Pub/Sub over Point-to-Point: Focusing on channels which represent data types naturally handles 0-to-many devices reacting to it.
1515
* Minimize data transfer, if nothing is listening on a channel then sending to it is a null-op
16-
* Support a directed-acyclic-graph topology, where local devices can act as hubs (e.g., a phone is a hub for a watch, Glass, and arduino) and connect to other hubs (e.g., a remote s
17-
erver)
16+
* Support a directed-acyclic-graph topology, where local devices can act as hubs (e.g., a phone is a hub for a watch, Glass, and arduino) and connect to other hubs (e.g., a remote server)
1817
* Instead of having strict guarantees about delivery, provide a set of constraints that can be met given the fickle nature of mobile connectivity to eliminate edge cases
1918

2019
Protocol Rules

0 commit comments

Comments
 (0)
Please sign in to comment.