Add video streaming on start button

CCGSRobotics · Nov 17, 2018 · c027c7e · c027c7e
1 parent 7c29bbe
commit c027c7e
Show file tree

Hide file tree

Showing 69 changed files with 25 additions and 14 deletions.
diff --git a/App/CSS/main.css b/App/CSS/main.css
diff --git a/App/JS/Resources/CurrentEmuBotCode2/__pycache__/basic_classes.cpython-35.pyc b/App/JS/Resources/CurrentEmuBotCode2/__pycache__/basic_classes.cpython-35.pyc
diff --git a/App/JS/Resources/CurrentEmuBotCode2/__pycache__/connect.cpython-35.pyc b/App/JS/Resources/CurrentEmuBotCode2/__pycache__/connect.cpython-35.pyc
diff --git a/App/JS/Resources/CurrentEmuBotCode2/__pycache__/constants.cpython-35.pyc b/App/JS/Resources/CurrentEmuBotCode2/__pycache__/constants.cpython-35.pyc
diff --git a/App/JS/Resources/CurrentEmuBotCode2/__pycache__/controller.cpython-35.pyc b/App/JS/Resources/CurrentEmuBotCode2/__pycache__/controller.cpython-35.pyc
diff --git a/App/JS/Resources/CurrentEmuBotCode2/__pycache__/wheel_arm_class.cpython-35.pyc b/App/JS/Resources/CurrentEmuBotCode2/__pycache__/wheel_arm_class.cpython-35.pyc
diff --git a/App/JS/Resources/CurrentEmuBotCode2/basic_classes.py b/App/JS/Resources/CurrentEmuBotCode2/basic_classes.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/client.py b/App/JS/Resources/CurrentEmuBotCode2/client.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/connect.py b/App/JS/Resources/CurrentEmuBotCode2/connect.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/constants.py b/App/JS/Resources/CurrentEmuBotCode2/constants.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/controller.py b/App/JS/Resources/CurrentEmuBotCode2/controller.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/switch.py b/App/JS/Resources/CurrentEmuBotCode2/switch.py
diff --git a/App/JS/Resources/CurrentEmuBotCode2/wheel_arm_class.py b/App/JS/Resources/CurrentEmuBotCode2/wheel_arm_class.py
diff --git a/App/JS/Resources/Player/.gitignore b/App/JS/Resources/Player/.gitignore
diff --git a/App/JS/Resources/Player/README.md b/App/JS/Resources/Player/README.md
diff --git a/App/JS/Resources/Player/lib/_server.js b/App/JS/Resources/Player/lib/_server.js
diff --git a/App/JS/Resources/Player/lib/ffmpeg.js b/App/JS/Resources/Player/lib/ffmpeg.js
diff --git a/App/JS/Resources/Player/lib/raspivid.js b/App/JS/Resources/Player/lib/raspivid.js
diff --git a/App/JS/Resources/Player/lib/remotetcpfeed.js b/App/JS/Resources/Player/lib/remotetcpfeed.js
diff --git a/App/JS/Resources/Player/lib/static.js b/App/JS/Resources/Player/lib/static.js
diff --git a/App/JS/Resources/Player/package.json b/App/JS/Resources/Player/package.json
diff --git a/App/JS/Resources/Player/public/index.html b/App/JS/Resources/Player/public/index.html
diff --git a/App/JS/Resources/Player/samples/admiral.264 b/App/JS/Resources/Player/samples/admiral.264
diff --git a/App/JS/Resources/Player/samples/out.h264 b/App/JS/Resources/Player/samples/out.h264
diff --git a/App/JS/Resources/Player/server-ffmpeg.js b/App/JS/Resources/Player/server-ffmpeg.js
diff --git a/App/JS/Resources/Player/server-rpi.js b/App/JS/Resources/Player/server-rpi.js
diff --git a/App/JS/Resources/Player/server-static.js b/App/JS/Resources/Player/server-static.js
diff --git a/App/JS/Resources/Player/server-tcp.js b/App/JS/Resources/Player/server-tcp.js
@@ -19,8 +19,9 @@ const server  = http.createServer(app);
 
 const feed    = new RemoteTCPFeedRelay(server, {
   feed_ip   : "192.168.100.1",
-  feed_port : 5000,
+  feed_port : 5002,
 });
 
 
 server.listen(8080);
+console.log("Video server listening on port 8080")
diff --git a/App/JS/Resources/Player/vendor/.gitignore b/App/JS/Resources/Player/vendor/.gitignore
diff --git a/App/JS/Resources/Player/vendor/.npmignore b/App/JS/Resources/Player/vendor/.npmignore
diff --git a/App/JS/Resources/Player/vendor/AUTHORS b/App/JS/Resources/Player/vendor/AUTHORS
diff --git a/App/JS/Resources/Player/vendor/LICENSE b/App/JS/Resources/Player/vendor/LICENSE
diff --git a/App/JS/Resources/Player/vendor/README.md b/App/JS/Resources/Player/vendor/README.md
diff --git a/App/JS/Resources/Player/vendor/broadway/Decoder.js b/App/JS/Resources/Player/vendor/broadway/Decoder.js
diff --git a/App/JS/Resources/Player/vendor/canvas/FilterWebGLCanvas.js b/App/JS/Resources/Player/vendor/canvas/FilterWebGLCanvas.js
diff --git a/App/JS/Resources/Player/vendor/canvas/Program.js b/App/JS/Resources/Player/vendor/canvas/Program.js
diff --git a/App/JS/Resources/Player/vendor/canvas/README.md b/App/JS/Resources/Player/vendor/canvas/README.md
diff --git a/App/JS/Resources/Player/vendor/canvas/Script.js b/App/JS/Resources/Player/vendor/canvas/Script.js
diff --git a/App/JS/Resources/Player/vendor/canvas/Shader.js b/App/JS/Resources/Player/vendor/canvas/Shader.js
diff --git a/App/JS/Resources/Player/vendor/canvas/Texture.js b/App/JS/Resources/Player/vendor/canvas/Texture.js
diff --git a/App/JS/Resources/Player/vendor/canvas/WebGLCanvas.js b/App/JS/Resources/Player/vendor/canvas/WebGLCanvas.js
diff --git a/App/JS/Resources/Player/vendor/canvas/YUVCanvas.js b/App/JS/Resources/Player/vendor/canvas/YUVCanvas.js
diff --git a/App/JS/Resources/Player/vendor/canvas/YUVWebGLCanvas.js b/App/JS/Resources/Player/vendor/canvas/YUVWebGLCanvas.js
diff --git a/App/JS/Resources/Player/vendor/dist/http-live-player.js b/App/JS/Resources/Player/vendor/dist/http-live-player.js
diff --git a/App/JS/Resources/Player/vendor/package.json b/App/JS/Resources/Player/vendor/package.json
diff --git a/App/JS/Resources/Player/vendor/utils/Size.js b/App/JS/Resources/Player/vendor/utils/Size.js
diff --git a/App/JS/Resources/Player/vendor/utils/assert.js b/App/JS/Resources/Player/vendor/utils/assert.js
diff --git a/App/JS/Resources/Player/vendor/utils/error.js b/App/JS/Resources/Player/vendor/utils/error.js
diff --git a/App/JS/Resources/Player/vendor/utils/glUtils.js b/App/JS/Resources/Player/vendor/utils/glUtils.js
diff --git a/App/JS/Resources/Player/vendor/utils/inherit.js b/App/JS/Resources/Player/vendor/utils/inherit.js
diff --git a/App/JS/Resources/Player/vendor/wsavc/index.js b/App/JS/Resources/Player/vendor/wsavc/index.js
diff --git a/App/JS/Resources/camera.sh b/App/JS/Resources/camera.sh
diff --git a/App/JS/Resources/settings.json b/App/JS/Resources/settings.json
diff --git a/App/JS/camera.js b/App/JS/camera.js
diff --git a/App/JS/client.js b/App/JS/client.js
diff --git a/App/JS/controller.js b/App/JS/controller.js
diff --git a/App/JS/executeShellCommand.js b/App/JS/executeShellCommand.js
diff --git a/App/JS/main.js b/App/JS/main.js
diff --git a/App/Mobile/server.js b/App/Mobile/server.js
diff --git a/App/Mobile/ws.html b/App/Mobile/ws.html
diff --git a/App/Mobile/ws.js b/App/Mobile/ws.js
diff --git a/App/camera.html b/App/camera.html
diff --git a/App/charts.html b/App/charts.html
diff --git a/App/control.html b/App/control.html
diff --git a/App/controlTest.html b/App/controlTest.html
diff --git a/App/index.html b/App/index.html
@@ -5,8 +5,8 @@
     <title>Dashboard</title>
     <link rel="stylesheet" href="CSS/main.css">
     <script type="text/javascript" src="JS/main.js"></script>
