wellton/ardrone-nodejs-browser-control
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Organized the code better - but drone camera feed now stopped working

Ver Código-Fonte
Esse commit está contido em:
Rohit Ghatol
2013-06-29 19:42:13 -05:00
pai f737e86911
commit c386b0c188
3 arquivos alterados com 89 adições e 49 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
.idea/workspace.xml
gerado
+55 -15
Ver Arquivo
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f188893c-2c4c-444d-a925-084a4f6d4970" name="Default" comment="" />
<list default="true" id="f188893c-2c4c-444d-a925-084a4f6d4970" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/index.html" afterPath="$PROJECT_DIR$/public/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/server.js" afterPath="$PROJECT_DIR$/server.js" />
</list>
<ignored path="ardrone-nodejs-browser-control.iws" />
<ignored path=".idea/workspace.xml" />
<file path="/Dummy.txt" changelist="f188893c-2c4c-444d-a925-084a4f6d4970" time="1372550629709" ignored="false" />
<file path="/index.html" changelist="f188893c-2c4c-444d-a925-084a4f6d4970" time="1372551367184" ignored="false" />
<file path="/index.html" changelist="f188893c-2c4c-444d-a925-084a4f6d4970" time="1372552841263" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,13 +49,13 @@
<file leaf-file-name="server.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="16" column="2" selection-start="354" selection-end="354" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="controller.js" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="controller.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drone/controller.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -61,11 +64,31 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="camera-feed.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drone/camera-feed.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="nodecopter-client.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/nodecopter-client.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="128" column="35" selection-start="4134" selection-end="4134" vertical-scroll-proportion="-8.28">
<folding />
<state line="72" column="12" selection-start="2838" selection-end="2838" vertical-scroll-proportion="0.36868685">
<folding>
<element signature="n#style#0;n#span#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -89,6 +112,7 @@
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/server.js" />
<option value="$PROJECT_DIR$/public/index.html" />
</list>
</option>
@@ -288,14 +312,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="128" column="35" selection-start="4134" selection-end="4134" vertical-scroll-proportion="-8.28">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server.js">
<entry file="file://$PROJECT_DIR$/public/nodecopter-client.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
@@ -309,6 +326,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server.js">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="2" selection-start="354" selection-end="354" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drone/camera-feed.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="72" column="12" selection-start="2838" selection-end="2838" vertical-scroll-proportion="0.36868685">
<folding>
<element signature="n#style#0;n#span#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
public/index.html
+33 -33
Ver Arquivo
@@ -35,40 +35,42 @@
navigator.getUserMedia(constraints, successCallback, errorCallback);
}
function startArDroneController(){
var socket = io.connect('http://localhost:3002');
socket.on('connect', function () { // TIP: you can avoid listening on `connect` and listen on events directly too!
console.log("Connection Successful");
});
socket.on('event', function (data) {
if(data.name=="battery"){
$("#battery-indicator").css('width',data.value+'%');
$("#battery-value").html(data.value+'%');
}
});
$("#takeoff").click(function(){
console.log("Asking Server to send takeoff command to Ar Drone");
socket.emit('event',{name:"takeoff"});
});
$("#spin").click(function(){
console.log("Asking Server to send spin command to Ar Drone");
socket.emit('event',{name:"spin"});
});
$("#stop").click(function(){
console.log("Asking Server to send stop command to Ar Drone");
socket.emit('event',{name:"stop"});
});
$("#land").click(function(){
console.log("Asking Server to send land command to Ar Drone");
socket.emit('event',{name:"land"});
});
}
startArDRoneStream();
startCameraFeed();
var socket = io.connect('http://localhost:3002');
socket.on('connect', function () { // TIP: you can avoid listening on `connect` and listen on events directly too!
console.log("Connection Successful");
});
socket.on('event', function (data) {
if(data.name=="battery"){
$("#battery-indicator").css('width',data.value+'%');
$("#battery-value").html(data.value+'%');
}
});
$("#takeoff").click(function(){
console.log("Asking Server to send takeoff command to Ar Drone");
socket.emit('event',{name:"takeoff"});
});
$("#spin").click(function(){
console.log("Asking Server to send spin command to Ar Drone");
socket.emit('event',{name:"spin"});
});
$("#stop").click(function(){
console.log("Asking Server to send stop command to Ar Drone");
socket.emit('event',{name:"stop"});
});
$("#land").click(function(){
console.log("Asking Server to send land command to Ar Drone");
socket.emit('event',{name:"land"});
});
startArDroneController();
})
</script>
@@ -143,8 +145,6 @@
</td>
</tr>
</table>
<script>
</script>
</body>
</html>
server.js
+1 -1
Ver Arquivo
@@ -14,7 +14,7 @@ app.use(express.static(__dirname + '/public'));
require("./drone/camera-feed");
require("./drone/controller");
//require("./drone/controller");
app.listen(3000);