Merge branch 'master' of https://github.com/CSUFTitanRover/TitanRover…

…2018
CSUFTitanRover · Jan 17, 2018 · 76e1690 · 76e1690
2 parents b8962c3 + a18ab23
commit 76e1690
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 6 deletions.
diff --git a/rover/core/process-manager/motionConf/motion.conf b/rover/core/process-manager/motionConf/motion.conf
@@ -36,7 +36,7 @@ log_type all
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video0
+videodevice /dev/v4l/by-id/usb-046d_0808_9A94E370-video-index0
 
 # v4l2_palette allows to choose preferable palette to be use by motion
 # to capture from those supported by your videodevice. (default: 17)

diff --git a/rover/core/process-manager/motionConf/screenlog.0 b/rover/core/process-manager/motionConf/screenlog.0
diff --git a/rover/core/process-manager/motionConf/thread1.conf b/rover/core/process-manager/motionConf/thread1.conf
@@ -36,7 +36,7 @@ log_type all
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video0
+videodevice /dev/v4l/by-id/usb-046d_0808_9A94E370-video-index0
 
 # v4l2_palette allows to choose preferable palette to be use by motion
 # to capture from those supported by your videodevice. (default: 17)

diff --git a/rover/core/process-manager/motionConf/thread2.conf b/rover/core/process-manager/motionConf/thread2.conf
@@ -36,7 +36,7 @@ log_type all
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video1
+videodevice /dev/v4l/by-id/usb-HD_Camera_Manufacturer_USB_2.0_Camera-video-index0
 
 # v4l2_palette allows to choose preferable palette to be use by motion
 # to capture from those supported by your videodevice. (default: 17)

diff --git a/rover/core/process-manager/motionConf/thread3.conf b/rover/core/process-manager/motionConf/thread3.conf
@@ -36,7 +36,7 @@ log_type all
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video2
+videodevice /dev/v4l/by-id/usb-Chicony_Electronics_Co._Ltd._USB2.0_HD_UVC_WebCam_0x0001-video-index0
 
 # v4l2_palette allows to choose preferable palette to be use by motion
 # to capture from those supported by your videodevice. (default: 17)

diff --git a/rover/core/process-manager/motionConf/thread4.conf b/rover/core/process-manager/motionConf/thread4.conf
@@ -36,7 +36,7 @@ log_type all
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video3
+videodevice /dev/v4l/by-id/usb-Chicony_Electronics_Co._Ltd._USB2.0_HD_UVC_WebCam_0x0001-video-index0
 
 # v4l2_palette allows to choose preferable palette to be use by motion
 # to capture from those supported by your videodevice. (default: 17)

diff --git a/rover/core/process-manager/setup.py b/rover/core/process-manager/setup.py
@@ -108,7 +108,7 @@ class c:
             cronLinesFromProcesses.append("{} {}{} {} {} {} {} {}{} {} {}".format(cronLineA, path["path"], o["path"], cronLineB, o["screenName"], cronLineC, o["screenName"], cronLineD , o["python"], o["script"], cronLineE))
                                     #  cA p1p2 cB oS cC oS cD oPoX cE
     setupCronLine = "0 15 1/2 * * root cd " + path["path"] + "/TitanRover2018/rover/core/process-manager/ && python setup.py;\n"; 
-    cronLinesFromProcesses.insert(0, setupCronLine)
+    #cronLinesFromProcesses.insert(0, setupCronLine)
     #print(cronLinesFromProcesses)
     if len(lines) > 1 and len(cronLinesFromProcesses) > 1:
         dif = [v for v in lines if v not in cronLinesFromProcesses]

