diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-02-04 22:57:01 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-02-04 22:57:01 -0800 |
| commit | fce963dab70b163a79cb52dff4bac3dfd32c5f37 (patch) | |
| tree | d28c88ce9f5432e5ed01407689153c297ea72be0 /mavigator-server/src/main/scala/mavigator/Router.scala | |
| parent | b57a8c710d94ab6ce35fbbb0b9fc00649792e4be (diff) | |
| download | mavigator-fce963dab70b163a79cb52dff4bac3dfd32c5f37.tar.gz mavigator-fce963dab70b163a79cb52dff4bac3dfd32c5f37.tar.bz2 mavigator-fce963dab70b163a79cb52dff4bac3dfd32c5f37.zip | |
move mock connection to stream (performance is really bad)
Diffstat (limited to 'mavigator-server/src/main/scala/mavigator/Router.scala')
| -rw-r--r-- | mavigator-server/src/main/scala/mavigator/Router.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mavigator-server/src/main/scala/mavigator/Router.scala b/mavigator-server/src/main/scala/mavigator/Router.scala index 1d2107a..6d442bf 100644 --- a/mavigator-server/src/main/scala/mavigator/Router.scala +++ b/mavigator-server/src/main/scala/mavigator/Router.scala @@ -31,7 +31,7 @@ object Router { path("info") { get { val f: Html = mavigator.views.html.dashboard( - "socket", + "ws://localhost:8080/mavlink", 0, 0, 0 @@ -57,8 +57,7 @@ object Router { } val toWebSocket = Flow[ByteString].map{bytes => - //BinaryMessage(bytes) - TextMessage(bytes.decodeString("UTF-8")) + BinaryMessage(bytes) } val bytes = Uav().connect() |