Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/herzig/bewegungsfelder i…
Browse files Browse the repository at this point in the history
…nto develop
  • Loading branch information
Ivo Herzig committed Sep 15, 2016
2 parents 155ac42 + f7e4091 commit 3b90803
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,5 +4,6 @@ Bewegungsfelder/obj
Bewegungsfelder.SensorSimulator/bin
Bewegungsfelder.SensorSimulator/obj
packages
.swp
*.*~

8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -21,10 +21,10 @@ Bewegungsfelder is a mobile & customizable inertial motion capture system for sk

#### Smartphone Sensors
Prototype using websockets in develop branch:
1. Start Bewegungsfelder.exe
2. Make sure Smartphone can connect to your PC (i.e. same wifi network)
2. On Smartphone open http://[your-local-ip]:8080
3. Mocap!
1. Start Bewegungsfelder.exe
2. Make sure Smartphone can connect to your PC (i.e. same wifi network)
3. On Smartphone open http://[your-local-ip]:8080
4. Mocap!

#### ESP8266 & MPU6050 Sensors

Expand Down

0 comments on commit 3b90803

Please sign in to comment.