legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 17:40:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch auto lights on to drive macro

Browse Source
This commit is contained in:
legop3
2025-11-22 03:58:28 -05:00
parent 4c3569c001
commit 751bf80338
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/assets/index-BXPUoQFz.js → server/public/assets/index-Bgtbi1T2.js
+4 -4
View File
File diff suppressed because one or more lines are too long
server/public/index.html
+1 -1
View File
@@ -5,7 +5,7 @@
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>webui</title> <title>webui</title>
<script type="module" crossorigin src="/assets/index-BXPUoQFz.js"></script> <script type="module" crossorigin src="/assets/index-Bgtbi1T2.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CCqAmxiE.css"> <link rel="stylesheet" crossorigin href="/assets/index-CCqAmxiE.css">
</head> </head>
<body> <body>
webui/src/controls/ControlContext.jsx
+17 -10
View File
@@ -33,6 +33,17 @@ export function ControlSystemProvider({ children }) {
} = useSettingsNamespace('controls', { keymap: DEFAULT_KEYMAP, macros: DEFAULT_MACROS }); } = useSettingsNamespace('controls', { keymap: DEFAULT_KEYMAP, macros: DEFAULT_MACROS });
const { session, homeAssistantSetState } = useSession(); const { session, homeAssistantSetState } = useSession();
const turnOnAllLights = useCallback(() => {
const entities = session?.homeAssistant?.entities || [];
const targets = entities.filter(
(ent) => ent.type === 'light' && ent.available !== false && ent.state !== 'on',
);
if (targets.length === 0) return;
targets.forEach((ent) => {
homeAssistantSetState(ent.id, 'on').catch(() => {});
});
}, [session?.homeAssistant?.entities, homeAssistantSetState]);
useEffect(() => { useEffect(() => {
dispatch({ type: 'control/set-rover', payload: pipeline.roverId }); dispatch({ type: 'control/set-rover', payload: pipeline.roverId });
}, [pipeline.roverId]); }, [pipeline.roverId]);
@@ -41,16 +52,9 @@ export function ControlSystemProvider({ children }) {
const prevMode = prevModeRef.current; const prevMode = prevModeRef.current;
prevModeRef.current = state.mode; prevModeRef.current = state.mode;
if (prevMode !== 'drive' && state.mode === 'drive' && session?.homeAssistant?.entities) { if (prevMode !== 'drive' && state.mode === 'drive' && session?.homeAssistant?.entities) {
const targets = session.homeAssistant.entities.filter( turnOnAllLights();
(ent) => ent.type === 'light' && ent.available !== false && ent.state !== 'on',
);
if (targets.length > 0) {
targets.forEach((ent) => {
homeAssistantSetState(ent.id, 'on').catch(() => {});
});
}
} }
}, [state.mode, session?.homeAssistant?.entities, homeAssistantSetState]); }, [state.mode, session?.homeAssistant?.entities, turnOnAllLights]);
useEffect(() => { useEffect(() => {
const mergedKeymap = { ...DEFAULT_KEYMAP, ...(controlSettings?.keymap || {}) }; const mergedKeymap = { ...DEFAULT_KEYMAP, ...(controlSettings?.keymap || {}) };
@@ -190,9 +194,12 @@ export function ControlSystemProvider({ children }) {
async (macroId) => { async (macroId) => {
const macro = state.macros.find((item) => item.id === macroId) || null; const macro = state.macros.find((item) => item.id === macroId) || null;
if (!macro) return; if (!macro) return;
if (macroId === 'drive-sequence') {
turnOnAllLights();
}
await pipeline.runMacroSteps(macro); await pipeline.runMacroSteps(macro);
}, },
[pipeline, state.macros], [pipeline, state.macros, turnOnAllLights],
); );
const stopAllMotion = useCallback(() => { const stopAllMotion = useCallback(() => {