diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 81e9551..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1604516509922 - - - 1604747925521 - - - 1604747940729 - - - 1604768327573 - - - 1604777752387 - - - 1605444355479 - - - - - - - - - - - - - - - - true - - \ No newline at end of file diff --git a/static/index.html b/static/index.html index 935ead7..7ba9b53 100644 --- a/static/index.html +++ b/static/index.html @@ -58,16 +58,16 @@ height: 200px; position: relative; transform-style: preserve-3d; - transform: translateZ(-100px); + /*transform: translateZ(-100px);*/ /*transition: transform 25ms;*/ } - .cube.show-front { transform: translateZ(-100px) rotateY( 0deg); } - .cube.show-right { transform: translateZ(-100px) rotateY( -90deg); } - .cube.show-back { transform: translateZ(-100px) rotateY(-180deg); } - .cube.show-left { transform: translateZ(-100px) rotateY( 90deg); } - .cube.show-top { transform: translateZ(-100px) rotateX( -90deg); } - .cube.show-bottom { transform: translateZ(-100px) rotateX( 90deg); } + .cube.show-front { transform:/*translateZ(-100px)*/ rotateY( 0deg); } + .cube.show-right { transform:/*translateZ(-100px)*/ rotateY( -90deg); } + .cube.show-back { transform:/*translateZ(-100px)*/ rotateY(-180deg); } + .cube.show-left { transform:/*translateZ(-100px)*/ rotateY( 90deg); } + .cube.show-top { transform:/*translateZ(-100px)*/ rotateX( -90deg); } + .cube.show-bottom { transform:/*translateZ(-100px)*/ rotateX( 90deg); } .cube__face { position: absolute; diff --git a/static/scripts/websocket.js b/static/scripts/websocket.js index 91e1fe4..b65ec87 100644 --- a/static/scripts/websocket.js +++ b/static/scripts/websocket.js @@ -43,13 +43,13 @@ window.addEventListener("load", function(evt) { document.getElementById("gyroscopeTCP").style.transform = `rotateX(${dat.SOURCE_TCP.Orientation[0]}deg) rotateY(${dat.SOURCE_TCP.Orientation[1]}deg) rotateZ(${dat.SOURCE_TCP.Orientation[2]}deg)` document.getElementById("gyroscopeSERIAL").style.transform = `rotateX(${dat.SOURCE_SERIAL.Orientation[0]}deg) rotateY(${dat.SOURCE_SERIAL.Orientation[1]}deg) rotateZ(${dat.SOURCE_SERIAL.Orientation[2]}deg)` - // document.getElementById("TCPlong").innerHTML = "Smartphone long: " + dat.SOURCE_TCP.Position[1] - // document.getElementById("TCPlat").innerHTML = "Smartphone lat: " + dat.SOURCE_TCP.Position[0] - // document.getElementById("SERIALlong").innerHTML = "Ublox long: " + dat.SOURCE_SERIAL.Position[1] - // document.getElementById("SERIALlat").innerHTML = "Ublox lat: " + dat.SOURCE_SERIAL.Position[0] + document.getElementById("TCPlong").innerHTML = "Smartphone long: " + dat.SOURCE_TCP.Position[1] + document.getElementById("TCPlat").innerHTML = "Smartphone lat: " + dat.SOURCE_TCP.Position[0] + document.getElementById("SERIALlong").innerHTML = "Ublox long: " + dat.SOURCE_SERIAL.Position[1] + document.getElementById("SERIALlat").innerHTML = "Ublox lat: " + dat.SOURCE_SERIAL.Position[0] - //document.getElementById("diffLong").innerHTML = "Differenz long: " + Math.abs(dat.SOURCE_TCP.Position[1] - dat.SOURCE_SERIAL.Position[1]) - //document.getElementById("diffLat").innerHTML = "Differenz lat: " + Math.abs(dat.SOURCE_TCP.Position[0] - dat.SOURCE_SERIAL.Position[0]) + document.getElementById("diffLong").innerHTML = "Differenz long: " + Math.abs(dat.SOURCE_TCP.Position[1] - dat.SOURCE_SERIAL.Position[1]) + document.getElementById("diffLat").innerHTML = "Differenz lat: " + Math.abs(dat.SOURCE_TCP.Position[0] - dat.SOURCE_SERIAL.Position[0]) /* console.log(dat) orientation[0] += dat[0] * multiplier