diff --git a/.idea/workspace.xml b/.idea/workspace.xml index aedc975..a76f700 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -46,10 +46,10 @@ - + - + @@ -82,10 +82,10 @@ - + - + @@ -112,8 +112,8 @@ @@ -326,13 +326,6 @@ - - - - - - - @@ -342,13 +335,20 @@ - + + + + + + + + diff --git a/server.js b/server.js index adc288a..ac7fdd5 100644 --- a/server.js +++ b/server.js @@ -14,7 +14,7 @@ app.use(express.static(__dirname + '/public')); require("./drone/camera-feed"); -//require("./drone/controller"); +require("./drone/controller"); app.listen(3000);