michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-06-12 21:40:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:koush/scrypted

Browse Source
This commit is contained in:
Koushik Dutta
2024-07-04 16:53:14 -07:00
parent 460441abd2 f769c1fbec
commit 68668c1b91
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/unifi-protect vendored

Submodule external/unifi-protect updated: bf6fdbdc65...14f895045e

4
plugins/reolink/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/reolink",
"version": "0.0.79",
"version": "0.0.81",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/reolink",
"version": "0.0.79",
"version": "0.0.81",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/reolink/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/reolink",
"version": "0.0.79",
"version": "0.0.81",
"description": "Reolink Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

7
plugins/reolink/src/main.ts
View File

@@ -246,6 +246,10 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
return;
const info = this.info || {};
info.ip = ip;
info.serialNumber = this.storageSettings.values.deviceInfo?.serial;
info.firmware = this.storageSettings.values.deviceInfo?.firmVer;
info.version = this.storageSettings.values.deviceInfo?.hardVer;
info.model = this.storageSettings.values.deviceInfo?.model;
info.manufacturer = 'Reolink';
info.managementUrl = `http://${ip}`;
this.info = info;
@@ -632,8 +636,7 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
name: 'Reolink Siren',
nativeId: sirenNativeId,
info: {
manufacturer: 'Reolink',
serialNumber: this.nativeId,
...this.info,
},
interfaces: [
ScryptedInterface.OnOff

4
plugins/unifi-protect/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/unifi-protect",
"version": "0.0.153",
"version": "0.0.154",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/unifi-protect",
"version": "0.0.153",
"version": "0.0.154",
"license": "Apache",
"dependencies": {
"@koush/unifi-protect": "file:../../external/unifi-protect",

2
plugins/unifi-protect/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/unifi-protect",
"version": "0.0.153",
"version": "0.0.154",
"description": "Unifi Protect Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

4
plugins/unifi-protect/src/main.ts
View File

@@ -353,6 +353,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
model: camera.type,
firmware: camera.firmwareVersion,
version: camera.hardwareRevision,
ip: camera.host,
serialNumber: camera.id,
mac: camera.mac,
managementUrl,
@@ -399,6 +400,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
info: {
manufacturer: 'Ubiquiti',
model: sensor.type,
ip: sensor.host,
firmware: sensor.firmwareVersion,
version: sensor.hardwareRevision,
serialNumber: sensor.id,
@@ -426,6 +428,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
info: {
manufacturer: 'Ubiquiti',
model: light.type,
ip: light.host,
firmware: light.firmwareVersion,
version: light.hardwareRevision,
serialNumber: light.id,
@@ -450,6 +453,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
info: {
manufacturer: 'Ubiquiti',
model: lock.type,
ip: lock.host,
firmware: lock.firmwareVersion,
version: lock.hardwareRevision.toString(),
serialNumber: lock.id,