From 0d6a80e504771c6ddd71c4b54d11ff497b05842f Mon Sep 17 00:00:00 2001
From: Hendrik Langer <hendrik+dev@xd0.de>
Date: Mon, 3 Aug 2020 18:55:04 +0200
Subject: [PATCH] fix

---
 .../roberto/camera/camera_gstreamer_webrtc.py |  2 +-
 .../views/frontend/templates/gamepad.js       | 52 ++-----------------
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/raspberry/roberto/camera/camera_gstreamer_webrtc.py b/raspberry/roberto/camera/camera_gstreamer_webrtc.py
index 7206784..cdf9c0a 100644
--- a/raspberry/roberto/camera/camera_gstreamer_webrtc.py
+++ b/raspberry/roberto/camera/camera_gstreamer_webrtc.py
@@ -131,7 +131,7 @@ class WebRTCCamera(Thread):
         webrtc.connect('on-ice-candidate', self.on_ice_candidate, client_sid)
 
         if platform == 'raspberry':
-            rpicamsrc = pipeline.get_by_name ("rpicamsrc")
+            rpicamsrc = pipe.get_by_name ("rpicamsrc")
             #rpicamsrc.set_property("annotation-mode", 1)
             #rpicamsrc.set_property("annotation-text", "Saturation %d" % (saturation))
 
diff --git a/raspberry/roberto/views/frontend/templates/gamepad.js b/raspberry/roberto/views/frontend/templates/gamepad.js
index b0a30bd..b561e0c 100644
--- a/raspberry/roberto/views/frontend/templates/gamepad.js
+++ b/raspberry/roberto/views/frontend/templates/gamepad.js
@@ -26,36 +26,8 @@ function connecthandler(e) {
   addgamepad(e.gamepad);
 }
 function addgamepad(gamepad) {
-  controllers[gamepad.index] = gamepad; var d = document.createElement("div");
-  d.setAttribute("id", "controller" + gamepad.index);
-  var t = document.createElement("h1");
-  t.appendChild(document.createTextNode("gamepad: " + gamepad.id));
-  d.appendChild(t);
-  var b = document.createElement("div");
-  b.className = "buttons";
-  for (var i=0; i<gamepad.buttons.length; i++) {
-    var e = document.createElement("span");
-    e.className = "button";
-    //e.id = "b" + i;
-    e.innerHTML = i;
-    b.appendChild(e);
-  }
-  d.appendChild(b);
-  var a = document.createElement("div");
-  a.className = "axes";
-  for (i=0; i<gamepad.axes.length; i++) {
-    e = document.createElement("meter");
-    e.className = "axis";
-    //e.id = "a" + i;
-    e.setAttribute("min", "-1");
-    e.setAttribute("max", "1");
-    e.setAttribute("value", "0");
-    e.innerHTML = i;
-    a.appendChild(e);
-  }
-  d.appendChild(a);
-  document.getElementById("start").style.display = "none";
-  document.body.appendChild(d);
+  controllers[gamepad.index] = gamepad;
+
   rAF(updateStatus);
 }
 
@@ -64,8 +36,6 @@ function disconnecthandler(e) {
 }
 
 function removegamepad(gamepad) {
-  var d = document.getElementById("controller" + gamepad.index);
-  document.body.removeChild(d);
   delete controllers[gamepad.index];
 }
 
@@ -73,10 +43,9 @@ function updateStatus() {
   scangamepads();
   for (j in controllers) {
     var controller = controllers[j];
-    var d = document.getElementById("controller" + j);
-    var buttons = d.getElementsByClassName("button");
+
     for (var i=0; i<controller.buttons.length; i++) {
-      var b = buttons[i];
+
       var val = controller.buttons[i];
       var pressed = val == 1.0;
       var touched = false;
@@ -88,22 +57,11 @@ function updateStatus() {
         val = val.value;
       }
       var pct = Math.round(val * 100) + "%";
-      b.style.backgroundSize = pct + " " + pct;
-      b.className = "button";
-      if (pressed) {
-        b.className += " pressed";
-      }
-      if (touched) {
-        b.className += " touched";
-      }
+ 
     }
 
     var axesChanged = false;
-    var axes = d.getElementsByClassName("axis");
     for (var i=0; i<controller.axes.length; i++) {
-      var a = axes[i];
-      a.innerHTML = i + ": " + controller.axes[i].toFixed(4);
-      a.setAttribute("value", controller.axes[i]);
       if (axesState[i] != controller.axes[i]) {
         axesState[i] = controller.axes[i];
         axesChanged = true;