mirror of
https://github.com/Fishwaldo/open-zwave.git
synced 2025-03-15 11:31:40 +00:00
Fix typos in Localization, Notification and ValueIDIndexes. (#1817)
* Fix typos in Localization, Notification and ValueIDIndexes. Change wording of a few definitions, based on document SDS13713 Notification Command Class, list of assigned Notifications, in DKD13867 Z-Wave Specification release 2019B * Bump Revisions
This commit is contained in:
Peter Gebruers
parent
81343bcd32
commit
0b9129e341
5 changed files with 56 additions and 53 deletions
|
|
@ -1,7 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Localization xmlns="https://github.com/OpenZWave/open-zwave" Revision="5">
|
||||
<Localization xmlns="https://github.com/OpenZWave/open-zwave" Revision="6">
|
||||
<CommandClass id="113">
|
||||
<!-- Please Keep updates in the Notification CC in sync with NotificationCCTypes.xml as well -->
|
||||
<!-- Please keep Localization.xml in sync with NotificationCCTypes.xml -->
|
||||
<!-- If you are adding new Types or Params, Please also consider updating ValueIDIndexesDefines.def -->
|
||||
<!-- Bump Revision number, run "xmllint format" and "make xmltest" before submitting -->
|
||||
<Label>COMMAND_CLASS_NOTIFICATION</Label>
|
||||
<Value index="1">
|
||||
<Help>A Smoke Alarm Alert</Help>
|
||||
|
|
@ -18,11 +20,11 @@
|
|||
<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
|
||||
</Value>
|
||||
<Value index="2">
|
||||
<Help>Carbon Monoxied Alerts</Help>
|
||||
<Label>Carbon Monoxied</Label>
|
||||
<Help>Carbon Monoxide Alerts</Help>
|
||||
<Label>Carbon Monoxide</Label>
|
||||
<ItemLabel itemIndex="0">Clear</ItemLabel>
|
||||
<ItemLabel itemIndex="1">Carbon Monoxied Detected at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Carbon Monoxied Detected at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="1">Carbon Monoxide Detected at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Carbon Monoxide Detected at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Test</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Replacement Required (Unspecified)</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Replacement Required (End Of Life)</ItemLabel>
|
||||
|
|
@ -31,11 +33,11 @@
|
|||
<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
|
||||
</Value>
|
||||
<Value index="3">
|
||||
<Help>Carbon Dixoide Alerts</Help>
|
||||
<Label>Carbon Dixoide</Label>
|
||||
<Help>Carbon Dioxide Alerts</Help>
|
||||
<Label>Carbon Dioxide</Label>
|
||||
<ItemLabel itemIndex="0">Clear</ItemLabel>
|
||||
<ItemLabel itemIndex="1">Carbon Dixoide Detected at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Carbon Dixoide Detected at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="1">Carbon Dioxide Detected at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Carbon Dioxide Detected at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Test</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Replacement Required (Unspecified)</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Replacement Required (End Of Life)</ItemLabel>
|
||||
|
|
@ -66,8 +68,8 @@
|
|||
<ItemLabel itemIndex="0">Clear</ItemLabel>
|
||||
<ItemLabel itemIndex="1">Water Leak at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Water Leak at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Water Level Droped at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Water Level Droped at Unnknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Water Level Dropped at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Water Level Dropped at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Replace Filter</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Water Flow</ItemLabel>
|
||||
<ItemLabel itemIndex="7">Water Pressure</ItemLabel>
|
||||
|
|
@ -87,7 +89,7 @@
|
|||
<ItemLabel itemIndex="8">Wireless Not Fully Locked</ItemLabel>
|
||||
<ItemLabel itemIndex="9">Auto Lock</ItemLabel>
|
||||
<ItemLabel itemIndex="10">Auto Lock Not Fully Locked</ItemLabel>
|
||||
<ItemLabel itemIndex="11">Lock Jamed</ItemLabel>
|
||||
<ItemLabel itemIndex="11">Lock Jammed</ItemLabel>
|
||||
<ItemLabel itemIndex="12">All User Codes Deleted</ItemLabel>
|
||||
<ItemLabel itemIndex="13">Single User Code Deleted</ItemLabel>
|
||||
<ItemLabel itemIndex="14">New User Code Added</ItemLabel>
|
||||
|
|
@ -107,10 +109,10 @@
|
|||
<ItemLabel itemIndex="68">Barrier Failed Operation</ItemLabel>
|
||||
<ItemLabel itemIndex="69">Barrier Unattended Operation Disabled</ItemLabel>
|
||||
<ItemLabel itemIndex="70">Barrier Malfunction</ItemLabel>
|
||||
<ItemLabel itemIndex="71">Barrier Vacaction Mode</ItemLabel>
|
||||
<ItemLabel itemIndex="72">Barrier Saftey Beam Obstruction</ItemLabel>
|
||||
<ItemLabel itemIndex="71">Barrier Vacation Mode</ItemLabel>
|
||||
<ItemLabel itemIndex="72">Barrier Safety Beam Obstruction</ItemLabel>
|
||||
<ItemLabel itemIndex="73">Barrier Sensor Not Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="74">Barrier Battery Low</ItemLabel>
|
||||
<ItemLabel itemIndex="74">Barrier Sensor Battery Low</ItemLabel>
|
||||
<ItemLabel itemIndex="75">Barrier Short in Wall Station Wires</ItemLabel>
|
||||
<ItemLabel itemIndex="76">Barrier Associated with Non ZWave Device</ItemLabel>
|
||||
<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
|
||||
|
|
@ -122,7 +124,7 @@
|
|||
<ItemLabel itemIndex="1">Intrusion at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="2">Intrusion at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Tampering - Cover Removed</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Tamperting - Invalid Code</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Tampering - Invalid Code</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Glass Breakage at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Glass Breakage at UnknownLocation</ItemLabel>
|
||||
<ItemLabel itemIndex="7">Motion Detected at Location</ItemLabel>
|
||||
|
|
@ -140,7 +142,7 @@
|
|||
<ItemLabel itemIndex="4">Surge Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Brownout Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Over Current Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="7">Over Voltage Voltage</ItemLabel>
|
||||
<ItemLabel itemIndex="7">Over Voltage Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="8">Over Load Detected</ItemLabel>
|
||||
<ItemLabel itemIndex="9">Load Error</ItemLabel>
|
||||
<ItemLabel itemIndex="10">Replace Battery Soon</ItemLabel>
|
||||
|
|
@ -218,7 +220,7 @@
|
|||
<ItemLabel itemIndex="3">Lying On Bed</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Posture Changed</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Sitting On Edge Of Bed</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Volatile Organic Level</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Volatile Organic Compound Level</ItemLabel>
|
||||
<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
|
||||
</Value>
|
||||
<Value index="14">
|
||||
|
|
@ -267,8 +269,8 @@
|
|||
<ItemLabel itemIndex="2">Combustable Gas Detected at Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="3">Toxic Gas Detected at Location</ItemLabel>
|
||||
<ItemLabel itemIndex="4">Toxic Gas Detected Unknown Location</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Test</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Replacement Required (Unspecified)</ItemLabel>
|
||||
<ItemLabel itemIndex="5">Alarm Test</ItemLabel>
|
||||
<ItemLabel itemIndex="6">Replacement Required</ItemLabel>
|
||||
<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
|
||||
</Value>
|
||||
<!-- Index from 256 are Params -->
|
||||
|
|
@ -302,7 +304,7 @@
|
|||
<Label>User Code ID</Label>
|
||||
</Value>
|
||||
<Value index="261">
|
||||
<Help>User Codethat was used</Help>
|
||||
<Help>User Code that was used</Help>
|
||||
<Label>User Code</Label>
|
||||
</Value>
|
||||
|
||||
|
|
@ -534,7 +536,7 @@
|
|||
</CommandClass>
|
||||
<CommandClass id="112">
|
||||
<Label>COMMAND_CLASS_CONFIGURATION</Label>
|
||||
<!-- We dont do any here - this should come from device configuration files -->
|
||||
<!-- We do not do any here - this should come from device configuration files -->
|
||||
</CommandClass>
|
||||
<CommandClass id="33">
|
||||
<Label>COMMAND_CLASS_CONTROLLER_REPLICATION</Label>
|
||||
|
|
@ -1002,7 +1004,7 @@
|
|||
<Label>Dim</Label>
|
||||
</Value>
|
||||
<Value index="3">
|
||||
<Help>Ignore the Start Level of the Device when increasing/descreasing brightness</Help>
|
||||
<Help>Ignore the Start Level of the Device when increasing/decreasing brightness</Help>
|
||||
<Label>Ignore Start Level</Label>
|
||||
</Value>
|
||||
<Value index="4">
|
||||
|
|
@ -2194,7 +2196,7 @@
|
|||
<Label>Code Count</Label>
|
||||
</Value>
|
||||
<Value index="258">
|
||||
<Help>The Raw UserCode as specified at the Postition in Raw UserCode Index </Help>
|
||||
<Help>The Raw UserCode as specified at the Position in Raw UserCode Index </Help>
|
||||
<Label>Raw UserCode</Label>
|
||||
</Value>
|
||||
<Value index="259">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<NotificationTypes xmlns='https://github.com/OpenZWave/open-zwave' Revision="8">
|
||||
<!-- Please keep this file in Sync with the Localization.xml file for the Notification CC -->
|
||||
<!-- If you are adding new Types or Params, Please also consider updating ValueIDIndexesDefines.def -->
|
||||
<NotificationTypes xmlns='https://github.com/OpenZWave/open-zwave' Revision="9">
|
||||
<!-- Please keep Localization.xml in sync with NotificationCCTypes.xml -->
|
||||
<!-- If you are adding new Types or Params, Please also consider updating ValueIDIndexesDefines.def -->
|
||||
<!-- Bump Revision number, run "xmllint format" and "make xmltest" before submitting -->
|
||||
<AlarmType id="1" name="Smoke Alarm">
|
||||
<AlarmEvent id="0" name="Clear">
|
||||
<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
|
||||
|
|
@ -27,14 +28,14 @@
|
|||
</AlarmEvent>
|
||||
</AlarmType>
|
||||
|
||||
<AlarmType id="2" name="Carbon Monoxied">
|
||||
<AlarmType id="2" name="Carbon Monoxide">
|
||||
<AlarmEvent id="0" name="Clear">
|
||||
<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="1" name="Carbon Monoxied Detected at Location">
|
||||
<AlarmEvent id="1" name="Carbon Monoxide Detected at Location">
|
||||
<AlarmEventParam id="257" type="location" name="Alert Location" />
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="2" name="Carbon Monoxied Detected at Unknown Location">
|
||||
<AlarmEvent id="2" name="Carbon Monoxide Detected at Unknown Location">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="3" name="Test">
|
||||
<AlarmEventParam id="258" type="list" name="Result">
|
||||
|
|
@ -48,20 +49,20 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="6" name="Silenced">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="7" name="Maintence Required: Periodic Inspection">
|
||||
<AlarmEvent id="7" name="Maintenance Required: Periodic Inspection">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="254" name="Unknown Event">
|
||||
</AlarmEvent>
|
||||
</AlarmType>
|
||||
|
||||
<AlarmType id="3" name="Carbon Dixoide">
|
||||
<AlarmType id="3" name="Carbon Dioxide">
|
||||
<AlarmEvent id="0" name="Clear">
|
||||
<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="1" name="Carbon Dixoide Detected at Location">
|
||||
<AlarmEvent id="1" name="Carbon Dioxide Detected at Location">
|
||||
<AlarmEventParam id="257" type="location" name="Alert Location" />
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="2" name="Carbon Dixoid Detected at Unknown Location">
|
||||
<AlarmEvent id="2" name="Carbon Dioxide Detected at Unknown Location">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="3" name="Test">
|
||||
<AlarmEventParam id="258" type="list" name="Result">
|
||||
|
|
@ -75,7 +76,7 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="6" name="Silenced">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="7" name="Maintence Required: Periodic Inspection">
|
||||
<AlarmEvent id="7" name="Maintenance Required: Periodic Inspection">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="254" name="Unknown Event">
|
||||
</AlarmEvent>
|
||||
|
|
@ -123,10 +124,10 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="2" name="Water Leak at Unknown Location">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="3" name="Water Level Droped at Location">
|
||||
<AlarmEvent id="3" name="Water Level Dropped at Location">
|
||||
<AlarmEventParam id="257" type="location" name="Alert Location" />
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="4" name="Water Level Droped at Unnknown Location">
|
||||
<AlarmEvent id="4" name="Water Level Dropped at Unknown Location">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="5" name="Replace Filter">
|
||||
</AlarmEvent>
|
||||
|
|
@ -176,7 +177,7 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="10" name="Auto Lock Not Fully Locked">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="11" name="Lock Jamed">
|
||||
<AlarmEvent id="11" name="Lock Jammed">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="12" name="All User Codes Deleted">
|
||||
</AlarmEvent>
|
||||
|
|
@ -221,13 +222,13 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="70" name="Barrier Malfunction">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="71" name="Barrier Vacaction Mode">
|
||||
<AlarmEvent id="71" name="Barrier Vacation Mode">
|
||||
<AlarmEventParam id="263" type="list" name="Mode">
|
||||
<Item id="0" label="Disabled" />
|
||||
<Item id="255" label="Enabled" />
|
||||
</AlarmEventParam>
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="72" name="Barrier Saftey Beam Obstruction">
|
||||
<AlarmEvent id="72" name="Barrier Safety Beam Obstruction">
|
||||
<AlarmEventParam id="264" type="list" name="Obstruction">
|
||||
<Item id="0" label="No Obstruction" />
|
||||
<Item id="255" label="Obstruction" />
|
||||
|
|
@ -258,7 +259,7 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="3" name="Tampering - Cover Removed">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="4" name="Tamperting - Invalid Code">
|
||||
<AlarmEvent id="4" name="Tampering - Invalid Code">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="5" name="Glass Breakage at Location">
|
||||
<AlarmEventParam id="257" type="location" name="Alert Location" />
|
||||
|
|
@ -292,7 +293,7 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="6" name="Over Current Detected">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="7" name="Over Voltage Voltage">
|
||||
<AlarmEvent id="7" name="Over Voltage Detected">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="8" name="Over Load Detected">
|
||||
</AlarmEvent>
|
||||
|
|
@ -431,7 +432,7 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="5" name="Sitting On Edge Of Bed">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="6" name="Volatile Organic Level">
|
||||
<AlarmEvent id="6" name="Volatile Organic Compound Level">
|
||||
<AlarmEventParam id="268" type="list" name="Pollution Level">
|
||||
<Item id="1" label="Clean" />
|
||||
<Item id="2" label="Slightly Polluted" />
|
||||
|
|
@ -541,9 +542,9 @@
|
|||
</AlarmEvent>
|
||||
<AlarmEvent id="4" name="Toxic Gas Detected Unknown Location">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="5" name="Test">
|
||||
<AlarmEvent id="5" name="Alarm Test">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="6" name="Replacement Required (Unspecified)">
|
||||
<AlarmEvent id="6" name="Replacement Required">
|
||||
</AlarmEvent>
|
||||
<AlarmEvent id="254" name="Unknown Event">
|
||||
</AlarmEvent>
|
||||
|
|
|
|||
|
|
@ -92,12 +92,12 @@
|
|||
'md5' => 'eb39290e2085eb7493a88fba0f53782a588539d81810442fd1575d5065263e24b23e4711a2fd5df0bf7cae7ff380c605d785399e87aa658cac3f155a1d2ae667'
|
||||
},
|
||||
'config/Localization.xml' => {
|
||||
'Revision' => '5',
|
||||
'md5' => '4d7f5397c5dc84f6c7687dc1a3f0326f5cb4ddf62fb21edac0303bd36dccb1d75d9f044336d8357bd639f9c7ca0a4e3852a265cb2417f94af4db16e5ec37b689'
|
||||
'Revision' => '6',
|
||||
'md5' => '14d65920b359d1c5d24a30cdfab2e46ca1e3b322cfd2d2c472be3f79957e599534d8cc33ac490415d699eecbcb7858ce71ec2374518262f29064291f999cda67'
|
||||
},
|
||||
'config/NotificationCCTypes.xml' => {
|
||||
'Revision' => '8',
|
||||
'md5' => 'de2f6194d024a66c57b24d1635989f10a86e08c5cf2397fb1bc8af7bfae883228cb896d7d1c2647a586d18a60c07e78c69659c0f6ed48f9af4931af84f1fd03d'
|
||||
'Revision' => '9',
|
||||
'md5' => 'fe343cf0b94ab320774f1a8c161bc4ec5c0b3193f83067c8810cfdac36148c4c68ecad20a940514562158afdae22543fbb54f710406b070114f53606cfba4e94'
|
||||
},
|
||||
'config/act/lfm20.xml' => {
|
||||
'Revision' => '2',
|
||||
|
|
|
|||
|
|
@ -1068,8 +1068,8 @@ struct EnumName { \
|
|||
ENUM(ValueID_Index_Alarm,
|
||||
Type_Start = 0,
|
||||
Type_Smoke_Alarm = 1,
|
||||
Type_Carbon_Monoxied = 2,
|
||||
Type_Carbon_Dixoide = 3,
|
||||
Type_Carbon_Monoxide = 2,
|
||||
Type_Carbon_Dioxide = 3,
|
||||
Type_Heat = 4,
|
||||
Type_Water = 5,
|
||||
Type_Access_Control = 6,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue