fix merge

Koenkk · Dec 18, 2024 · 7cdafed · 7cdafed
1 parent b479cdf
commit 7cdafed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/adapter/deconz/adapter/deconzAdapter.ts b/src/adapter/deconz/adapter/deconzAdapter.ts
@@ -146,6 +146,7 @@ export class DeconzAdapter extends Adapter {
             await wait(2000);
             await this.driver.changeNetworkStateRequest(PARAM.PARAM.Network.NET_CONNECTED);
             await wait(2000);
+        }
     }
 
     public async getNetworkKey(): Promise<Buffer> {

diff --git a/src/adapter/ember/adapter/emberAdapter.ts b/src/adapter/ember/adapter/emberAdapter.ts
@@ -5,8 +5,8 @@ import path from 'path';
 import equals from 'fast-deep-equal/es6';
 
 import {Adapter, TsType} from '../..';
-import {Backup, UnifiedBackupStorage} from '../../../models';
-import {BackupUtils, Queue, wait} from '../../../utils';
+import {Backup} from '../../../models';
+import {Queue, wait} from '../../../utils';
 import {logger} from '../../../utils/logger';
 import * as ZSpec from '../../../zspec';
 import {EUI64, ExtendedPanId, NodeId, PanId} from '../../../zspec/tstypes';
@@ -1375,7 +1375,7 @@ export class EmberAdapter extends Adapter {
             'Leave network',
         );
 
-        await Wait(200); // settle down
+        await wait(200); // settle down
     }
 
     public async formNetwork(backup?: Backup): Promise<void> {

diff --git a/src/adapter/ezsp/driver/driver.ts b/src/adapter/ezsp/driver/driver.ts
@@ -2,8 +2,6 @@
 
 import {EventEmitter} from 'events';
 
-import equals from 'fast-deep-equal/es6';
-
 import {wait, Waitress} from '../../../utils';
 import {logger} from '../../../utils/logger';
 import * as ZSpec from '../../../zspec';