zigbee-herdsman 0.54.1

Nerivec · Jul 17, 2024 · bba1b05 · bba1b05
1 parent 932ddac
commit bba1b05
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ $ npm install -g ember-zli
 $ ember-zli COMMAND
 running command...
 $ ember-zli (--version)
-ember-zli/2.1.4 win32-x64 node-v20.15.0
+ember-zli/2.1.5 win32-x64 node-v20.15.0
 $ ember-zli --help [COMMAND]
 USAGE
   $ ember-zli COMMAND
@@ -111,7 +111,7 @@ EXAMPLES
   $ ember-zli bootloader
 ```
 
-_See code: [src/commands/bootloader/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.4/src/commands/bootloader/index.ts)_
+_See code: [src/commands/bootloader/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.5/src/commands/bootloader/index.ts)_
 
 ## `ember-zli help [COMMAND]`
 
@@ -148,7 +148,7 @@ EXAMPLES
   $ ember-zli router
 ```
 
-_See code: [src/commands/router/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.4/src/commands/router/index.ts)_
+_See code: [src/commands/router/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.5/src/commands/router/index.ts)_
 
 ## `ember-zli sniff`
 
@@ -165,7 +165,7 @@ EXAMPLES
   $ ember-zli sniff
 ```
 
-_See code: [src/commands/sniff/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.4/src/commands/sniff/index.ts)_
+_See code: [src/commands/sniff/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.5/src/commands/sniff/index.ts)_
 
 ## `ember-zli stack`
 
@@ -182,7 +182,7 @@ EXAMPLES
   $ ember-zli stack
 ```
 
-_See code: [src/commands/stack/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.4/src/commands/stack/index.ts)_
+_See code: [src/commands/stack/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.5/src/commands/stack/index.ts)_
 
 ## `ember-zli utils`
 
@@ -199,7 +199,7 @@ EXAMPLES
   $ ember-zli utils
 ```
 
-_See code: [src/commands/utils/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.4/src/commands/utils/index.ts)_
+_See code: [src/commands/utils/index.ts](https://github.com/Nerivec/ember-zli/blob/v2.1.5/src/commands/utils/index.ts)_
 
 ## `ember-zli version`
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-zli",
   "description": "Interact with EmberZNet-based adapters using zigbee-herdsman 'ember' driver",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "author": "Nerivec",
   "bin": {
     "ember-zli": "bin/run.js"
@@ -17,7 +17,7 @@
     "cli-progress": "^3.12.0",
     "crc-32": "^1.2.2",
     "winston": "^3.13.0",
-    "zigbee-herdsman": "^0.53.0"
+    "zigbee-herdsman": "0.54.1"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",

diff --git a/src/commands/bootloader/index.ts b/src/commands/bootloader/index.ts
@@ -104,7 +104,7 @@ export default class Bootloader extends Command {
             choices: [
                 { name: 'Get info', value: BootloaderMenu.INFO },
                 { name: 'Update firmware', value: BootloaderMenu.UPLOAD_GBL },
-                { name: 'Clear NVM3', value: BootloaderMenu.CLEAR_NVM3 },
+                { name: 'Clear NVM3', value: BootloaderMenu.CLEAR_NVM3, disabled: gecko.adapterModel !== 'Sonoff ZBDongle-E' },
                 { name: 'Exit bootloader', value: BootloaderMenu.RUN },
                 { name: 'Force close', value: -1 },
             ],

diff --git a/src/utils/bootloader.ts b/src/utils/bootloader.ts
@@ -24,13 +24,6 @@ class BootloaderWriter extends Readable {
     public _read(): void {}
 }
 
-enum BootloaderMode {
-    /** The bootloader should not be run. */
-    NO_BOOTLOADER = 0xff,
-    STANDALONE_BOOTLOADER_NORMAL = 1,
-    STANDALONE_BOOTLOADER_RECOVERY = 0,
-}
-
 export enum BootloaderState {
     /** Not connected to bootloader (i.e. not any of below) */
     NOT_CONNECTED = 0,
@@ -490,7 +483,7 @@ export class GeckoBootloader extends EventEmitter<GeckoBootloaderEventMap> {
         const ezsp = await emberStart(this.portConf)
 
         try {
-            const status = await ezsp.ezspLaunchStandaloneBootloader(BootloaderMode.STANDALONE_BOOTLOADER_NORMAL)
+            const status = await ezsp.ezspLaunchStandaloneBootloader(true)
 
             if (status !== SLStatus.OK) {
                 throw new Error(SLStatus[status])