From: Erik Andresen <erik@vontaene.de>
Date: Thu, 2 Apr 2020 05:19:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
X-Git-Url: https://defiant.homedns.org/gitweb/?a=commitdiff_plain;h=5265263d46b9396252d852a763e68913ad3a913e;p=ros_wild_thumper.git

Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
---

5265263d46b9396252d852a763e68913ad3a913e
diff --cc www/index.html
index 253c35d,bc209ac..db7e48d
--- a/www/index.html
+++ b/www/index.html
@@@ -112,18 -115,10 +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://wildthumper:8080/stream?topic=/usb_cam/image_raw" style="transform:rotate(-90deg); transform-origin: 60% 60%;"></img>
+ 					<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>