X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=www%2Findex.html;h=db7e48d8b2adcea71f0090abeeabbac4aa82a76a;hp=97428fe915329182ea9e77e270e2c5f7f64e0b60;hb=5265263d46b9396252d852a763e68913ad3a913e;hpb=c8ec98bdd30f8e533da331fe48742237ccc230d2

diff --git a/www/index.html b/www/index.html
index 97428fe..db7e48d 100644
--- a/www/index.html
+++ b/www/index.html
@@ -21,6 +21,9 @@
 		<script src="assets/javascripts/jquery.minicolors.js"></script>
 		<script src="assets/javascripts/vue.js"></script>
 		<script src="assets/javascripts/application.js"></script>
+		<script type="text/javascript">
+			robothostname="wildthumper"
+		</script>
 
 		<title>Wild Thumper control</title>
 	</head>
@@ -36,22 +39,25 @@
 				<a class="navbar-brand" href="#">Wild Thumper</a>
 				<ul class="nav nav-tabs" role="tablist">
 					<li class="nav-item">
-						<a class="nav-link" href="#data" data-toggle="tab" role="tab">Data</a>
+						<a class="nav-link active" href="#data" data-toggle="tab" role="tab">Data</a>
 					</li>
 					<li class="nav-item">
 						<a class="nav-link" href="#navigation" data-toggle="tab" role="tab">Navigation</a>
 					</li>
 					<li class="nav-item">
-						<a class="nav-link active" href="#lights" data-toggle="tab" role="tab">Lights</a>
+						<a class="nav-link" href="#lights" data-toggle="tab" role="tab">Lights</a>
 					</li>
 					<li class="nav-item">
 						<a class="nav-link" href="#drive" data-toggle="tab" role="tab">Drive</a>
 					</li>
+					<li class="nav-item">
+						<a class="nav-link imagelink" href="#image" data-toggle="tab" role="tab">Image</a>
+					</li>
 				</ul>
 			</nav>
 
 			<div class="tab-content">
-				<div id="data" class="tab-pane" role="tabpanel">
+				<div id="data" class="tab-pane active" role="tabpanel">
 					<div class="row">
 						<div id="power" class="col-auto">
 							<h4>Power</h4>
@@ -74,7 +80,7 @@
 					<div id="speed-label">Speed: {{speed}} m/s</div>
 					<div id="speed-slider"></div>
 				</div>
-				<div id="lights" class="tab-pane active" role="tabpanel">
+				<div id="lights" class="tab-pane" role="tabpanel">
 					<div class="row">
 						<div class="col-md-2 offset-md-1" >
 							<div class="d-flex justify-content-center">
@@ -109,7 +115,18 @@
 					</div>
 				</div>
 				<div id="drive" class="tab-pane" role="tabpanel">
-					<div class="cmd_vel_circle"></div>
+					<div class="row">
+						<div class="col-sd-10">
+							<div class="cmd_vel_circle"></div>
+						</div>
+						<div class="col-sd-1">
+							<input type="number" value="1.0" min="0.1" max="5.0" step="0.1" class="form-control" id="scale_trans">
+							<input type="number" value="3.0" min="1.0" max="5.0" step="0.1" class="form-control" id="scale_rot">
+						</div>
+					</div>
+				</div>
+				<div id="image" class="tab-pane" role="tabpanel">
+					<img id="usb_cam" src="http://"+robothostname+":8080/stream?topic=/usb_cam/image_raw" style="transform:rotate(-90deg); transform-origin: 60% 60%;"></img>
 				</div>
 			</div>
 		</div>