Skip to content

Commit

Permalink
Merge pull request #14 from Monstergerm/master
Browse files Browse the repository at this point in the history 
v2022.0.6 with various updates
  • Loading branch information
@Monstergerm
Monstergerm committed Aug 20, 2022
2 parents fa1df50 + 466a18e commit b92a097
Show file tree
Hide file tree
Showing 5 changed files with 752 additions and 632 deletions.
2 changes: 1 addition & 1 deletion DSC Alarm.indigoPlugin/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>PluginVersion</key>
<string>2022.0.2</string>
<string>2022.0.6</string>
<key>ServerApiVersion</key>
<string>3.0</string>
<key>IwsApiVersion</key>
Expand Down
13 changes: 6 additions & 7 deletions DSC Alarm.indigoPlugin/Contents/Server Plugin/Actions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@
<Name>Trigger Panic Alarm</Name>
<CallbackMethod>methodPanicAlarm</CallbackMethod>
<ConfigUI>
<Field type="menu" id="panicAlarmType" defaultValue="4">
<Field type="menu" id="panicAlarmType" defaultValue="3">
<Label>Panic Type:</Label>
<List>
<Option value="4">Duress</Option>
<Option value="3">Panic</Option>
<Option value="3">Panic/Police</Option>
<Option value="2">Ambulance</Option>
<Option value="1">Fire</Option>
</List>
Expand All @@ -68,20 +67,20 @@
<Label> Function Keys: 1(a), 2(b), 3(c), 4(d), 5(e)</Label>
</Field>
<Field id="label4" type="label">
<Label> Arrow Keys: Left(&lt;), Right(&gt;), Both(=)</Label>
<Label> Arrow Keys: Left(&#8592;), Right(&#8594;), Both(&#8592;&#8594;)</Label>
</Field>
<Field id="label5" type="label">
<Label> Panic Keys: Fire(F), Ambulance(A), Panic(P)</Label>
</Field>
<Field id="label6" type="label">
<Label> Long Keypress: Key followed by L. ie. '2L' to hold 2.</Label>
<Label> Long Keypress: Key followed by L e.g. '2L' to hold 2.</Label>
</Field>
<Field id="space1" type="label"><Label/></Field>
<Field id="label8" type="label">
<Label>Example:</Label>
</Field>
<Field id="label10" type="label">
<Label> b236&gt; would press function key 2, digits 236, right arrow. Special keys will not work with Envisalink.</Label>
<Label> b236&#8594; would press function key 2, digits 236, right arrow. Special keys will not work with Envisalink.</Label>
</Field>
</ConfigUI>
</Action>
Expand Down Expand Up @@ -157,7 +156,7 @@
<CallbackMethod>methodSyncTime</CallbackMethod>
<ConfigUI>
<Field id="label1" type="label">
<Label>This sets the time and date on the alarm to be the same as the Indigo host computer.</Label>
<Label>This sets the time and date on the DSC panel to be the same as the Indigo host computer.</Label>
</Field>
<Field id="space0" type="label"><Label/></Field>
<Field id="label2" type="label">
Expand Down
5 changes: 3 additions & 2 deletions DSC Alarm.indigoPlugin/Contents/Server Plugin/Devices.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
<List>
<Option value="disarmed">Disarmed</Option>
<Option value="exitDelay">Exit Delay</Option>
<Option value="armed">Armed</Option>
<Option value="armedStay">Armed Stay</Option>
<Option value="armedAway">Armed Away</Option>
<Option value="entryDelay">Entry Delay</Option>
<Option value="tripped">Tripped</Option>
</List>
Expand All @@ -149,7 +150,7 @@
<Option value="none">None</Option>
<Option value="fire">Fire</Option>
<Option value="ambulance">Ambulance</Option>
<Option value="panic">Police</Option>
<Option value="panic">Panic/Police</Option>
<Option value="duress">Duress</Option>
</List>
</ValueType>
Expand Down
19 changes: 13 additions & 6 deletions DSC Alarm.indigoPlugin/Contents/Server Plugin/PluginConfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,26 @@
<Label>(i.e. envisalink or 192.168.1.50; fixed IP is preferred)</Label>
</Field>

<Field id="TwoDS_Port" type="textfield" visibleBindingId="configInterface" visibleBindingValue="twods" defaultValue="4025">
<Label>Port:</Label>
</Field>
<Field id="TwoDS_PortLabel" type="label" visibleBindingId="configInterface" visibleBindingValue="twods" fontColor="darkgray" fontSize="small" alignWithControl="true">
<Label>(default port number = 4025)</Label>
</Field>

<Field id="TwoDS_Password" type="textfield" visibleBindingId="configInterface" visibleBindingValue="twods" secure="true">
<Label>Password:</Label>
</Field>
<Field id="snmpCommunityLabel" type="label" visibleBindingId="configInterface" visibleBindingValue="twods" fontColor="darkgray" fontSize="small" alignWithControl="true">
<Label>(default = user; max. 6 char.; except EVL-4 10 char.)</Label>
<Label>(default = user; max. 6 ASCII digits; except EVL-4 allows 10 digits)</Label>
</Field>


<Field id="code" type="textfield" defaultValue="1234" secure="true">
<Label>Disarm Code:</Label>
</Field>
<Field id="codeLabel" type="label" visibleBindingId="code" fontColor="darkgray" fontSize="small" alignWithControl="true">
<Label>This can be a password unique for Indigo Users, as long as it is programmed into the DSC panel.</Label>
<Label>This can be a 4-6 digit passcode unique for Indigo Users, as long as it is programmed into the DSC panel.</Label>
</Field>

<Field
Expand Down Expand Up @@ -274,10 +281,6 @@

<!-- Debug settings -->
<Field id="simpleSeparator2" type="separator"/>
<Field id="midLabel" type="label" fontColor="darkgray" fontSize="small" alignWithControl="true">
<Label>Set the level of information recorded to the Indigo log.</Label>
</Field>

<Field id="logLevel" type="menu" defaultValue="20">
<Label>Event Logging Level:</Label>
<List>
Expand All @@ -289,5 +292,9 @@
<Option value="50">Critical Errors Only</Option>
</List>
</Field>
<Field id="midLabel" type="label" fontColor="darkgray" fontSize="small" alignWithControl="true">
<Label>Set the level of information recorded to the Indigo log.</Label>
</Field>


</PluginConfig>
Loading

0 comments on commit b92a097

Please sign in to comment.