camera controls better takeover

This commit is contained in:
legop3
2026-05-17 21:26:09 -04:00
parent 287d6291dd
commit 31f98a8e32
5 changed files with 24 additions and 15 deletions
@@ -95,7 +95,7 @@ function MobileJoystickPanel({ layout }) {
function MobileActionsColumnContent({ layout }) {
const {
state: { roverId, camera, horn },
state: { roverId, camera, horn, manualDockAssist },
pipeline,
actions: { setServoAngle, setNightVision, setAuxMotors, startHorn, stopHorn },
} = useControlSystem();
@@ -115,6 +115,7 @@ function MobileActionsColumnContent({ layout }) {
: typeof cameraConfig?.homeAngle === 'number'
? cameraConfig.homeAngle
: (cameraMin + cameraMax) / 2;
const cameraDisabled = Boolean(disabled || manualDockAssist?.active);
const handleNightVisionToggle = useCallback(
(nextOn) => {
@@ -174,6 +175,7 @@ function MobileActionsColumnContent({ layout }) {
min={cameraMin}
max={cameraMax}
step={0.5}
disabled={cameraDisabled}
onChange={setServoAngle}
orientation="vertical"
label="Camera Tilt"
+3 -1
View File
@@ -43,7 +43,7 @@ function TopDownMapPanel() {
function DriveDockPanel() {
const {
state: { roverId, keymap, camera, horn },
state: { roverId, keymap, camera, horn, manualDockAssist },
pipeline,
actions: { setServoAngle, setNightVision, startHorn, stopHorn },
} = useControlSystem();
@@ -68,6 +68,7 @@ function DriveDockPanel() {
const hornLabel = formatKeyLabel(keymap?.hornHonk?.[0]);
const upLabel = formatKeyLabel(keymap?.cameraUp?.[0]);
const downLabel = formatKeyLabel(keymap?.cameraDown?.[0]);
const cameraDisabled = Boolean(!roverId || manualDockAssist?.active);
return (
<section className="panel-section grid h-full min-h-0 grid-rows-[minmax(0,1fr)_auto] gap-0.5">
@@ -97,6 +98,7 @@ function DriveDockPanel() {
value={value}
min={min}
max={max}
disabled={cameraDisabled}
onChange={setServoAngle}
keyDownLabel={downLabel}
keyUpLabel={upLabel}