dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-07-10 22:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Set zigbee-herdsman transmit power through settings on startup (#23566)

Browse Source 
* fix: Set zigbee-herdsman transmit power through settings on startup

* use advanced
This commit is contained in:
Koen Kanters
2024-08-09 14:33:59 +02:00
committed by GitHub
parent aeba93d0a3
commit efd3d3dfb0
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zigbee.ts
+1 -7
View File
@@ -50,6 +50,7 @@ export default class Zigbee {
concurrent: settings.get().advanced.adapter_concurrent,
delay: settings.get().advanced.adapter_delay,
disableLED: settings.get().serial.disable_led,
transmitPower: settings.get().advanced.transmit_power,
},
acceptJoiningDeviceHandler: this.acceptJoiningDeviceHandler,
};
@@ -147,13 +148,6 @@ export default class Zigbee {
}
}
// Check if we have to set a transmit power
if (settings.get().advanced.transmit_power != null) {
const transmitPower = settings.get().advanced.transmit_power;
await this.herdsman.setTransmitPower(transmitPower);
logger.info(`Set transmit power to '${transmitPower}'`);
}
return startResult;
}
test/controller.test.js
+2 -8
View File
@@ -66,6 +66,7 @@ describe('Controller', () => {
});
it('Start controller', async () => {
settings.set(['advanced', 'transmit_power'], 14);
await controller.start();
expect(zigbeeHerdsman.constructor).toHaveBeenCalledWith({
network: {
@@ -78,7 +79,7 @@ describe('Controller', () => {
databaseBackupPath: path.join(data.mockDir, 'database.db.backup'),
backupPath: path.join(data.mockDir, 'coordinator_backup.json'),
acceptJoiningDeviceHandler: expect.any(Function),
adapter: {concurrent: null, delay: null, disableLED: false},
adapter: {concurrent: null, delay: null, disableLED: false, transmitPower: 14},
serialPort: {baudRate: undefined, rtscts: undefined, path: '/dev/dummy'},
});
expect(zigbeeHerdsman.start).toHaveBeenCalledTimes(1);
@@ -289,13 +290,6 @@ describe('Controller', () => {
expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledWith(false, undefined, undefined);
});
it('Start controller with transmit power', async () => {
settings.set(['experimental', 'transmit_power'], 14);
await controller.start();
expect(zigbeeHerdsman.setTransmitPower).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.setTransmitPower).toHaveBeenCalledWith(14);
});
it('Start controller and stop with restart', async () => {
await controller.start();
await controller.stop(true);