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

Jump to bottom

fix: handle more cases of unexpected Serial API restart #6551

Merged
merged 1 commit into from
Dec 9, 2023
Merged

fix: handle more cases of unexpected Serial API restart #6551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 23 additions & 14 deletions packages/zwave-js/src/lib/controller/Controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3867,23 +3867,32 @@ supported CCs: ${
private async handleSerialAPIStartedUnexpectedly(
msg: SerialAPIStartedRequest,
): Promise<boolean> {
// Normally, the soft reset command includes waiting for this message. If we end up here, it is unexpected.
// Normally, the soft reset command includes waiting for this message.
// If we end up here, it is unexpected.

switch (msg.wakeUpReason) {
// All wakeup reasons that indicate a reset of the Serial API
// need to be handled here, so we interpret node IDs correctly.
case SerialAPIWakeUpReason.Reset:
case SerialAPIWakeUpReason.WatchdogReset:
case SerialAPIWakeUpReason.SoftwareReset:
case SerialAPIWakeUpReason.EmergencyWatchdogReset:
case SerialAPIWakeUpReason.BrownoutCircuit: {
// The Serial API restarted unexpectedly
if (this._nodeIdType === NodeIDType.Long) {
this.driver.controllerLog.print(
`Serial API restarted unexpectedly.`,
"warn",
);

if (msg.wakeUpReason === SerialAPIWakeUpReason.SoftwareReset) {
// The Serial API restarted
if (this._nodeIdType === NodeIDType.Long) {
this.driver.controllerLog.print(
`Serial API restarted unexpectedly.`,
"warn",
);
// We previously used 16 bit node IDs, but the controller was reset.
// Remember this and try to go back to 16 bit.
this._nodeIdType = NodeIDType.Short;
await this.trySetNodeIDType(NodeIDType.Long);
}

// We previously used 16 bit node IDs, but the controller was reset.
// Remember this and try to go back to 16 bit.
this._nodeIdType = NodeIDType.Short;
await this.trySetNodeIDType(NodeIDType.Long);
return true; // Don't invoke any more handlers
}

return true; // Don't invoke any more handlers
}

return false; // Not handled
Expand Down
2 changes: 1 addition & 1 deletion packages/zwave-js/src/lib/serialapi/application/SerialAPIStartedRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export enum SerialAPIWakeUpReason {
WatchdogReset = 0x03,
/** The Z-Wave API Module has been woken up by an external interrupt. */
ExternalInterrupt = 0x04,
/** The Z-Wave API Module has been woken up by a powering up. */
/** The Z-Wave API Module has been woken up by powering up. */
PowerUp = 0x05,
/** The Z-Wave API Module has been woken up by USB Suspend. */
USBSuspend = 0x06,
Expand Down