diff --git a/rover/core/process-manager/udev/99-usb-serial.rules b/rover/core/process-manager/udev/99-usb-serial.rules
@@ -0,0 +1,30 @@
+SUBSYSTEM=="tty", 
+ATTRS{idVendor}=="Silicon Labs", 
+ATTRS{idProduct}=="titan rover", 
+ATTRS{serial}=="1000", 
+SYMLINK+="oled1"
+
+SUBSYSTEM=="tty", 
+ATTRS{idVendor}=="Silicon Labs", 
+ATTRS{idProduct}=="titan rover", 
+ATTRS{serial}=="1001", 
+SYMLINK+="oled2"
+
+SUBSYSTEM=="tty", 
+ATTRS{idVendor}=="Silicon Labs", 
+ATTRS{idProduct}=="titan rover", 
+ATTRS{serial}=="1002", 
+SYMLINK+="oled3"
+
+SUBSYSTEM=="tty", 
+ATTRS{idVendor}=="Silicon Labs", 
+ATTRS{idProduct}=="titan rover", 
+ATTRS{serial}=="1003", 
+SYMLINK+="oled4"
+
+SUBSYSTEM=="tty",
+ATTRS{serial}=="0d596f3a49235bf708548e85ce65ec94",
+ATTRS{idVendor}=="8087",
+ATTRS{idProduct}=="0a9e",
+SYMLINK+="tty-emlid"
+
diff --git a/rover/core/servers/ArduinoSocketServer/screenlog.0 b/rover/core/servers/ArduinoSocketServer/screenlog.0
diff --git a/rover/core/servers/iftop/screenlog.0 b/rover/core/servers/iftop/screenlog.0
@@ -0,0 +1,29 @@
+{'download': 2200.0, 'ip': '192.168.1.101', 'upload': 2250.0, 'elapsed': 12}
+{'download': 296.0, 'ip': '192.168.1.101', 'upload': 4100.0, 'elapsed': 11}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 17}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 12}
+{'download': 2200.0, 'ip': '192.168.1.101', 'upload': 2250.0, 'elapsed': 13}
+{'download': 1770.0, 'ip': '192.168.1.101', 'upload': 1390.0, 'elapsed': 13}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 14}
+{'download': 2920.0, 'ip': '192.168.1.101', 'upload': 2810.0, 'elapsed': 11}
+{'download': 564.0, 'ip': '192.168.1.101', 'upload': 576.0, 'elapsed': 13}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 10}
+{'download': 2330.0, 'ip': '192.168.1.101', 'upload': 1120.0, 'elapsed': 11}
+{'download': 3770.0, 'ip': '192.168.1.101', 'upload': 3690.0, 'elapsed': 11}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 12}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 11}
+{'download': 1070.0, 'ip': '192.168.1.101', 'upload': 560.0, 'elapsed': 13}
+{'download': 1100.0, 'ip': '192.168.1.101', 'upload': 1120.0, 'elapsed': 13}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 280.0, 'elapsed': 11}
+{'download': 1820.0, 'ip': '192.168.1.101', 'upload': 1560.0, 'elapsed': 11}
+{'download': 4270.0, 'ip': '192.168.1.101', 'upload': 3620.0, 'elapsed': 11}
+{'download': 36600.0, 'ip': '192.168.1.101', 'upload': 17900.0, 'elapsed': 12}
+{'download': 564.0, 'ip': '192.168.1.101', 'upload': 576.0, 'elapsed': 12}
+{'download': 384.0, 'ip': '192.168.1.101', 'upload': 2180.0, 'elapsed': 11}
+{'download': 3390.0, 'ip': '192.168.1.101', 'upload': 1840.0, 'elapsed': 11}
+{'download': 3940.0, 'ip': '192.168.1.101', 'upload': 3000.0, 'elapsed': 12}
+{'download': 78200.0, 'ip': '192.168.1.101', 'upload': 27600.0, 'elapsed': 11}
+{'download': 628.0, 'ip': '192.168.1.101', 'upload': 640.0, 'elapsed': 15}
+{'download': 564.0, 'ip': '192.168.1.101', 'upload': 576.0, 'elapsed': 18}
+{'download': 2260.0, 'ip': '192.168.1.101', 'upload': 1890.0, 'elapsed': 12}
+{'download': 33200.0, 'ip': '192.168.1.101', 'upload': 10300.0, 'elapsed': 15}