Skip to content

Commit

Permalink
cameras: move autoconfiguration button so its less accidentally click…
Browse files Browse the repository at this point in the history
…able
  • Loading branch information
koush committed Sep 3, 2024
1 parent 0d4cf34 commit fbe3e83
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 11 deletions.
4 changes: 2 additions & 2 deletions plugins/amcrest/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/amcrest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scrypted/amcrest",
"version": "0.0.161",
"version": "0.0.162",
"description": "Amcrest Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",
Expand Down
7 changes: 6 additions & 1 deletion plugins/amcrest/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { OnvifIntercom } from "../../onvif/src/onvif-intercom";
import { createRtspMediaStreamOptions, RtspProvider, RtspSmartCamera, UrlMediaStreamOptions } from "../../rtsp/src/rtsp";
import { AmcrestCameraClient, AmcrestEvent, AmcrestEventData } from "./amcrest-api";
import { amcrestAutoConfigureSettings, autoconfigureSettings } from "./amcrest-configure";
import { group } from "console";

const { mediaManager } = sdk;

Expand Down Expand Up @@ -336,10 +337,14 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,

const ac = {
...automaticallyConfigureSettings,
subgroup: 'Advanced',
};
ac.type = 'button';
ret.push(ac);
ret.push({ ...amcrestAutoConfigureSettings });
ret.push({
...amcrestAutoConfigureSettings,
subgroup: 'Advanced',
});

return ret;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/hikvision/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/hikvision/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scrypted/hikvision",
"version": "0.0.159",
"version": "0.0.160",
"description": "Hikvision Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",
Expand Down
6 changes: 5 additions & 1 deletion plugins/hikvision/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,14 @@ export class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom

const ac = {
...automaticallyConfigureSettings,
subgroup: 'Advanced',
};
ac.type = 'button';
ret.push(ac);
ret.push({ ...hikvisionAutoConfigureSettings });
ret.push({
...hikvisionAutoConfigureSettings,
subgroup: 'Advanced',
});

return ret;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/onvif/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/onvif/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scrypted/onvif",
"version": "0.1.22",
"version": "0.1.23",
"description": "ONVIF Camera Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",
Expand Down
5 changes: 5 additions & 0 deletions plugins/onvif/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,14 @@ class OnvifCamera extends RtspSmartCamera implements ObjectDetector, Intercom, V

const ac = {
...automaticallyConfigureSettings,
subgroup: 'Advanced',
};
ac.type = 'button';
ret.push(ac);
ret.push({
...onvifAutoConfigureSettings,
subgroup: 'Advanced',
});

return ret;
}
Expand Down

0 comments on commit fbe3e83

Please sign in to comment.