gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(motion): living

Browse source
This commit is contained in:
arcnmx 2024-09-15 13:00:12 -07:00
parent 56b81f3d34
commit 44ab4225e5
6 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/access/kitchencam.nix
View file

@ -51,7 +51,7 @@ in {
}; };
virtualHosts = let virtualHosts = let
printerCams = [2]; printerCams = [2];
kitchenCams = [1 3]; kitchenCams = [1 3 4];
mkSubFilter = port: path: '' mkSubFilter = port: path: ''
sub_filter '${port.protocol}://$host:${toString port.port}/' '${path}'; sub_filter '${port.protocol}://$host:${toString port.port}/' '${path}';
''; '';

5
nixos/cameras/kitchen.nix
View file

@ -22,7 +22,7 @@
in { in {
services.motion.cameras.kitchencam.settings = mapDefaults { services.motion.cameras.kitchencam.settings = mapDefaults {
video_device = "/dev/kitchencam"; video_device = "/dev/kitchencam";
video_params = "auto_brightness=2,palette=${toString params.${format}.palette}"; video_params = "auto_brightness=2,power_line_frequency=2,palette=${toString params.${format}.palette}";
inherit (params.${format}) width height; inherit (params.${format}) width height;
framerate = 2; framerate = 2;
camera_id = 1; camera_id = 1;
@ -32,10 +32,9 @@ in {
inherit (lib.strings) concatStringsSep; inherit (lib.strings) concatStringsSep;
rules = [ rules = [
''SUBSYSTEM=="video4linux"'' ''SUBSYSTEM=="video4linux"''
''ACTION=="add"''
''ATTR{index}=="0"'' ''ATTR{index}=="0"''
''ATTRS{idProduct}=="2a25"''
''ATTRS{idVendor}=="1224"'' ''ATTRS{idVendor}=="1224"''
''ATTRS{idProduct}=="2a25"''
''SYMLINK+="kitchencam"'' ''SYMLINK+="kitchencam"''
''OWNER="${motion.user}"'' ''OWNER="${motion.user}"''
''TAG+="systemd"'' ''TAG+="systemd"''

49
nixos/cameras/living.nix Normal file
View file

@ -0,0 +1,49 @@
{
config,
gensokyo-zone,
lib,
...
}: let
inherit (gensokyo-zone.lib) mapDefaults;
inherit (config.services) motion;
format = "mjpeg"; # or "yuyv"
params = {
mjpeg = {
palette = 8;
width = 1280;
height = 720;
};
yuyv = {
palette = 15;
width = 640;
height = 480;
};
};
in {
services.motion.cameras.livingcam.settings = mapDefaults {
video_device = "/dev/livingcam";
video_params = "auto_brightness=2,brightness=72,power_line_frequency=2,palette=${toString params.${format}.palette}";
inherit (params.${format}) width height;
#framerate = 30;
framerate = 20;
camera_id = 4;
text_left = "";
text_right = "";
stream_quality = 85;
};
services.udev.extraRules = let
inherit (lib.strings) concatStringsSep;
rules = [
''SUBSYSTEM=="video4linux"''
''ATTR{index}=="0"''
''ATTRS{idVendor}=="1d3f"''
''ATTRS{idProduct}=="1120"''
''SYMLINK+="livingcam"''
''OWNER="${motion.user}"''
''TAG+="systemd"''
''ENV{SYSTEMD_WANTS}="motion.service"''
];
rulesLine = concatStringsSep ", " rules;
in
rulesLine;
}

5
nixos/cameras/printer.nix
View file

@ -9,7 +9,7 @@
in { in {
services.motion.cameras.printercam.settings = mapDefaults { services.motion.cameras.printercam.settings = mapDefaults {
video_device = "/dev/printercam"; video_device = "/dev/printercam";
video_params = "auto_brightness=1,palette=8"; # MJPG=8, YUYV=15 video_params = "auto_brightness=0,sharpness=5,palette=8"; # MJPG=8, YUYV=15
width = 1920; width = 1920;
height = 1080; height = 1080;
framerate = 4; framerate = 4;
@ -21,10 +21,9 @@ in {
inherit (lib.strings) concatStringsSep; inherit (lib.strings) concatStringsSep;
rules = [ rules = [
''SUBSYSTEM=="video4linux"'' ''SUBSYSTEM=="video4linux"''
''ACTION=="add"''
''ATTR{index}=="0"'' ''ATTR{index}=="0"''
''ATTRS{idProduct}=="6366"''
''ATTRS{idVendor}=="0c45"'' ''ATTRS{idVendor}=="0c45"''
''ATTRS{idProduct}=="6366"''
''SYMLINK+="printercam"'' ''SYMLINK+="printercam"''
''OWNER="${motion.user}"'' ''OWNER="${motion.user}"''
''TAG+="systemd"'' ''TAG+="systemd"''

1
systems/logistics/nixos.nix
View file

@ -16,6 +16,7 @@ in {
nixos.barcodebuddy-scanner nixos.barcodebuddy-scanner
nixos.motion nixos.motion
nixos.cameras.kitchen nixos.cameras.kitchen
nixos.cameras.living
nixos.cameras.logistics-webcam nixos.cameras.logistics-webcam
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

10
systems/sakuya/nixos.nix
View file

@ -16,6 +16,16 @@
nixos.motion nixos.motion
nixos.cameras.printer nixos.cameras.printer
]; ];
services.motion.cameras.printercam.settings = {
# TODO: try to limit CPU usage for now...
width = 1280;
height = 720;
framerate = 2;
text_right = "";
stream_quality = 60;
};
boot.loader = { boot.loader = {
grub.enable = false; grub.enable = false;
generic-extlinux-compatible.enable = true; generic-extlinux-compatible.enable = true;