Skip to content

Commit

Permalink
Merge branch 'master' into v14
Browse files Browse the repository at this point in the history
  • Loading branch information
AlCalzone committed Oct 25, 2024
2 parents 12e4218 + 1f00b76 commit 22be10e
Show file tree
Hide file tree
Showing 26 changed files with 1,052 additions and 17 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@
<!--
Add placeholder for next release with `wip` snippet
-->
## 13.10.1 (2024-10-25)
### Bugfixes
* Correct unit of Meter CC values (#7322)
* Bootloader mode is now detected even when short chunks of data are received (#7318)
* Corrected the wording of idle/busy queue logging (#7309)

### Config file changes
* Add Heatit Z-TEMP3 (#7179)
* Add new parameters 17 and 18 for HeatIt TF016_TF021 FW 1.92 (#7287)
* Disable Supervision for Heatit TF021 (#7321)
* Add ZVIDAR WB04V Smartwings Day Night Shades (#7319)
* Add ZVIDAR WM25L Smartwings Smart Motor (#7312)
* Add ZVIDAR ZW881 Multi-Protocol Gateway (#7311)
* Add include, exclude, and wakeup instructions for VCZ1 (#7307)
* Add new Product ID to Namron 16A Switch (#7301)
* Add Minoston MP24Z 800LR Outdoor Smart Plug - 2 Outlet (#7302)

## 13.10.0 (2024-10-24)
### Features
* `mock-server` now supports putting the simulated controller into add and remove mode (#7314)
Expand Down
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/repo",
"version": "13.10.0",
"version": "13.10.1",
"private": true,
"description": "Z-Wave driver written entirely in JavaScript/TypeScript",
"keywords": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/cc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zwave-js/cc",
"version": "13.9.1",
"version": "13.10.1",
"description": "zwave-js: Command Classes",
"keywords": [],
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cc/src/cc/MeterCC.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ export class MeterCCReport extends MeterCC {
this.setMetadata(ctx, valueValue, {
...valueValue.meta,
label: getValueLabel(this.type, this.scale, this.rateType),
unit: scale.label,
unit: scale.unit,
ccSpecific: {
meterType: this.type,
scale: this.scale,
Expand Down
36 changes: 35 additions & 1 deletion packages/config/config/devices/0x019b/tf016_tf021.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,45 @@
"minValue": 50,
"maxValue": 400,
"defaultValue": 210
},
{
"#": "17",
"$if": "firmwareVersion >= 1.92",
"label": "Temperature Report Interval",
"valueSize": 2,
"unit": "10 seconds",
"minValue": 0,
"maxValue": 8640,
"defaultValue": 6,
"options": [
{
"label": "Disable",
"value": 0
}
]
},
{
"#": "18",
"$if": "firmwareVersion >= 1.92",
"label": "Temperature Report Change Threshold",
"valueSize": 1,
"unit": "0.1 °C",
"minValue": 1,
"maxValue": 100,
"defaultValue": 10
}
],
"compat": {
// The device reports its relay state via the Basic CC
"mapBasicReport": false
"mapBasicReport": false,
// Supervision reports are sent from the root device instead of endpoints
"commandClasses": {
"remove": {
"Supervision": {
"endpoints": "*"
}
}
}
},
"metadata": {
"inclusion": "To include the thermostat to your home automation gateway, press Center (confirm) for 10 seconds.\nThe display will show OFF. Press Right (down) 4 times till you see Con in the display.\nNow start adding the device in your home automation software. Start inclusion mode by pressing Center (confirm) for approximately 2 seconds. The inclusion/exclusion icon will appear in the display. Confirmation will show Inc/EcL in the display. If inclusion fails, Err (error) will appear.\nLeave programming mode by choosing ESC in menu. Your thermostat is ready for use with default settings",
Expand Down
242 changes: 242 additions & 0 deletions packages/config/config/devices/0x019b/z-temp3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
{
"manufacturer": "Heatit",
"manufacturerId": "0x019b",
"label": "Z-TEMP3",
"description": "Thermostat",
"devices": [
{
"productType": "0x0031",
"productId": "0x3101",
"zwaveAllianceId": 4908
}
],
"firmwareVersion": {
"min": "0.0",
"max": "255.255"
},
"associations": {
"1": {
"label": "Lifeline",
"maxNodes": 1,
"isLifeline": true
},
"2": {
"label": "Binary Switch Set",
"maxNodes": 10
},
"3": {
"label": "Thermostat Setpoint Set",
"maxNodes": 10
},
"4": {
"label": "Thermostat Mode Set",
"maxNodes": 10
}
},
"paramInformation": [
{
"#": "1",
"$import": "~/templates/master_template.json#base_enable_disable_inverted",
"label": "Local Control",
"defaultValue": 0
},
{
"#": "2",
"label": "Min Temp Limit",
"valueSize": 2,
"unit": "0.1 °C",
"minValue": 50,
"maxValue": 400,
"defaultValue": 50
},
{
"#": "3",
"label": "Max Temp Limit",
"valueSize": 2,
"unit": "0.1 °C",
"minValue": 50,
"maxValue": 400,
"defaultValue": 400
},
{
"#": "4",
"label": "Temp Sensor Calibration",
"valueSize": 1,
"unit": "0.1 °C",
"minValue": -60,
"maxValue": 60,
"defaultValue": 0,
"unsigned": false
},
{
"#": "5",
"label": "Regulation Mode",
"valueSize": 1,
"defaultValue": 0,
"allowManualEntry": false,
"options": [
{
"label": "Hysteresis",
"value": 0
},
{
"label": "PWM",
"value": 1
}
]
},
{
"#": "6",
"label": "Update Interval",
"description": "Allowable range: 0, 150-2000",
"valueSize": 2,
"unit": "seconds",
"minValue": 0,
"maxValue": 65535,
"defaultValue": 3600,
"unsigned": true,
"options": [
{
"label": "Only on change",
"value": 0
}
]
},
{
"#": "7",
"label": "Temperature Control Hysteresis",
"valueSize": 1,
"unit": "0.1 °C",
"minValue": 3,
"maxValue": 30,
"defaultValue": 5
},
{
"#": "8",
"label": "Temperature Display",
"valueSize": 1,
"defaultValue": 0,
"allowManualEntry": false,
"options": [
{
"label": "Setpoint",
"value": 0
},
{
"label": "Measured",
"value": 1
}
]
},
{
"#": "9",
"label": "Active Display Brightness",
"valueSize": 1,
"unit": "10 %",
"minValue": 1,
"maxValue": 10,
"defaultValue": 10
},
{
"#": "10",
"label": "Temperature Report Interval",
"valueSize": 2,
"unit": "seconds",
"minValue": 150,
"maxValue": 65535,
"defaultValue": 990,
"unsigned": true
},
{
"#": "11",
"label": "Temperature Report Hysteresis",
"valueSize": 1,
"unit": "0.1 °C",
"minValue": 1,
"maxValue": 100,
"defaultValue": 10
},
{
"#": "12",
"label": "Humidity Report Interval",
"valueSize": 2,
"unit": "seconds",
"minValue": 150,
"maxValue": 65535,
"defaultValue": 990,
"unsigned": true
},
{
"#": "13",
"label": "Humidity Report Hysteresis",
"valueSize": 1,
"unit": "%",
"minValue": 1,
"maxValue": 100,
"defaultValue": 25
},
{
"#": "14",
"label": "Heating Setpoint",
"valueSize": 2,
"unit": "0.1 °C",
"minValue": 50,
"maxValue": 400,
"defaultValue": 210
},
{
"#": "15",
"label": "Cooling Setpoint",
"valueSize": 2,
"unit": "0.1 °C",
"minValue": 50,
"maxValue": 400,
"defaultValue": 250
},
{
"#": "16",
"label": "Eco Setpoint",
"valueSize": 2,
"unit": "0.1 °C",
"minValue": 50,
"maxValue": 400,
"defaultValue": 180
},
{
"#": "17",
"label": "Operating Mode",
"valueSize": 1,
"defaultValue": 1,
"allowManualEntry": false,
"options": [
{
"label": "Off",
"value": 0
},
{
"label": "Heating",
"value": 1
},
{
"label": "Cooling",
"value": 2
},
{
"label": "Eco",
"value": 3
}
]
},
{
"#": "18",
"$import": "~/templates/master_template.json#base_enable_disable",
"label": "Open Window Detection"
}
],
"metadata": {
"inclusion": "Hold the Center button for 5 seconds. The display will show “OFF”\n Press the ”+” button once to see “CON” in the display.\n Start the add/remove device process in your primary controller.\n Start the configuration mode on the thermostat by holding the Center button for approximately 2 seconds.",
"exclusion": "Hold the Center button for 5 seconds. The display will show “OFF”\n Press the ”+” button once to see “CON” in the display.\n Start the add/remove device process in your primary controller.\n Start the configuration mode on the thermostat by holding the Center button for approximately 2 seconds.",
"reset": "Enter the menu by holding the Center button for about 5seconds, navigate in the menu with the ”+” button til you see FACT. Press the Center button until you see “-- --” blinking in the display, then hold for about 5 seconds to perform a reset. You may also initiate a reset by holding the Right and Center buttons for 55 seconds.",
"manual": "https://media.heatit.com/3872"
}
}
5 changes: 4 additions & 1 deletion packages/config/config/devices/0x026e/vcz1.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
"max": "255.255"
},
"metadata": {
"reset": "Press and hold the button on the control for approximately 15 seconds (the LED will stop flashing when complete.\n\n\"Please use this procedure only when the network primary controller is missing or otherwise inoperable.\"",
"inclusion": "Press and hold the programming button until the LED light bar begins to flash green then release the button.",
"exclusion": "Press and hold the programming button until the LED light bar begins to flash green then release the button.",
"reset": "Press and hold the programming button until the LEDs stop blinking. LEDs will blink green, amber, red, and then finally turn off (about 15 seconds). Local Reset must be performed on both the controllers and motors and should only be used if the primary controller is no longer available.",
"wakeup": "Press and release the programming button one time.",
"manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/1786/Graber%20Virtual%20Cord%20Owner's%20Manual.pdf"
},
"compat": {
Expand Down
Loading

0 comments on commit 22be10e

Please sign in to comment.