mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-16 09:31:20 -04:00
horn limits and such
This commit is contained in:
@@ -24,6 +24,7 @@ export default function CameraServoPanel() {
|
||||
const hornAvailable = Boolean(roverId && pipeline?.horn);
|
||||
const nightVisionKey = formatKeyLabel(keymap?.nightVisionToggle?.[0]);
|
||||
const hornKey = formatKeyLabel(keymap?.hornHonk?.[0]);
|
||||
const hornCooldownActive = (horn?.cooldownUntil ?? 0) > Date.now();
|
||||
const min = typeof config?.minAngle === 'number' ? config.minAngle : -30;
|
||||
const max = typeof config?.maxAngle === 'number' ? config.maxAngle : 30;
|
||||
const value =
|
||||
@@ -106,7 +107,7 @@ export default function CameraServoPanel() {
|
||||
)}
|
||||
{hornAvailable && (
|
||||
<HornControl
|
||||
disabled={!roverId}
|
||||
disabled={!roverId || hornCooldownActive}
|
||||
onStart={startHorn}
|
||||
onStop={stopHorn}
|
||||
keyLabel={hornKey}
|
||||
|
||||
@@ -85,6 +85,7 @@ export function InlineCameraTilt({ keymap }) {
|
||||
const nightVisionAvailable = Boolean(roverId && pipeline?.nightVision);
|
||||
const nightVisionState = pipeline?.nightVisionState;
|
||||
const hornAvailable = Boolean(roverId && pipeline?.horn);
|
||||
const hornCooldownActive = (horn?.cooldownUntil ?? 0) > Date.now();
|
||||
const min = typeof config?.minAngle === 'number' ? config.minAngle : -30;
|
||||
const max = typeof config?.maxAngle === 'number' ? config.maxAngle : 30;
|
||||
const value =
|
||||
@@ -133,7 +134,7 @@ export function InlineCameraTilt({ keymap }) {
|
||||
)}
|
||||
{hornAvailable && (
|
||||
<HornControl
|
||||
disabled={!roverId}
|
||||
disabled={!roverId || hornCooldownActive}
|
||||
onStart={startHorn}
|
||||
onStop={stopHorn}
|
||||
keyLabel={hornLabel}
|
||||
|
||||
@@ -146,6 +146,7 @@ function MobileJoystickPanel({ layout }) {
|
||||
const nightVisionAvailable = Boolean(roverId && pipeline?.nightVision);
|
||||
const nightVisionState = pipeline?.nightVisionState;
|
||||
const hornAvailable = Boolean(roverId && pipeline?.horn);
|
||||
const hornCooldownActive = (horn?.cooldownUntil ?? 0) > Date.now();
|
||||
const cameraMin = typeof cameraConfig?.minAngle === 'number' ? cameraConfig.minAngle : -45;
|
||||
const cameraMax = typeof cameraConfig?.maxAngle === 'number' ? cameraConfig.maxAngle : 45;
|
||||
const cameraValue =
|
||||
@@ -226,7 +227,12 @@ function MobileJoystickPanel({ layout }) {
|
||||
/>
|
||||
)}
|
||||
{hornAvailable && (
|
||||
<HornControl disabled={disabled} onStart={startHorn} onStop={stopHorn} active={horn?.active} />
|
||||
<HornControl
|
||||
disabled={disabled || hornCooldownActive}
|
||||
onStart={startHorn}
|
||||
onStop={stopHorn}
|
||||
active={horn?.active}
|
||||
/>
|
||||
)}
|
||||
{cameraEnabled && (
|
||||
<div className="bg-zinc-950 p-0.5 text-xs">
|
||||
|
||||
@@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useEffect, useMemo, useReducer,
|
||||
import { controlReducer, initialControlState } from './controlReducer.js';
|
||||
import { computeDifferentialSpeeds, clamp } from './controlMath.js';
|
||||
import { useCommandPipeline } from './commandPipeline.js';
|
||||
import { DEFAULT_KEYMAP, DEFAULT_MACROS, SONG_DEFAULT_NOTE } from './constants.js';
|
||||
import { DEFAULT_KEYMAP, DEFAULT_MACROS, HORN_COOLDOWN_MS, HORN_MAX_MS, SONG_DEFAULT_NOTE } from './constants.js';
|
||||
import { canonicalizeKeyInput } from './keymapUtils.js';
|
||||
import { useSettingsNamespace } from '../settings/index.js';
|
||||
import { useSession } from '../context/SessionContext.jsx';
|
||||
@@ -33,6 +33,8 @@ export function ControlSystemProvider({ children }) {
|
||||
const prevModeRef = useRef(null);
|
||||
const pendingLightsRef = useRef(false);
|
||||
const servoAngleRef = useRef(initialControlState.camera.angle);
|
||||
const hornAutoStopRef = useRef(null);
|
||||
const hornCooldownRef = useRef(null);
|
||||
const {
|
||||
value: controlSettings,
|
||||
save: saveControlSettings,
|
||||
@@ -364,15 +366,40 @@ export function ControlSystemProvider({ children }) {
|
||||
|
||||
const startHorn = useCallback(() => {
|
||||
if (!pipeline.horn) return;
|
||||
const now = Date.now();
|
||||
const cooldownUntil = state.horn?.cooldownUntil ?? 0;
|
||||
if (cooldownUntil && now < cooldownUntil) return false;
|
||||
if (state.horn?.active) return false;
|
||||
pipeline.sendHorn({ action: 'start', ...normalizedHornSettings });
|
||||
dispatch({ type: 'control/set-horn-active', payload: true });
|
||||
if (hornAutoStopRef.current) {
|
||||
clearTimeout(hornAutoStopRef.current);
|
||||
hornAutoStopRef.current = null;
|
||||
}
|
||||
hornAutoStopRef.current = setTimeout(() => {
|
||||
stopHorn();
|
||||
}, HORN_MAX_MS);
|
||||
recordControlIntent();
|
||||
}, [dispatch, normalizedHornSettings, pipeline, recordControlIntent]);
|
||||
return true;
|
||||
}, [dispatch, normalizedHornSettings, pipeline, recordControlIntent, state.horn?.active, state.horn?.cooldownUntil]);
|
||||
|
||||
const stopHorn = useCallback(() => {
|
||||
if (!pipeline.horn) return;
|
||||
pipeline.sendHorn({ action: 'stop' });
|
||||
dispatch({ type: 'control/set-horn-active', payload: false });
|
||||
if (hornAutoStopRef.current) {
|
||||
clearTimeout(hornAutoStopRef.current);
|
||||
hornAutoStopRef.current = null;
|
||||
}
|
||||
const cooldownUntil = Date.now() + HORN_COOLDOWN_MS;
|
||||
dispatch({ type: 'control/set-horn-cooldown', payload: cooldownUntil });
|
||||
if (hornCooldownRef.current) {
|
||||
clearTimeout(hornCooldownRef.current);
|
||||
}
|
||||
hornCooldownRef.current = setTimeout(() => {
|
||||
dispatch({ type: 'control/set-horn-cooldown', payload: 0 });
|
||||
hornCooldownRef.current = null;
|
||||
}, HORN_COOLDOWN_MS);
|
||||
}, [dispatch, pipeline]);
|
||||
|
||||
const registerInputState = useCallback((source, data) => {
|
||||
|
||||
@@ -17,6 +17,9 @@ export const SONG_DEFAULT_NOTE = 60;
|
||||
export const SONG_DEFAULT_DURATION = 8;
|
||||
export const SONG_REPEAT_MS = 250;
|
||||
|
||||
export const HORN_MAX_MS = 1200;
|
||||
export const HORN_COOLDOWN_MS = 2500;
|
||||
|
||||
export const OI_COMMANDS = {
|
||||
start: [128],
|
||||
safe: [131],
|
||||
|
||||
@@ -30,6 +30,7 @@ function createSongState() {
|
||||
function createHornState() {
|
||||
return {
|
||||
active: false,
|
||||
cooldownUntil: 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -144,6 +145,14 @@ export function controlReducer(state, action) {
|
||||
active: Boolean(action.payload),
|
||||
},
|
||||
};
|
||||
case 'control/set-horn-cooldown':
|
||||
return {
|
||||
...state,
|
||||
horn: {
|
||||
...(state.horn || createHornState()),
|
||||
cooldownUntil: typeof action.payload === 'number' ? action.payload : 0,
|
||||
},
|
||||
};
|
||||
case 'control/record-intent':
|
||||
return {
|
||||
...state,
|
||||
|
||||
@@ -373,8 +373,8 @@ export default function KeyboardInputManager() {
|
||||
toggleNightVision();
|
||||
} else if (newlyPressed.some((token) => keymap.hornHonk?.has(token))) {
|
||||
if (!hornActiveRef.current) {
|
||||
hornActiveRef.current = true;
|
||||
startHorn();
|
||||
const started = startHorn();
|
||||
hornActiveRef.current = Boolean(started);
|
||||
}
|
||||
} else if (newlyPressed.some((token) => keymap.homeAssistantOn?.has(token))) {
|
||||
triggerHomeAssistantCycle('on');
|
||||
|
||||
Reference in New Issue
Block a user