diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-26 17:04:04 -0700 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-26 17:04:04 -0700 |
| commit | 415c32bfb02b25d510aca115ca5f075e3cda0c36 (patch) | |
| tree | c304804085e65dd385437fcd7da61d2e96e52605 | |
| parent | 44c9bacf3b3ef24a0f0ef971db45f145b54ff77c (diff) | |
| parent | 10a57e25f29bd4cdf8caf50d1ebeff20ac506b9d (diff) | |
| download | jasper-client-415c32bfb02b25d510aca115ca5f075e3cda0c36.tar.gz jasper-client-415c32bfb02b25d510aca115ca5f075e3cda0c36.zip | |
Merge upstream changes
Conflicts:
client/local_mic.py
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | client/main.py | 5 |
2 files changed, 13 insertions, 4 deletions
@@ -3,14 +3,20 @@ jasper-client Client code for the Jasper voice computing platform. Jasper is an open source platform for developing always-on, voice-controlled applications. -Learn more at [jasperproject.github.io](http://jasperproject.github.io/), where we have assembly and installation instructions, as well as extensive documentation. +Learn more at [jasperproject.github.io](http://jasperproject.github.io/), where we have assembly and installation instructions, as well as extensive documentation. For the relevant disk image, please visit [SourceForge](http://sourceforge.net/projects/jasperproject/). + +## Contributing + +If you'd like to contribute to Jasper, we've created a Contributing Guide, available [here](https://github.com/jasperproject/jasper-client/blob/master/CONTRIBUTING.md). It outlines the philosophies to preserve, tests to run, and more. If you're looking for potential features to build, we've included some recommendations there as well. + +We highly recommend reading through this guide before writing any code. Thanks in advance for any and all work you contribute to Jasper! ## Contact Jasper is developed by [Shubhro Saha](http://www.princeton.edu/~saha/) and [Charles Marsh](http://www.princeton.edu/~crmarsh/). Both can be reached by email at [saha@princeton.edu](mailto:saha@princeton.edu) and [crmarsh@princeton.edu](mailto:crmarsh@princeton.edu) respectively. ## Major Updates - +- 2014-07-11: More platform-independent audio output. https://github.com/jasperproject/jasper-client/pull/100. Thank you, astahlman! - 2014-05-27: The network setup wizard has been removed because of unreliability. The client code and documentation has been updated, requiring new users to manually configure their `/etc/network/interfaces` file. ## License @@ -37,4 +43,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.
\ No newline at end of file +SOFTWARE. diff --git a/client/main.py b/client/main.py index 7920832..ccafdb9 100644 --- a/client/main.py +++ b/client/main.py @@ -31,7 +31,10 @@ if __name__ == "__main__": mic = Mic(speaker.newSpeaker(), PocketSphinxSTT(), stt.newSTTEngine(google_api_key)) - mic.say("How can I be of service?") + addendum = "" + if 'first_name' in profile: + addendum = ", %s" % profile["first_name"] + mic.say("How can I be of service%s?" % addendum) conversation = Conversation("JASPER", mic, profile) |