Skip to content

Commit

Permalink
Merging in all the code form @ChrisTheBaron.
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Williams committed May 4, 2015
2 parents 4e9fe43 + fbcae93 commit 8c09f5c
Show file tree
Hide file tree
Showing 12 changed files with 691 additions and 347 deletions.
24 changes: 22 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
trim_trailing_whitespace = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8

# Two space indentation (no size specified)
[*.js]
indent_style = space
indent_size = 2


# Indentation override for all JS under lib directory
[lib/**.js]
indent_style = space
indent_size = 2

# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
89 changes: 88 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,89 @@
# Created by https://www.gitignore.io

### Linux ###
*~

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*


### Node ###
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
.DS_Store


### WebStorm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
20 changes: 0 additions & 20 deletions CONTRIBUTING.md

This file was deleted.

24 changes: 0 additions & 24 deletions Gruntfile.js

This file was deleted.

1 change: 1 addition & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2015 Jack Watson-Hamblin
2015 Chris Taylor

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
12 changes: 3 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,8 @@ npm install rolling-spider

## Status

This module is still under [heavy development](CONTRIBUTING.md), so please don't be surprised if
you find some functionality missing or undocumented.
Stable. Minor configuration settings have yet to be done, but otherwise this module is stablized and can perform great flight control.

However, the documented parts are tested and should work well for most parts.

## Warning

This is meant to work with hardware. If you use this you agree that by using it you assume all responsibility. If you use it and your drone smashes into your ceiling fan, that's your fault. By using this code you assume all responsibility for your usage of it. I'm not liable for anything you do with this code.

## Getting Started

Expand Down Expand Up @@ -109,7 +103,7 @@ Previous versions of the `rolling-spider` library required you to specify the UU

### Client API

#### arDrone.createClient([options])
#### RollingSpider.createClient([options])

Returns a new `Client` object. `options` include:

Expand Down Expand Up @@ -181,4 +175,4 @@ Disconnects from the drone if it is connected.

#### client.emergancy() __or__ client.emergency()

Causes the drone to shut off the motors "instantly" (sometimes has to wait for other commands ahead of it to complete... not fully safe yet)
Causes the drone to shut off the motors "instantly" (sometimes has to wait for other commands ahead of it to complete... not fully safe yet)
12 changes: 0 additions & 12 deletions changelog.md

This file was deleted.

22 changes: 22 additions & 0 deletions examples/basic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
var RollingSpider = require("parrot-rolling-spider");

var yourDrone = new RollingSpider();

yourDrone.connect(function () {

yourDrone.trim();
yourDrone.takeOff();

setTimeout(function () {

yourDrone.forward(50);

setTimeout(function () {

yourDrone.land();

}, 500);

}, 3000);

});
11 changes: 11 additions & 0 deletions examples/discovery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';

var noble = require('noble');

noble.startScanning();

noble.on('discover', function (peripheral) {

console.log(peripheral.advertisement.localName + ' (' + peripheral.uuid + ')');

});
1 change: 0 additions & 1 deletion index.js

This file was deleted.

Loading

0 comments on commit 8c09f5c

Please sign in to comment.