feat: add auto power levels option for RF configuration in settings (#4281)

robertsLando · AlCalzone · Copilot · web-flow · commit e5007e88d76c · 2025-07-11T11:26:11.000+02:00
This would make it impossible for users to unset this

---------

Co-authored-by: Dominic Griesel &lt;dominic.griesel@nabucasa.com&gt;
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/api/config/store.ts b/api/config/store.ts
@@ -32,12 +32,6 @@ const store: Record<StoreKeys, StoreFile> = {
 			zwave: {
 				deviceConfigPriorityDir,
 				enableSoftReset: true,
-				rf: {
-					maxLongRangePowerlevel: 'auto',
-					txPower: {
-						powerlevel: 'auto',
-					},
-				},
 			},
 		} satisfies Settings,
 	},
diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts
@@ -628,6 +628,7 @@ export type ZwaveConfig = {
 	rf?: {
 		region?: RFRegion
 		maxLongRangePowerlevel?: number | 'auto'
+		autoPowerlevels?: boolean
 		txPower?: {
 			powerlevel: number | 'auto'
 			measured0dBm?: number
@@ -2150,6 +2151,8 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 			return
 		}
 
+		let shouldUpdateSettings = false
+
 		// extend options with hidden `options`
 		const zwaveOptions: PartialZWaveOptions = {
 			bootloaderMode: this.cfg.allowBootloaderOnly ? 'allow' : 'recover',
@@ -2205,27 +2208,48 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		if (this.cfg.rf) {
 			const { region, txPower, maxLongRangePowerlevel } = this.cfg.rf
 
+			let { autoPowerlevels } = this.cfg.rf
 			zwaveOptions.rf = {}
 
 			if (typeof region === 'number') {
 				zwaveOptions.rf.region = region
 			}
 
 			if (
-				maxLongRangePowerlevel === 'auto' ||
-				typeof maxLongRangePowerlevel === 'number'
+				autoPowerlevels === undefined &&
+				typeof maxLongRangePowerlevel !== 'number' &&
+				typeof txPower?.powerlevel !== 'number'
+			) {
+				// if autoPowerlevels is undefined and maxLongRangePowerlevel is not a number (likely '' or undefined), assume autoPowerlevels is true
+				autoPowerlevels = true
+				this.cfg.rf.autoPowerlevels = true
+				shouldUpdateSettings = true
+			}
+
+			if (autoPowerlevels) {
+				zwaveOptions.rf.maxLongRangePowerlevel = 'auto'
+				zwaveOptions.rf.txPower ??= {}
+				zwaveOptions.rf.txPower.powerlevel = 'auto'
+			}
+
+			if (
+				!autoPowerlevels &&
+				(maxLongRangePowerlevel === 'auto' ||
+					typeof maxLongRangePowerlevel === 'number')
 			) {
 				zwaveOptions.rf.maxLongRangePowerlevel = maxLongRangePowerlevel
 			}
 
 			if (txPower) {
 				if (
-					txPower.powerlevel === 'auto' ||
-					typeof txPower.powerlevel === 'number'
+					!autoPowerlevels &&
+					(txPower.powerlevel === 'auto' ||
+						typeof txPower.powerlevel === 'number')
 				) {
 					zwaveOptions.rf.txPower ??= {}
 					zwaveOptions.rf.txPower.powerlevel = txPower.powerlevel
 				}
+
 				if (typeof txPower.measured0dBm === 'number') {
 					zwaveOptions.rf.txPower ??= {}
 					zwaveOptions.rf.txPower.measured0dBm = txPower.measured0dBm
@@ -2284,9 +2308,7 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		// update settings to fix compatibility
 		if (s0Key && !this.cfg.securityKeys.S0_Legacy) {
 			this.cfg.securityKeys.S0_Legacy = s0Key
-			const settings = jsonStore.get(store.settings)
-			settings.zwave = this.cfg
-			await jsonStore.put(store.settings, settings)
+			shouldUpdateSettings = true
 		}
 
 		utils.parseSecurityKeys(this.cfg, zwaveOptions)
@@ -2301,6 +2323,11 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		})
 
 		try {
+			if (shouldUpdateSettings) {
+				const settings = jsonStore.get(store.settings)
+				settings.zwave = this.cfg
+				await jsonStore.put(store.settings, settings)
+			}
 			// init driver here because if connect fails the driver is destroyed
 			// this could throw so include in the try/catch
 			this._driver = new Driver(this.cfg.port, zwaveOptions)
diff --git a/src/components/nodes-table/NodeDetails.vue b/src/components/nodes-table/NodeDetails.vue
@@ -127,16 +127,16 @@
 						label="Maximum LR Power Level"
 						:items="maxLRPowerLevels"
 						v-model="node.maxLongRangePowerlevel"
-						:disabled="isAutoLRPowerLevelEnabled"
+						:disabled="isAutoPowerLevelEnabled"
 						:hint="
-							isAutoLRPowerLevelEnabled
+							isAutoPowerLevelEnabled
 								? 'Automatic mode enabled in settings'
 								: ''
 						"
 						persistent-hint
 					>
 						<template
-							v-if="!isAutoLRPowerLevelEnabled"
+							v-if="!isAutoPowerLevelEnabled"
 							v-slot:append-outer
 						>
 							<v-btn
@@ -462,21 +462,13 @@ export default {
 		},
 		isAutoPowerLevelEnabled() {
 			return (
-				this.zwave.rf?.txPower?.powerlevel === 'auto' &&
-				this.regionSupportsAutoPowerlevel
-			)
-		},
-		isAutoLRPowerLevelEnabled() {
-			return (
-				this.zwave.rf?.maxLongRangePowerlevel === 'auto' &&
+				this.zwave.rf.autoPowerlevels &&
 				this.regionSupportsAutoPowerlevel
 			)
 		},
 		showPowerWarnings() {
 			// Hide warnings when auto mode is enabled for supported regions
-			return (
-				!this.isAutoPowerLevelEnabled && !this.isAutoLRPowerLevelEnabled
-			)
+			return !this.isAutoPowerLevelEnabled
 		},
 		commandGroups() {
 			if (this.node) {
diff --git a/src/stores/base.js b/src/stores/base.js
@@ -38,6 +38,7 @@ const useBaseStore = defineStore('base', {
 			rf: {
 				region: undefined,
 				maxLongRangePowerlevel: 'auto',
+				autoPowerlevels: true,
 				txPower: {
 					powerlevel: 'auto',
 					measured0dBm: undefined,
@@ -514,16 +515,6 @@ const useBaseStore = defineStore('base', {
 					this.zwave.rf.txPower = {}
 				}
 
-				// for some reason this could be set to empty strings so
-				// json store will not override them when using `merge`
-				if (!this.zwave.rf.maxLongRangePowerlevel) {
-					this.zwave.rf.maxLongRangePowerlevel = 'auto'
-				}
-
-				if (!this.zwave.rf.txPower.powerlevel) {
-					this.zwave.rf.txPower.powerlevel = 'auto'
-				}
-
 				Object.assign(this.mqtt, conf.mqtt || {})
 				Object.assign(this.zniffer, conf.zniffer || {})
 				Object.assign(this.gateway, conf.gateway || {})
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -812,32 +812,18 @@
 												hint="When enabled, both normal and LR power levels will be automatically set to legal limits based on the RF region whenever the region is changed. Only supported for Europe and USA regions."
 												persistent-hint
 												label="Automatic Power Level"
-												:input-value="
-													newZwave.rf.txPower
-														.powerlevel ===
-														'auto' &&
-													newZwave.rf
-														.maxLongRangePowerlevel ===
-														'auto'
-												"
-												@change="
-													(function (enabled) {
-														newZwave.rf.txPower.powerlevel =
-															enabled
-																? 'auto'
-																: undefined
-														newZwave.rf.maxLongRangePowerlevel =
-															enabled
-																? 'auto'
-																: undefined
-													})($event)
+												v-model="
+													newZwave.rf.autoPowerlevels
 												"
 											></v-switch>
 										</v-col>
 									</v-row>
 									<v-row class="mt-0">
 										<v-col cols="12" sm="6">
 											<v-text-field
+												v-if="
+													!newZwave.rf.autoPowerlevels
+												"
 												label="Normal Power Level"
 												v-model.number="
 													newZwave.rf.txPower
@@ -847,18 +833,9 @@
 												:min="-10"
 												:max="20"
 												:step="0.1"
-												:hint="
-													newZwave.rf.txPower
-														.powerlevel === 'auto'
-														? 'Automatic mode enabled'
-														: 'Power level in dBm. Min -10, Max +14 or +20, depending on the Z-Wave chip. Will be applied on every startup if the current setting of your Z-Wave controller differs. Not all controllers support changing the powerlevel.'
-												"
+												hint="Power level in dBm. Min -10, Max +14 or +20, depending on the Z-Wave chip. Will be applied on every startup if the current setting of your Z-Wave controller differs. Not all controllers support changing the powerlevel."
 												suffix="dBm"
 												type="number"
-												:disabled="
-													newZwave.rf.txPower
-														.powerlevel === 'auto'
-												"
 												:rules="[validTxPower]"
 											></v-text-field>
 										</v-col>
@@ -883,21 +860,13 @@
 										<v-col cols="12" sm="6">
 											<v-select
 												label="Maximum LR Power Level"
-												persistent-hint
-												:hint="
-													newZwave.rf
-														.maxLongRangePowerlevel ===
-													'auto'
-														? 'Automatic mode enabled'
-														: 'The maximum power level to be used by the dynamic power algorithm of Z-Wave LR. Will be applied on every startup if the current setting of your Z-Wave controller differs. Only LR-capable controllers support this setting.'
+												v-if="
+													!newZwave.rf.autoPowerlevels
 												"
+												persistent-hint
+												hint="The maximum power level to be used by the dynamic power algorithm of Z-Wave LR. Will be applied on every startup if the current setting of your Z-Wave controller differs. Only LR-capable controllers support this setting."
 												:items="maxLRPowerLevels"
 												clearable
-												:disabled="
-													newZwave.rf
-														.maxLongRangePowerlevel ===
-													'auto'
-												"
 												v-model="
 													newZwave.rf
 														.maxLongRangePowerlevel
