diff --git a/chipper/webroot/css/style.css b/chipper/webroot/css/style.css index 838f71a9..fca27243 100755 --- a/chipper/webroot/css/style.css +++ b/chipper/webroot/css/style.css @@ -110,6 +110,10 @@ input[type="text"]:focus, input[type="file"]:focus, select:focus { border-color: var(--fg-color-alt); } +input[type='text']:disabled { + cursor: not-allowed; +} + .small-hr { border: 1px solid #3e3e3e; width: 30%; @@ -267,6 +271,15 @@ input[type='radio']:checked:after { display: inline-block; } +input[type='radio']:disabled { + cursor: not-allowed; +} + +input[type='radio']:disabled:after { + background-color: var(--button-color-alt); + cursor: not-allowed; +} + /* ###################################### */ #username, #password { width: 499px !important; diff --git a/chipper/webroot/sdkapp/control.html b/chipper/webroot/sdkapp/control.html index 33f63aba..a3c93b80 100755 --- a/chipper/webroot/sdkapp/control.html +++ b/chipper/webroot/sdkapp/control.html @@ -1,69 +1,94 @@ + + Vector Web App + + + + - - Vector Web App - - - - - - -
-
-

Vector control (beta)

-
-
-
-
Back + +
+
+

Vector control (beta)

+
+
+
+
Back +
+ +
+

Camera Feed

+
+
+
+ + +
+
-
-

Camera Feed

-
-
- - -
-
+

Behavior Control

+
+ You must assume behavior control before performing any action +
+ + +
+
-

Behavior Control

- You must assume behavior control before performing any - action -
- - -
-
+

Move Motors

+
+ Toggle Keyboard Controls (unstable)
WASD for wheels, R-lift up, F-lift down, T-head up, G-head down +
+ + +
+
-

Move Motors

-
- -
-
- Enabled! WASD for wheels, R-lift up, F-lift down, T-head up, - G-head down -
-
+

Mirror Mode

+
+
+ + +
+
-

Mirror Mode

-
- - +

Say Text

+
+ +
+
-
+
+

Say Text

@@ -80,5 +105,4 @@

Say Text

- \ No newline at end of file diff --git a/chipper/webroot/sdkapp/js/control.js b/chipper/webroot/sdkapp/js/control.js index 2d5bf5b3..e3e6c056 100755 --- a/chipper/webroot/sdkapp/js/control.js +++ b/chipper/webroot/sdkapp/js/control.js @@ -26,6 +26,55 @@ var headIsMovingDown = false; var headIsMovingUp = false; var headIsStopped = false; +// when pages is closed +window.onbeforeunload = function() { + stopCamStream(); + useKeyboardControl = false; + sendForm("/api-sdk/mirror_mode?enable=false"); +}; + +// switches items to disabled or enables them +function updateControlButtons() { + const assumeControl = document.getElementById("assume_control"); + const releaseControl = document.getElementById("release_control"); + const keyControlOn = document.getElementById("key_control_on"); + const keyControlOff = document.getElementById("key_control_off"); + const keyMirrorOn = document.getElementById("mirror_on"); + const keyMirrorOff = document.getElementById("mirror_off"); + const textSay = document.getElementById("textSay"); + + if (assumeControl.checked) { + keyControlOn.disabled = false; + keyControlOff.disabled = false; + keyMirrorOn.disabled = false; + keyMirrorOff.disabled = false; + textSay.disabled = false; + } else if (releaseControl.checked) { + useKeyboardControl = false; + keyControlOff.checked = true; + keyControlOn.disabled = true; + keyControlOff.disabled = true; + sendForm("/api-sdk/mirror_mode?enable=false"); + keyMirrorOff.checked = true; + keyMirrorOn.disabled = true; + keyMirrorOff.disabled = true; + textSay.disabled = true; + } +} + +// Add event listener to activate keyControlOff when textSay receives the focus +document.addEventListener('DOMContentLoaded', function() { + const textSay = document.getElementById("textSay"); + const keyControlOff = document.getElementById("key_control_off"); + + textSay.addEventListener('focus', function() { + //keyControlOff.disabled = false; + keyControlOff.checked = true; + useKeyboardControl = false; + }); +}); + + function toggleKeyboard() { if (useKeyboardControl == false) { useKeyboardControl = true;