Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fix autoclose bug in Home and add support of virtual close (or not) #153

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feat: fix autoclose bug in Home and add support of virtual close (or not) #153

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
967afa0
fix: autoclose by retriggering listener on SET
tuxity Jun 2, 2024
8ef8d08
fix: don't wait default delay when autoclose is set
tuxity Jun 2, 2024
46c5b79
fix: don't toggle garage door when autoclose
tuxity Jun 2, 2024
75e9259
feat: handler autoClose as virtual or not
tuxity Jun 2, 2024
793d12d
fix: rename virtual var to more explicit
tuxity Jun 2, 2024
6a38446
chore: update readme with new param
tuxity Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/accessories/garageDoorOpener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {Characteristic, Service} from 'src/config/hap';
type GarageDoorOpenerSettings = {
delay?: number;
autoCloseDelay?: number;
autoCloseVirtual?: boolean;
};
type GarageDoorOpenerState = {
currentDoorState: number;
Expand All @@ -52,7 +53,7 @@ export const setupGarageDoorOpener = (

const {deviceId, endpointId, state, settings} = context;

const {delay: garageDoorDelay = DEFAULT_GARAGE_DOOR_DELAY, autoCloseDelay} = settings;
const {delay: garageDoorDelay = DEFAULT_GARAGE_DOOR_DELAY, autoCloseDelay, autoCloseVirtual} = settings;

const assignState = (update: Partial<GarageDoorOpenerState>): void => {
Object.assign(state, update);
Expand Down Expand Up @@ -208,7 +209,9 @@ export const setupGarageDoorOpener = (
callback();
return;
}
await toggleGarageDoor();
if (targetDoorState == TargetDoorState.OPEN || (targetDoorState == TargetDoorState.CLOSED && !autoCloseVirtual)) {
await toggleGarageDoor();
}
assignCurrentDoorState(nextCurrentDoorState);

// Handle Stopped state, if we are stopped, wait one second and trigger again to reverse course
Expand Down Expand Up @@ -238,15 +241,16 @@ export const setupGarageDoorOpener = (
assignCurrentDoorState(CurrentDoorState.OPEN);
if (autoCloseDelay) {
await waitFor(`${deviceId}.pending`, autoCloseDelay);
assignCurrentDoorState(CurrentDoorState.CLOSED);
const targetDoorState = service.getCharacteristic(Characteristic.TargetDoorState);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would trigger a new emit and re run in .on(CharacteristicEventTypes.SET

targetDoorState.setValue(Characteristic.TargetDoorState.CLOSED);
}
} catch (err) {
// debug(`Aborted OPEN update with delay=${chalkNumber(delay)}`);
}
break;
}
case CurrentDoorState.CLOSING: {
const delay = (state.computedPosition * garageDoorDelay) / 100;
const delay = autoCloseDelay && autoCloseVirtual ? 1 * 1000 : (state.computedPosition * garageDoorDelay) / 100;
// debug(`delay=${chalkNumber(delay)}`);
try {
await waitFor(`${deviceId}.pending`, delay);
Expand Down