Skip to content

Commit

Permalink
Merge branch 'master' into fix-colors
Browse files Browse the repository at this point in the history
  • Loading branch information
robertsLando authored Jan 28, 2025
2 parents bf60258 + bbd9b35 commit 2881e5f
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 19 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@


# [9.30.0](https://github.com/zwave-js/zwave-js-ui/compare/v9.29.1...v9.30.0) (2025-01-27)


### Bug Fixes

* **logger:** standardize module name formatting to uppercase ([dfa47a9](https://github.com/zwave-js/zwave-js-ui/commit/dfa47a949101fe23c79aff9e0b02faaad11592aa))
* store nodes preferences in `nodes.json` using homeHex ([#4104](https://github.com/zwave-js/zwave-js-ui/issues/4104)) ([e913f10](https://github.com/zwave-js/zwave-js-ui/commit/e913f10b0c1cb008de22148a07a5763e8633defa))
* **ui:** abort link reliability check on dialog close ([54224d2](https://github.com/zwave-js/zwave-js-ui/commit/54224d21a080ed19d3a6c214d95db23f2a86e3fb)), closes [#4105](https://github.com/zwave-js/zwave-js-ui/issues/4105)
* **ui:** cleaner popup text when refreshing associations ([abe7137](https://github.com/zwave-js/zwave-js-ui/commit/abe71370a31c31635144dff0b2731eea649842e6)), closes [#4100](https://github.com/zwave-js/zwave-js-ui/issues/4100)
* **ui:** move rebuild routes back to general actions ([c5d9691](https://github.com/zwave-js/zwave-js-ui/commit/c5d96914ebf2aafed52f675288b7ee15693647d9)), closes [#3559](https://github.com/zwave-js/zwave-js-ui/issues/3559)
* use `uncaughtException` to catch missing exceptions ([4905e0c](https://github.com/zwave-js/zwave-js-ui/commit/4905e0c2c64f8c7c60bf456cbae611ff16f99200)), closes [#4098](https://github.com/zwave-js/zwave-js-ui/issues/4098)


### Features

* bump @kvaster/zwavejs-prom plugin to 0.0.3 ([c373290](https://github.com/zwave-js/zwave-js-ui/commit/c373290a949122624307debe189d935af9de1acd)), closes [#4096](https://github.com/zwave-js/zwave-js-ui/issues/4096)
* **mqtt-discovery:** gateway values setting to enable by default Configuration CC entities ([#4106](https://github.com/zwave-js/zwave-js-ui/issues/4106)) ([81ebd61](https://github.com/zwave-js/zwave-js-ui/commit/81ebd61d6204f707f4628512b05dfe953e0796ed))

## [9.29.1](https://github.com/zwave-js/zwave-js-ui/compare/v9.29.0...v9.29.1) (2025-01-16)


Expand Down
8 changes: 8 additions & 0 deletions api/lib/Gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export type GatewayValue = {
receiveFunction?: string
qos?: 0 | 1 | 2
retain?: boolean
ccConfigEnableDiscovery?: boolean
}

export type ScheduledJob = {
Expand Down Expand Up @@ -1753,6 +1754,13 @@ export default class Gateway {
default:
return
}

// by default configuration CC discovery entities are disabled
// them can be enabled by setting ccConfigEnableDiscovery to true
// on gateway values configuration
cfg.discovery_payload.enabled_by_default =
!!valueConf?.ccConfigEnableDiscovery

break
}
default:
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zwave-js-ui",
"version": "9.29.1",
"version": "9.30.0",
"description": "Z-Wave Control Panel and MQTT Gateway",
"keywords": [
"mqtt",
Expand Down
38 changes: 22 additions & 16 deletions src/components/dialogs/DialogGatewayValue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@
></v-text-field>
</v-col>
<v-col cols="6">
<v-switch
<v-checkbox
label="Poll"
hint="Enable poll of this value. ATTENTION: This could create lot traffic in your network and kill the life of battery powered devices. Use at your own risk"
persistent-hint
v-model="editedValue.enablePoll"
></v-switch>
></v-checkbox>
</v-col>
<v-col v-if="editedValue.enablePoll" cols="6">
<v-text-field
Expand All @@ -151,25 +151,31 @@
type="number"
></v-text-field>
</v-col>
<!--
<v-col cols="6">
<v-switch
label="Verify changes"
hint="Verify changes of this value"
persistent-hint
v-model="editedValue.verifyChanges"
></v-switch>
</v-col>

-->
<v-col
cols="6"
v-if="
editedValue.value &&
editedValue.value.commandClass === 112
"
>
<v-checkbox
label="Enable discovery"
hint="Configuration CC values are disabled by default in MQTT discovery. Set this to true to force enable them"
persistent-hint
v-model="
editedValue.ccConfigEnableDiscovery
"
></v-checkbox>
</v-col>

<v-col cols="6">
<v-switch
<v-checkbox
label="Parse send"
hint="Create a function that parse the value sent via MQTT"
persistent-hint
v-model="editedValue.parseSend"
></v-switch>
></v-checkbox>
</v-col>

<v-container v-if="editedValue.parseSend">
Expand All @@ -189,12 +195,12 @@
</v-container>

<v-col cols="6">
<v-switch
<v-checkbox
label="Parse receive"
hint="Create a function that parse the received value from MQTT"
persistent-hint
v-model="editedValue.parseReceive"
></v-switch>
></v-checkbox>
</v-col>

<v-container v-if="editedValue.parseReceive">
Expand Down

0 comments on commit 2881e5f

Please sign in to comment.