Added Slider control for arm

sightsdev · Jun 24, 2021 · 73e6090 · 73e6090
1 parent 6c49224
commit 73e6090
Show file tree

Hide file tree

Showing 159 changed files with 270 additions and 102 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/configs/ACTIVE_CONFIG b/configs/ACTIVE_CONFIG
@@ -1 +1 @@
-example.json
+servo_config.json
diff --git a/configs/example.json b/configs/example.json
@@ -6,55 +6,14 @@
 		"default_speed": 3
 	},
 	"motors": {
-		"type": "roboteq",
+		"type": "virtual",
 		"port": "/dev/serial/by-id/usb-Roboteq_Motor_Controller_SDC2XXX-if00",
-		"channels": {
-			"left": [
-				0
-			],
-			"right": [
-				1
-			]
-		}
-	},
-	"paddles": {
-		"type": "roboclaw",
-		"port": "/dev/serial/by-id/usb-03eb_USB_Roboclaw_Solo_30A-if00",
-		"address": 128,
-		"channels": {
-			"left": 0,
-			"right": 1
-		}
-	},
-	"servos": {
-		"type": "maestro",
-                "port": "/dev/serial/by-id/usb-Pololu_Corporation_Pololu_Mini_Maestro_18-Channel_USB_Servo_Controller_00009329-if00",
-                "address": 12,
-		"instances": {
-			"0": {
-				"speed": 0.17,
-				"neutral": 0
-			},
-			"1": {
-				"speed": 0.17,
-				"neutral": "0"
-			},
-			"2": {
-				"speed": 0.17,
-				"neutral": 0
-			},
-			"3": {
-				"speed": 0.17,
-				"neutral": 0
-			}
+		"baudrate": 1000000,
+		"ids": {
+			"left": [],
+			"right": []
 		}
 	},
-	"arm": {
-		"shoulder": "0",
-		"elbow": "1",
-		"wrist": "2",
-		"gripper": "3"
-	},
 	"interface": {
 		"notifications": {
 			"enabled": true,
@@ -167,4 +126,4 @@
 		"log_level": "info",
 		"print_messages": false
 	}
-}
+}
diff --git a/configs/servo_config.json b/configs/servo_config.json
@@ -8,6 +8,15 @@
 	"motors": {
 		"type": "virtual"
 	},
+	"paddles": {
+		"type": "roboclaw",
+		"port": "/dev/serial/by-id/usb-03eb_USB_Roboclaw_Solo_30A-if00",
+		"address": 128,
+		"channels": {
+			"left": 0,
+			"right": 1
+		}
+	},
 	"servos": {
 		"type": "maestro",
 		"instances": {

diff --git a/configs/servo_config2.json b/configs/servo_config2.json
@@ -0,0 +1,159 @@
+{
+	"network": {
+		"ip": "*"
+	},
+	"control": {
+		"default_speed": 3
+	},
+	"motors": {
+		"type": "virtual"
+	},
+	"paddles": {
+		"type": "roboclaw",
+		"port": "/dev/serial/by-id/usb-03eb_USB_Roboclaw_Solo_30A-if00",
+		"address": 128,
+		"channels": {
+			"left": 0,
+			"right": 1
+		}
+	},
+	"servos": {
+		"type": "maestro",
+		"instances": {
+			"0": {
+				"speed": 0.17,
+				"neutral": 0
+			},
+			"1": {
+				"speed": 0.17,
+				"neutral": "0"
+			},
+			"2": {
+				"speed": 0.17,
+				"neutral": 0
+			},
+			"3": {
+				"speed": 0.17,
+				"neutral": 0
+			}
+		}
+	},
+	"arm": {
+		"shoulder": "0",
+		"elbow": "1",
+		"wrist": "2",
+		"gripper": "3"
+	},
+	"interface": {
+		"notifications": {
+			"enabled": true,
+			"timeout": 7
+		},
+		"cameras": {
+			"front": {
+				"enabled": true,
+				"id": 1
+			},
+			"back": {
+				"enabled": false
+			},
+			"left": {
+				"enabled": false
+			},
+			"right": {
+				"enabled": false
+			}
+		},
+		"graphs": [
+			{
+				"uid": "cpu_temperature",
+				"type": "circle",
+				"enabled": true,
+				"location": "#left_view_sensors",
+				"title": "CPU Temp.",
+				"unit": "°C",
+				"unit_style": "font-size: 12px;"
+			},
+			{
+				"uid": "memory_usage",
+				"type": "circle",
+				"enabled": true,
+				"location": "#left_view_sensors",
+				"title": "RAM Usage",
+				"unit": " MB",
+				"unit_style": "font-size: 12px;"
+			},
+			{
+				"uid": "disk_usage",
+				"type": "circle",
+				"enabled": true,
+				"location": "#right_view_sensors",
+				"title": "Disk Usage",
+				"unit": " GB",
+				"unit_style": "font-size: 12px;"
+			},
+			{
+				"uid": "cpu_usage",
+				"type": "circle",
+				"enabled": true,
+				"location": "#right_view_sensors",
+				"title": "CPU Usage",
+				"unit": "%",
+				"unit_style": "font-size: 15px;"
+			},
+			{
+				"uid": "uptime",
+				"type": "uptime",
+				"enabled": true,
+				"location": "#textgroup_left",
+				"title": "Uptime"
+			}
+		],
+		"theme": {
+			"accent_colour": "#ff5a00"
+		}
+	},
+	"sensors": [
+		{
+			"enabled": true,
+			"type": "cpu_temp",
+			"name": "CPU Temperature",
+			"period": 1,
+			"display_on": [
+				"cpu_temperature"
+			]
+		},
+		{
+			"enabled": true,
+			"type": "memory",
+			"name": "RAM Usage",
+			"period": 1,
+			"display_on": [
+				"memory_usage"
+			]
+		},
+		{
+			"enabled": true,
+			"type": "cpu_usage",
+			"name": "CPU Usage",
+			"period": 1,
+			"display_on": [
+				"cpu_usage"
+			]
+		},
+		{
+			"enabled": true,
+			"type": "disk_usage",
+			"name": "Disk Usage",
+			"precision": 1,
+			"period": 60,
+			"display_on": [
+				"disk_usage"
+			]
+		}
+	],
+	"debug": {
+		"log_level": "debug",
+		"print_messages": true
+	}
+}
diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/CNAME b/docs/CNAME
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
diff --git a/docs/assets/docsify.min.js b/docs/assets/docsify.min.js
diff --git a/docs/assets/docsify.search.min.js b/docs/assets/docsify.search.min.js
diff --git a/docs/assets/docsify.sights.js b/docs/assets/docsify.sights.js
diff --git a/docs/assets/docsify.themeable.dark.css b/docs/assets/docsify.themeable.dark.css
diff --git a/docs/assets/docsify.themeable.light.css b/docs/assets/docsify.themeable.light.css
diff --git a/docs/assets/docsify.themeable.min.js b/docs/assets/docsify.themeable.min.js
diff --git a/docs/assets/github.svg b/docs/assets/github.svg
diff --git a/docs/assets/interface-screenshot.jpg b/docs/assets/interface-screenshot.jpg
diff --git a/docs/assets/logo.svg b/docs/assets/logo.svg
diff --git a/docs/assets/prism-bash.min.js b/docs/assets/prism-bash.min.js
diff --git a/docs/assets/prism-json.min.js b/docs/assets/prism-json.min.js
diff --git a/docs/assets/prism-python.min.js b/docs/assets/prism-python.min.js
diff --git a/docs/assets/sights.png b/docs/assets/sights.png
diff --git a/docs/assets/thingiverse.svg b/docs/assets/thingiverse.svg
diff --git a/docs/changelog.md b/docs/changelog.md
diff --git a/docs/config_schema.md b/docs/config_schema.md
diff --git a/docs/dev_environment.md b/docs/dev_environment.md
diff --git a/docs/extending.md b/docs/extending.md
diff --git a/docs/getting_started.md b/docs/getting_started.md
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/introduction.md b/docs/introduction.md
diff --git a/docs/js_libraries.md b/docs/js_libraries.md
diff --git a/docs/manual_install.md b/docs/manual_install.md
diff --git a/docs/network.md b/docs/network.md
diff --git a/interface/css/railscasts.css b/interface/css/railscasts.css
diff --git a/interface/css/sights.dark.css b/interface/css/sights.dark.css
diff --git a/interface/css/sights.style.css b/interface/css/sights.style.css
diff --git a/interface/gamepad/index.html b/interface/gamepad/index.html
diff --git a/interface/images/demo_camera/set-0/camera_front.jpg b/interface/images/demo_camera/set-0/camera_front.jpg
diff --git a/interface/images/demo_camera/set-1/camera_back.jpg b/interface/images/demo_camera/set-1/camera_back.jpg
diff --git a/interface/images/demo_camera/set-1/camera_front.jpg b/interface/images/demo_camera/set-1/camera_front.jpg
diff --git a/interface/images/demo_camera/set-1/camera_left.jpg b/interface/images/demo_camera/set-1/camera_left.jpg
diff --git a/interface/images/demo_camera/set-1/camera_right.jpg b/interface/images/demo_camera/set-1/camera_right.jpg
diff --git a/interface/images/demo_camera/set-2/camera_back.jpg b/interface/images/demo_camera/set-2/camera_back.jpg
diff --git a/interface/images/demo_camera/set-2/camera_front.jpg b/interface/images/demo_camera/set-2/camera_front.jpg
diff --git a/interface/images/demo_camera/set-2/camera_left.jpg b/interface/images/demo_camera/set-2/camera_left.jpg
diff --git a/interface/images/demo_camera/set-2/camera_right.jpg b/interface/images/demo_camera/set-2/camera_right.jpg
diff --git a/interface/images/demo_camera/set-3/camera_back.jpg b/interface/images/demo_camera/set-3/camera_back.jpg
diff --git a/interface/images/demo_camera/set-3/camera_front.jpg b/interface/images/demo_camera/set-3/camera_front.jpg
diff --git a/interface/images/demo_camera/set-3/camera_left.jpg b/interface/images/demo_camera/set-3/camera_left.jpg
diff --git a/interface/images/demo_camera/set-3/camera_right.jpg b/interface/images/demo_camera/set-3/camera_right.jpg
diff --git a/interface/images/demo_camera/set-4/camera_back.jpg b/interface/images/demo_camera/set-4/camera_back.jpg
diff --git a/interface/images/demo_camera/set-4/camera_front.jpg b/interface/images/demo_camera/set-4/camera_front.jpg
diff --git a/interface/images/demo_camera/set-4/camera_left.jpg b/interface/images/demo_camera/set-4/camera_left.jpg
diff --git a/interface/images/demo_camera/set-4/camera_right.jpg b/interface/images/demo_camera/set-4/camera_right.jpg
diff --git a/interface/images/demo_camera/set-5/camera_back.jpg b/interface/images/demo_camera/set-5/camera_back.jpg
diff --git a/interface/images/demo_camera/set-5/camera_front.jpg b/interface/images/demo_camera/set-5/camera_front.jpg
diff --git a/interface/images/demo_camera/set-5/camera_left.jpg b/interface/images/demo_camera/set-5/camera_left.jpg
diff --git a/interface/images/demo_camera/set-5/camera_right.jpg b/interface/images/demo_camera/set-5/camera_right.jpg
diff --git a/interface/images/demo_camera/set-6/camera_back.jpg b/interface/images/demo_camera/set-6/camera_back.jpg
diff --git a/interface/images/demo_camera/set-6/camera_front.jpg b/interface/images/demo_camera/set-6/camera_front.jpg
diff --git a/interface/images/demo_camera/set-6/camera_left.jpg b/interface/images/demo_camera/set-6/camera_left.jpg
diff --git a/interface/images/demo_camera/set-6/camera_right.jpg b/interface/images/demo_camera/set-6/camera_right.jpg
diff --git a/interface/images/demo_camera/set-7/camera_back.jpg b/interface/images/demo_camera/set-7/camera_back.jpg
diff --git a/interface/images/demo_camera/set-7/camera_front.jpg b/interface/images/demo_camera/set-7/camera_front.jpg
diff --git a/interface/images/demo_camera/set-7/camera_left.jpg b/interface/images/demo_camera/set-7/camera_left.jpg
diff --git a/interface/images/demo_camera/set-7/camera_right.jpg b/interface/images/demo_camera/set-7/camera_right.jpg
diff --git a/interface/images/demo_camera/set-8/camera_back.jpg b/interface/images/demo_camera/set-8/camera_back.jpg
diff --git a/interface/images/demo_camera/set-8/camera_front.jpg b/interface/images/demo_camera/set-8/camera_front.jpg
diff --git a/interface/images/demo_camera/set-8/camera_left.jpg b/interface/images/demo_camera/set-8/camera_left.jpg
diff --git a/interface/images/demo_camera/set-8/camera_right.jpg b/interface/images/demo_camera/set-8/camera_right.jpg
diff --git a/interface/images/logo.png b/interface/images/logo.png
diff --git a/interface/images/overlay.png b/interface/images/overlay.png
diff --git a/interface/images/sights.svg b/interface/images/sights.svg
diff --git a/interface/index.html b/interface/index.html
@@ -752,17 +752,63 @@ <h6 class="dropdown-header">Power options</h6>
 				</div>
 			</div>
 		</div>
-		<div class="row justify-content-md-center no-gutters" id="arm_control">
+		<div class="row justify-content-md-center" id="arm_control">
 			<div class="col-md-auto camera-container" id="arm_control_sliders">
-				<div>
-					<label for="slider1" class="form-label">Slider 1</label>
-					<input type="range" class="form-range" id="slider1" min="3000" max="9000" >
-					<input id="slider1_text"></input>
-					<button id="slider1_reset">HOME</button>
+				<div class="card">
+					<div class="card-header">
+						Arm Control
+					</div>
+					<ul class="list-group list-group-flush">
+						<li class="list-group-item">
+							<div class="row">
+								<div class="col">
+									<label for="shoulder" class="form-label">Shoulder</label>
+								</div>
+								<div class="col-md-auto">
+									<input type="range" class="form-range" id="shoulder" min="3000" max="9000" value="6000">
+									<input type="number" id="shoulder_text" min="3000" max="9000" value="6000">
+								</div>
+							</div>
+						</li>
+						<li class="list-group-item">
+							<div class="row">
+								<div class="col">
+									<label for="elbow" class="form-label">Elbow</label>
+								</div>
+								<div class="col-md-auto">
+									<input type="range" class="form-range" id="elbow" min="3000" max="9000" value="6000">
+									<input type="number" id="elbow_text" min="3000" max="9000" value="6000">
+								</div>
+							</div>
+						</li>
+						<li class="list-group-item">
+							<div class="row">
+								<div class="col">
+									<label for="wrist" class="form-label">Wrist</label>
+								</div>
+								<div class="col-md-auto">
+									<input type="range" class="form-range" id="wrist" min="3000" max="9000" value="6000">
+									<input type="number" id="wrist_text" min="3000" max="9000" value="6000">
+								</div>
+							</div>
+						</li>
+						<li class="list-group-item">
+							<div class="row">
+								<div class="col">
+									<label for="gripper" class="form-label">Gripper</label>
+								</div>
+								<div class="col-md-auto">
+									<input type="range" class="form-range" id="gripper" min="3000" max="9000" value="6000">
+									<input type="number" id="gripper_text" min="3000" max="9000" value="6000">
+								</div>
+							</div>
+						</li>
+					</ul>	
 				</div>
 			</div>
 		</div>
 	</div>
+<div style="height:100px"></div>
 
 </body>
 

diff --git a/interface/js/graphs/circlegraph.js b/interface/js/graphs/circlegraph.js
diff --git a/interface/js/graphs/graph.js b/interface/js/graphs/graph.js
diff --git a/interface/js/graphs/linegraph.js b/interface/js/graphs/linegraph.js
diff --git a/interface/js/graphs/textbox.js b/interface/js/graphs/textbox.js
diff --git a/interface/js/graphs/thermalcamera.js b/interface/js/graphs/thermalcamera.js
diff --git a/interface/js/graphs/uptime.js b/interface/js/graphs/uptime.js
diff --git a/interface/js/lib/Chart.bundle.min.js b/interface/js/lib/Chart.bundle.min.js
diff --git a/interface/js/lib/bootoast-fa.min.js b/interface/js/lib/bootoast-fa.min.js
diff --git a/interface/js/lib/bootstrap.bundle.min.js b/interface/js/lib/bootstrap.bundle.min.js
diff --git a/interface/js/lib/bootstrap.bundle.min.js.map b/interface/js/lib/bootstrap.bundle.min.js.map
diff --git a/interface/js/lib/fontawesome/fontawesome.min.js b/interface/js/lib/fontawesome/fontawesome.min.js
diff --git a/interface/js/lib/fontawesome/solid.min.js b/interface/js/lib/fontawesome/solid.min.js
diff --git a/interface/js/lib/gamepad.min.js b/interface/js/lib/gamepad.min.js
diff --git a/interface/js/lib/highlight.pack.js b/interface/js/lib/highlight.pack.js
diff --git a/interface/js/lib/jquery.min.js b/interface/js/lib/jquery.min.js
diff --git a/interface/js/lib/jquery.xmlrpc.min.js b/interface/js/lib/jquery.xmlrpc.min.js
diff --git a/interface/js/lib/js-yaml.min.js b/interface/js/lib/js-yaml.min.js
diff --git a/interface/js/lib/jsoneditor.min.js b/interface/js/lib/jsoneditor.min.js
diff --git a/interface/js/lib/keyboard.min.js b/interface/js/lib/keyboard.min.js
diff --git a/interface/js/sights.alert.js b/interface/js/sights.alert.js
diff --git a/interface/js/sights.arm.js b/interface/js/sights.arm.js
diff --git a/interface/js/sights.config.schema.js b/interface/js/sights.config.schema.js
diff --git a/interface/js/sights.control.js b/interface/js/sights.control.js
@@ -1,3 +1,4 @@
+
 /*
 	Created by the Semi Autonomous Rescue Team
 	Licensed under the GNU General Public License 3.0
@@ -72,11 +73,18 @@ function createFunctionKeyBind(keys, ctrl, func) {
 	});
 }
 
-
+//Slider input for arm
 function sendSliderInput(e) {
-    document.getElementById(e.target.id+"_text").innerText = e.target.value;
-    let c_event = {type: "SLIDER", control:"ARM", id:e.target.id, value:e.target.value};
-    sliderHistory.push(e.target.value);
+    document.getElementById(e.target.id+"_text").value = e.target.value;
+    let c_event = {type: "SLIDER", control:e.target.id, value:e.target.value};
+    safeSend(c_event);
+}
+
+//number input for arm
+function sendNumberInput(e) {
+	var id = e.target.id.replace("_text","");
+    document.getElementById(id).value = e.target.value;
+    let c_event = {type: "SLIDER", control:id, value:e.target.value};
     safeSend(c_event);
 }
 
@@ -135,9 +143,18 @@ function controlConnection() {
 }
 
 $(document).on("ready", function () {
-	$("#slider1").on("input", function(event) {
-		sendSliderInput(event);
+	const armJoints = ["shoulder", "elbow", "wrist", "gripper"];
+	armJoints.forEach(function (item, index) {
+		$("#"+item).on("input", function(event) {
+			sendSliderInput(event);
+		});
+        $("#"+item+"_text").on("change", function(event){
+        	if (event.target.value < 3000) event.target.value = 3000;
+        	if (event.target.value > 9000) event.target.value = 9000;
+			sendNumberInput(event);
+		});
 	});
+
 	controlConnection();
 
 	// Hide 'Controller Connected' indicator, until connected 

diff --git a/interface/js/sights.demo.js b/interface/js/sights.demo.js
diff --git a/interface/js/sights.interface.js b/interface/js/sights.interface.js
diff --git a/interface/js/sights.sensors.js b/interface/js/sights.sensors.js
diff --git a/interface/js/sights.ssh.js b/interface/js/sights.ssh.js
diff --git a/interface/js/sights.supervisor.js b/interface/js/sights.supervisor.js
diff --git a/interface/js/sights.util.js b/interface/js/sights.util.js
diff --git a/src/README.md b/src/README.md
diff --git a/src/configs/apache/sights.conf b/src/configs/apache/sights.conf
diff --git a/src/configs/motion/cameras/video0.conf b/src/configs/motion/cameras/video0.conf
diff --git a/src/configs/motion/cameras/video1.conf b/src/configs/motion/cameras/video1.conf
diff --git a/src/configs/motion/cameras/video2.conf b/src/configs/motion/cameras/video2.conf
diff --git a/src/configs/motion/cameras/video3.conf b/src/configs/motion/cameras/video3.conf
diff --git a/src/configs/motion/motion.conf b/src/configs/motion/motion.conf
diff --git a/src/configs/sights/backup/.gitkeep b/src/configs/sights/backup/.gitkeep
diff --git a/src/configs/sights/minimal.json b/src/configs/sights/minimal.json
diff --git a/src/configs/supervisor/supervisord.conf b/src/configs/supervisor/supervisord.conf
diff --git a/src/configs/systemd/supervisord b/src/configs/systemd/supervisord