Skip to content
This repository has been archived by the owner on Nov 18, 2019. It is now read-only.

Commit

Permalink
Release 0.1.0 (#9)
Browse files Browse the repository at this point in the history
* Update .travis.yml for dev branch

Travis CI will now only run for the `master`, `development`,
`release-x.x.x`, and `hotfix-x.x.x` branches and for pull requests

* Add only under branches in .travis.yml

* Update package.json and README for 0.1.0 release
  • Loading branch information
Bradley Bridges authored Jun 27, 2017
1 parent a53ae1a commit d1e6e28
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 36 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
language: node_js
node_js:
- node
- '8'
- '7'
- '6'
python:
- '3.5'
sudo: required
dist: trusty
services:
- docker
branches:
only:
- master
- development
- /^release-.*$/
- /^hotfix-.*$/
before_install:
- sudo apt-get -y install python3-pip python-dev
- sudo pip3 install -U setuptools
Expand Down
38 changes: 7 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ Flight View
==

[![Build Status](
https://travis-ci.org/uav-team-ut/Flight-View.svg?branch=master)](
https://travis-ci.org/uav-team-ut/Flight-View)
https://travis-ci.org/uavaustin/Flight-View.svg?branch=master)](
https://travis-ci.org/uavaustin/Flight-View)

> Unmanned Aerial Vehicle Team | The University of Texas at Austin
> Unmanned Aerial Vehicle Team | UT Austin
Main GUI used to display telemetry and other flight information built on
[Electron](http://electron.atom.io) by GitHub.

Multiples instances of Flight View can be connected together so that
single connections to other programs can be shared between them. All the
connected instances show the same information.

Installation
--
Ensure you have [Git](https://git-scm.com/downloads) installed on your system
Expand All @@ -28,7 +24,7 @@ Navigate to the directory where you want to install Flight View and run
the following to clone the repository and install all needed dependencies:

```
git clone https://github.com/uav-team-ut/Flight-View.git
git clone https://github.com/uavaustin/Flight-View.git
cd Flight-View
npm install
```
Expand All @@ -40,18 +36,6 @@ To run the program, navigate to the Flight View and run the following:
npm start
```

Afterwords you will be prompted to either run Flight View in Host or
Listen mode. If this is the only instance to be opened simply run it in Host
mode.

Otherwise, run Flight View in Host mode on one instance, and in Listen
mode on the others. Enter the local IP address of the hosting computer to
connect to it. The local IP address can be found on the instance in Host mode
at the top right.

<!-- TODO: Include information on connecting to Image Corrector and
Telemetry Sender. -->

AUVSI&nbsp;SUAS Competition Server
--
Flight&nbsp;View can connect to the
Expand All @@ -62,26 +46,18 @@ The server is released as a Docker image. To run the server, install
[Docker](https://docs.docker.com/engine/installation/) and then run the
following to have the server run in the Docker daemon:
```
docker run -d -i -t -p 8000:80 --name interop-server auvsisuas/interop-server
docker run -itd -p 8000:80 --name interop-server auvsisuas/interop-server
```
The following can be used to start and stop the server:
```
sudo docker start interop-server
sudo docker stop interop-server
docker start interop-server
docker stop interop-server
```

To connect to the server in Flight&nbsp;View click on "Log in" in the top right
corner after Flight&nbsp;View is in either Host or Listen mode. The URL is
the IP address of the computer the server is running on and the port 8000
(unless the port has been changed), such as `192.168.0.150:8000`.

The default server username and password combinations are:
- `testuser` and `testpass`
- `testadmin` and `testpass`

Only one instance of Flight&nbsp;View needs to logged in to the server for the
system to be connected.

Repository Contents
--
The program is divided into two processes: the main and renderer processes.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flight-view",
"version": "0.0.1",
"version": "0.1.0",
"description": "",
"main": "main.js",
"scripts": {
Expand Down Expand Up @@ -39,6 +39,6 @@
},
"repository": {
"type": "git",
"url": "git://github.com/uav-team-ut/Flight-View.git"
"url": "git://github.com/uavaustin/Flight-View.git"
}
}

0 comments on commit d1e6e28

Please sign in to comment.