Fix http -> https where applyable. (#10573)
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
This commit is contained in:
committed by
GitHub
parent
8ba34392aa
commit
10f88c0934
@@ -2,7 +2,7 @@
|
||||
|
||||
This is an openHAB binding for Verisure Alarm System, by Securitas Direct.
|
||||
|
||||
This binding uses the rest API behind the Verisure My Pages:
|
||||
This binding uses the rest API behind the Verisure My Pages:
|
||||
|
||||
https://mypages.verisure.com/login.html.
|
||||
|
||||
@@ -15,7 +15,7 @@ This binding supports the following thing types:
|
||||
|
||||
- Bridge
|
||||
- Alarm
|
||||
- Smoke Detector (climate)
|
||||
- Smoke Detector (climate)
|
||||
- Water Detector (climate)
|
||||
- Siren (climate)
|
||||
- Night Control
|
||||
@@ -31,9 +31,9 @@ This binding supports the following thing types:
|
||||
|
||||
## Binding Configuration
|
||||
|
||||
You will have to configure the bridge with username and password, these must be the same credentials as used when logging into https://mypages.verisure.com.
|
||||
You will have to configure the bridge with username and password, these must be the same credentials as used when logging into https://mypages.verisure.com.
|
||||
|
||||
You must also configure your pin-code(s) to be able to lock/unlock the SmartLock(s) and arm/unarm the Alarm(s).
|
||||
You must also configure your pin-code(s) to be able to lock/unlock the SmartLock(s) and arm/unarm the Alarm(s).
|
||||
|
||||
**NOTE:** To be able to have full control over all SmartLock functionality, the user has to have Administrator rights.
|
||||
|
||||
@@ -51,16 +51,16 @@ To enable DEBUG logging for the binding, login to Karaf console and enter:
|
||||
|
||||
`openhab> log:set DEBUG org.openhab.binding.verisure`
|
||||
|
||||
## Supported Things and Channels
|
||||
## Supported Things and Channels
|
||||
|
||||
### Verisure Bridge
|
||||
### Verisure Bridge
|
||||
|
||||
#### Configuration Options
|
||||
|
||||
* `username` - The username used to connect to http://mypage.verisure.com
|
||||
* `username` - The username used to connect to https://mypages.verisure.com
|
||||
* The user has to have Administrator rights to have full SmartLock functionality
|
||||
|
||||
* `password` - The password used to connect to http://mypage.verisure.com
|
||||
* `password` - The password used to connect to https://mypages.verisure.com
|
||||
|
||||
* `refresh` - Specifies the refresh interval in seconds
|
||||
|
||||
@@ -122,9 +122,9 @@ The following channels are supported:
|
||||
| installationName | String | This channel reports the installation name. |
|
||||
| installationId | Number | This channel reports the installation ID. |
|
||||
| smartLockStatus | Switch | This channel is used to lock/unlock. |
|
||||
| autoRelock | Switch | This channel is used to configure auto-lock functionality. Only supported for users with Administrator rights. |
|
||||
| smartLockVolume | String | This channel is used to set the volume level. Available volume settings are "SILENCE", "LOW" and "HIGH". Only supported for users with Administrator rights.|
|
||||
| smartLockVoiceLevel | String | This channel is used to set the voice level. Available voice level settings are "ESSENTIAL" and "NORMAL". Only supported for users with Administrator rights.|
|
||||
| autoRelock | Switch | This channel is used to configure auto-lock functionality. Only supported for users with Administrator rights. |
|
||||
| smartLockVolume | String | This channel is used to set the volume level. Available volume settings are "SILENCE", "LOW" and "HIGH". Only supported for users with Administrator rights.|
|
||||
| smartLockVoiceLevel | String | This channel is used to set the voice level. Available voice level settings are "ESSENTIAL" and "NORMAL". Only supported for users with Administrator rights.|
|
||||
| smartLockTriggerChannel | trigger | This is a trigger channel that receives events. |
|
||||
|
||||
### Verisure SmartPlug
|
||||
@@ -138,8 +138,8 @@ The following channels are supported:
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-------------------------|-----------|-------------------------------------------------------------------|
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-------------------------|-----------|-------------------------------------------------------------------|
|
||||
| hazardous | Switch | This channel reports if the smart plug is configured as hazardous.|
|
||||
| location | String | This channel reports the location of the device. |
|
||||
| installationName | String | This channel reports the installation name. |
|
||||
@@ -157,10 +157,10 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------------------|-----------------------|-----------------------------------------------------------------------------|
|
||||
| temperature | Number:Temperature | This channel reports the current temperature. |
|
||||
| temperature | Number:Temperature | This channel reports the current temperature. |
|
||||
| humidity | Number | This channel reports the current humidity in percentage. |
|
||||
| humidityEnabled | Switch | This channel reports if the Climate is device capable of reporting humidity.|
|
||||
| timestamp | DateTime | This channel reports the last time this sensor was updated. |
|
||||
@@ -168,7 +168,7 @@ The following channels are supported:
|
||||
| installationName | String | This channel reports the installation name. |
|
||||
| installationId | Number | This channel reports the installation ID. |
|
||||
| smokeDetectorTriggerChannel | trigger | This is a trigger channel that receives events.|
|
||||
|
||||
|
||||
### Verisure Water Detector
|
||||
|
||||
#### Configuration Options
|
||||
@@ -181,8 +181,8 @@ The following channels are supported:
|
||||
The following channels are supported:
|
||||
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------------------|-----------------------|--------------------------------------------------------------|
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------------------|-----------------------|--------------------------------------------------------------|
|
||||
| temperature | Number:Temperature | This channel reports the current temperature. |
|
||||
| timestamp | DateTime | This channel reports the last time this sensor was updated. |
|
||||
| location | String | This channel reports the location of the device. |
|
||||
@@ -190,7 +190,7 @@ The following channels are supported:
|
||||
| installationId | Number | This channel reports the installation ID. |
|
||||
| waterDetectorTriggerChannel | trigger | This is a trigger channel that receives events. |
|
||||
|
||||
|
||||
|
||||
### Verisure Siren
|
||||
|
||||
#### Configuration Options
|
||||
@@ -201,9 +201,9 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------------------|------------------------------------------------------------|
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------------------|------------------------------------------------------------|
|
||||
| temperature | Number:Temperature | This channel reports the current temperature. |
|
||||
| timestamp | DateTime | This channel reports the last time this sensor was updated.|
|
||||
| location | String | This channel reports the location. |
|
||||
@@ -221,9 +221,9 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|----------------------------|-----------------------|------------------------------------------------------------|
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|----------------------------|-----------------------|------------------------------------------------------------|
|
||||
| temperature | Number:Temperature | This channel reports the current temperature. |
|
||||
| timestamp | DateTime | This channel reports the last time this sensor was updated.|
|
||||
| location | String | This channel reports the location. |
|
||||
@@ -241,9 +241,9 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|--------------------------|-----------|-----------------------------------------------------------------------------|
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|--------------------------|-----------|-----------------------------------------------------------------------------|
|
||||
| state | Contact | This channel reports the if the door/window is open or closed (OPEN/CLOSED).|
|
||||
| timestamp | DateTime | This channel reports the last time this sensor was updated. |
|
||||
| location | String | This channel reports the location of the device. |
|
||||
@@ -262,9 +262,9 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|--------------------|-----------|-------------------------------------------------------------------------|
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|--------------------|-----------|-------------------------------------------------------------------------|
|
||||
| userLocationStatus | String | This channel reports the user presence status (HOME/AWAY). |
|
||||
| timestamp | DateTime | This channel reports the last time the User Presence status was changed.|
|
||||
| userName | String | This channel reports the user's name. |
|
||||
@@ -283,9 +283,9 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------|-----------|--------------------------------------------------------------------------------|
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------|-----------|--------------------------------------------------------------------------------|
|
||||
| connected | String | This channel reports the broadband connection status (true means connected). |
|
||||
| timestamp | DateTime | This channel reports the last time the Broadband connection status was checked.|
|
||||
| installationName| String | This channel reports the installation name. |
|
||||
@@ -301,10 +301,10 @@ The following channels are supported:
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------------------|--------------------|-------------------------------------------------------------------------------------|
|
||||
| countLatestDetection | Number | This channel reports the number of mice counts the latest detection during last 24. |
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|-----------------------------|--------------------|-------------------------------------------------------------------------------------|
|
||||
| countLatestDetection | Number | This channel reports the number of mice counts the latest detection during last 24. |
|
||||
| countLast24Hours | Number | This channel reports the total number of mice counts the last 24h. |
|
||||
| durationLatestDetection | Number:Time | This channel reports the detection duration in min of latest detection. |
|
||||
| durationLast24Hours | Number:Time | This channel reports the total detection duration in min for the last 24 hours. |
|
||||
@@ -314,7 +314,7 @@ The following channels are supported:
|
||||
| location | String | This channel reports the location of the device. |
|
||||
| installationName | String | This channel reports the installation name. |
|
||||
| installationId | Number | This channel reports the installation ID. |
|
||||
| miceDetectionTriggerChannel | trigger | This is a trigger channel that receives events. |
|
||||
| miceDetectionTriggerChannel | trigger | This is a trigger channel that receives events. |
|
||||
|
||||
### Verisure Event Log
|
||||
|
||||
@@ -322,19 +322,19 @@ The following channels are supported:
|
||||
|
||||
* `deviceId` - Device Id
|
||||
* Since Event Log lacks a Verisure ID, the following naming convention is used for Event Log on site id 123456789: 'el123456789'. Installation ID can be found using DEBUG log settings.
|
||||
|
||||
|
||||
|
||||
#### Channels
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------|-------------------------------------------------------------------------|
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------|-------------------------------------------------------------------------|
|
||||
| lastEventLocation | String | This channel reports location for last event in event log. |
|
||||
| lastEventDeviceId | String | This channel reports device ID for last event in event log. |
|
||||
| lastEventDeviceType | String | This channel reports device type for last event in event log. |
|
||||
| lastEventType | String | This channel reports type for last event in event log. |
|
||||
| lastEventCategory | String | This channel reports category for last event in event log. |
|
||||
| lastEventCategory | String | This channel reports category for last event in event log. |
|
||||
| lastEventTime | DateTime | This channel reports time for last event in event log. |
|
||||
| lastEventUserName | String | This channel reports user name for last event in event log. |
|
||||
| eventLog | String | This channel reports the last 15 events from event log in a JSON array. |
|
||||
@@ -350,8 +350,8 @@ The following channels are supported:
|
||||
|
||||
The following channels are supported:
|
||||
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------|----------------------------------------------------------------------|
|
||||
| Channel Type ID | Item Type | Description |
|
||||
|---------------------|-----------|----------------------------------------------------------------------|
|
||||
| model | String | This channel reports gateway model. |
|
||||
| location | String | This channel reports gateway location. |
|
||||
| statusGSMOverUDP | String | This channel reports communication status for GSM over UDP. |
|
||||
@@ -368,8 +368,8 @@ The following channels are supported:
|
||||
To be able to get trigger events you need an active Event Log thing, you can either get it via auto-detection or create your own in a things-file.
|
||||
The following trigger events are defined per thing type:
|
||||
|
||||
| Event | Thing Type | Description |
|
||||
|-------------------|---------------|------------------------------------------------------------|
|
||||
| Event | Thing Type | Description |
|
||||
|-------------------|---------------|------------------------------------------------------------|
|
||||
| LOCK | SmartLock | SmartLock has been locked. |
|
||||
| UNLOCK | SmartLock | SmartLock has been locked. |
|
||||
| LOCK_FAILURE | SmartLock | SmartLock has failed to lock/unlock. |
|
||||
@@ -400,7 +400,7 @@ Bridge verisure:bridge:myverisure "Verisure Bridge" [username="x@y.com", passwor
|
||||
Thing alarm JannesAlarm "Verisure Alarm" [ deviceId="alarm123456789" ]
|
||||
Thing smartLock JannesSmartLock "Verisure Entrance Yale Doorman" [ deviceId="3C446NPO" ]
|
||||
Thing smartPlug JannesSmartPlug "Verisure SmartPlug" [ deviceId="3D7GMANV" ]
|
||||
Thing waterDetector JannesWaterDetector "Verisure Water Detector" [ deviceId="3WETQRH5" ]
|
||||
Thing waterDetector JannesWaterDetector "Verisure Water Detector" [ deviceId="3WETQRH5" ]
|
||||
Thing userPresence JannesUserPresence "Verisure User Presence" [ deviceId="uptestgmailcom123456789" ]
|
||||
Thing eventLog JannesEventLog "Verisure Event Log" [ deviceId="el123456789" ]
|
||||
Thing gateway JannesGateway "Verisure Gateway" [ deviceId="3AFG5673" ]
|
||||
@@ -424,7 +424,7 @@ DateTime AlarmLastUpdated "Verisure Alarm Last Updated [%1$tY-%1$tm
|
||||
String AlarmChangedByUser "Verisure Alarm Changed By User" {channel="verisure:alarm:myverisure:JannesAlarm:changedByUser"}
|
||||
|
||||
|
||||
// SmartPlugs
|
||||
// SmartPlugs
|
||||
Switch SmartPlugLamp "SmartPlug" <lock> [ "Switchable" ] {channel="verisure:smartPlug:myverisure:4ED5ZXYC:smartPlugStatus"}
|
||||
Switch SmartPlugGlavaRouter "SmartPlug Glava Router" <lock> [ "Switchable" ] {channel="verisure:smartPlug:myverisure:JannesSmartPlug:smartPlugStatus"}
|
||||
|
||||
@@ -455,7 +455,7 @@ String VerisureGatewayModel "Gateway Model" (gVer
|
||||
String VerisureGatewayLocation "Gateway Location" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:location"}
|
||||
String VerisureGWStatusGSMOverUDP "Gateway Status GSMOverUDP" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:statusGSMOverUDP"}
|
||||
DateTime VerisureGWTestTimeGSMOverUDP "Gateway Test Time GSMOverUDP" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:testTimeGSMOverUDP"}
|
||||
String VerisureGWStatusGSMOverSMS "Gateway Status GSMOverSMS" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:statusGSMOverSMS"}
|
||||
String VerisureGWStatusGSMOverSMS "Gateway Status GSMOverSMS" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:statusGSMOverSMS"}
|
||||
DateTime VerisureGWTestTimeGSMOverSMS "Gateway Test Time GSMOverSMS" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:testTimeGSMOverSMS"}
|
||||
String VerisureGWStatusGPRSOverUDP "Gateway Status GPRSOverUDP" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:statusGPRSOverUDP"}
|
||||
DateTime VerisureGWTestTimeGPRSOverUDP "Gateway Test Time GPRSOverUDP" (gVerisureGateway) {channel="verisure:gateway:myverisure:JannesGateway:testTimeGPRSOverUDP"}
|
||||
@@ -511,8 +511,8 @@ String MouseDetectionLocation "Mouse Detection Location" (gVerisu
|
||||
Switch item=SmartPlugLamp label="Verisure SmartPlug Lamp" icon="smartheater.png"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Frame label="User Presence" {
|
||||
Text label="User Presence" icon="attic" {
|
||||
Frame label="User Presence Champinjonvägen" {
|
||||
@@ -530,19 +530,19 @@ String MouseDetectionLocation "Mouse Detection Location" (gVerisu
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Frame label="Mice Detection" {
|
||||
Group item=gVerisureMiceDetection label="Verisure Mice Detection"
|
||||
}
|
||||
|
||||
|
||||
Frame label="Event Log" {
|
||||
Group item=gVerisureEventLog label="Verisure Event Log"
|
||||
}
|
||||
|
||||
|
||||
Frame label="Gateway" {
|
||||
Group item=gVerisureGateway label="Verisure Gateway"
|
||||
}
|
||||
|
||||
|
||||
````
|
||||
|
||||
### Rules
|
||||
@@ -582,4 +582,3 @@ end
|
||||
|
||||
|
||||
````
|
||||
|
||||
|
||||
Reference in New Issue
Block a user