more cleanups for growing family of vision options.

Spartronics4915 · Mar 18, 2019 · 7cb6035 · 7cb6035
1 parent 876880d
commit 7cb6035
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/2019/startH264player.sh b/2019/startH264player.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -f
+
+cd /home/pi/spartronics/Vision/h264player
+node appRaspi.js
+
diff --git a/2019/startCam.sh → 2019/startUV4L.sh b/2019/startCam.sh → 2019/startUV4L.sh
diff --git a/2019/startVision.sh b/2019/startVision.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd /home/pi/Vision/2019
-
-exec ./runPiCam.py --robot roborio
+cd /home/pi/spartronics/Vision/2019
+exec ./runPiCam.py --robot roborio
diff --git a/h264player/appRaspi.js b/h264player/appRaspi.js
@@ -7,7 +7,7 @@
 
 const http = require('http');
 const express = require('express');
-const WebStreamerServer = require('./raspiServer');
+const WebStreamerServer = require('./serverRaspi');
 const app = express();
 
 //public website

diff --git a/h264player/serverBase.js b/h264player/serverBase.js
@@ -32,7 +32,7 @@ class ServerBase
     {
         if(this.readStream == null)
         {
-            var readStream = this.get_feed(); // invokes subclass get_feed
+            var readStream = this.getFeed(); // invokes subclass implementation
             readStream = readStream.pipe(new Splitter(NALseparator));
             readStream.on("data", this._broadcast.bind(this));
             this.readStream = readStream;
@@ -48,7 +48,7 @@ class ServerBase
                 this.readStream.end();
                 this.readStream = null;
             }
-            this.end_feed(force);
+            this.endFeed(force);
         }
     }