-    <!-- <script type="text/javascript" scr="JS/Resources/Player/server-tcp.js"></script>
-    <script type="text/javascript" src="JS/client.js"></script> -->
+    <!-- <script type="text/javascript" scr="JS/Resources/Player/server-tcp.js"></script> -->
+    <!-- <script type="text/javascript" src="JS/client.js"></script> -->
     <script type="text/javascript">
       var net = require('net');
       var client = new net.Socket();
@@ -44,9 +44,9 @@
       	while (true) {
       		clientSocket.write('02' + axisValue(1, 3));
       		await sleep(interval);
-      		clientSocket.write('01' + axisValue(2, 1));
+          clientSocket.write('04' + axisValue(3, 3));
       		await sleep(interval);
-      		clientSocket.write('04' + axisValue(3, 3));
+      		clientSocket.write('01' + axisValue(2, 1));
       		await sleep(interval);
       		clientSocket.write('03' + axisValue(4, 1));
       	}
@@ -82,17 +82,33 @@
 
       function start() {
         // console.log("test")
+        writeToServer('VIDEO')
+        var video = runScript('App/JS/Resources/Player/server-tcp.js');
+        setTimeout(function() {
+          var iframe = document.createElement('iframe');
+          iframe.setAttribute('id', 'camera-view');
+          iframe.setAttribute('src', 'http://localhost:8080');
+          iframe.setAttribute('width', '1000');
+          iframe.setAttribute('height', '625');
+          var markerPoint = document.getElementById('marker');
+
+          markerPoint.parentNode.insertBefore(iframe, markerPoint);
+        }, 1000)
         writeToServer('START');
         // console.log("test 2")
+        document.getElementById('toggle').style.visibility = 'hidden';
         setTimeout(function() {
           clientSocket.connect(9999, '192.168.100.1', function() {
           	window.addEventListener("gamepadconnected", function(event) {
           		pollGamepad(130);
           	});
           });
-          // runScript('./App/JS/client.js', function (err) {
+
+          // video.kill('SIGINT')
+          // runScript('./App/JS/Resources/Player/server-tcp.js', function (err) {
           //     if (err) throw err;
           // });
+
         }, 3000)
         // // setTimeout(function() {
         // console.log('Starting client...');
@@ -110,13 +126,7 @@
           //     if (err) throw err;
           // });
           // //Opens camera feed
-          // var iframe = document.createElement('iframe');
-          // iframe.setAttribute('id', 'camera-view');
-          // iframe.setAttribute('src', 'http://localhost:8080');
-          // iframe.setAttribute('width', '1000');
-          // iframe.setAttribute('height', '625');
-          // var markerPoint = document.getElementById('marker');
-          // markerPoint.parentNode.insertBefore(iframe, markerPoint);
+
         // }, 3000)
       }
     </script>
@@ -135,7 +145,7 @@
     </div>
     <div class="main">
         <h1 class="text" id="main-header">Dashboard - Robotics GUI</h1>
-        <button type="button" name="button" onclick="start()" id="start">Start</button>
+        <button type="button" name="button" onclick="start()" id="toggle">Start</button>
         <p id="marker"></p>
     </div>
   </body>

diff --git a/App/settings.html b/App/settings.html
diff --git a/App/testing.html b/App/testing.html
diff --git a/App/version.html b/App/version.html