From e0cab7db58baf856736893d084e0d2a1cf0c9a3f Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Wed, 31 Oct 2018 11:00:25 +0300 Subject: configs moving --- configs/kvmd-tc358743.service | 13 ----- configs/kvmd.service | 14 ------ configs/kvmd/tc358743-edid.hex | 1 + configs/kvmd/v1-hdmi.conf | 89 ++++++++++++++++++++++++++++++++++ configs/kvmd/v1-hdmi.yaml | 87 --------------------------------- configs/kvmd/v1-vga.conf | 91 +++++++++++++++++++++++++++++++++++ configs/kvmd/v1-vga.yaml | 89 ---------------------------------- configs/systemd/kvmd-tc358743.service | 13 +++++ configs/systemd/kvmd.service | 14 ++++++ configs/tc358743/edid.hex | 1 - 10 files changed, 208 insertions(+), 204 deletions(-) delete mode 100644 configs/kvmd-tc358743.service delete mode 100644 configs/kvmd.service create mode 100644 configs/kvmd/tc358743-edid.hex create mode 100644 configs/kvmd/v1-hdmi.conf delete mode 100644 configs/kvmd/v1-hdmi.yaml create mode 100644 configs/kvmd/v1-vga.conf delete mode 100644 configs/kvmd/v1-vga.yaml create mode 100644 configs/systemd/kvmd-tc358743.service create mode 100644 configs/systemd/kvmd.service delete mode 100644 configs/tc358743/edid.hex (limited to 'configs') diff --git a/configs/kvmd-tc358743.service b/configs/kvmd-tc358743.service deleted file mode 100644 index e23e715f..00000000 --- a/configs/kvmd-tc358743.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Loads EDID data to TC358743 -After=systemd-modules-load.service -Before=kvmd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-streamer --set-edid=file=/usr/share/kvmd/configs/tc358743/edid.hex --fix-edid-checksums -ExecStop=/bin/true -RemainAfterExit=true - -[Install] -WantedBy=multi-user.target diff --git a/configs/kvmd.service b/configs/kvmd.service deleted file mode 100644 index 185a4eb5..00000000 --- a/configs/kvmd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=The main Pi-KVM daemon -After=network.target network-online.target nss-lookup.target - -[Service] -Type=simple -Restart=always -RestartSec=3 - -ExecStart=/usr/bin/kvmd --config /etc/kvmd.yaml -ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd.yaml - -[Install] -WantedBy=multi-user.target diff --git a/configs/kvmd/tc358743-edid.hex b/configs/kvmd/tc358743-edid.hex new file mode 100644 index 00000000..c92292f1 --- /dev/null +++ b/configs/kvmd/tc358743-edid.hex @@ -0,0 +1 @@ +00FFFFFFFFFFFF0052628888008888881C150103800000780AEE91A3544C99260F50543FCD0001000101010101010101010101010101011D007251D01E206E285500C48E2100001E8C0AD08A20E02D10103E9600138E2100001E000000FC00546F73686962612D4832430A20000000FD003B3D0F2E0F1E0A202020202020014402031D034E041303021211012021A23C3D3E1F66030C00300080E2007F8C0AD08A20E02D10103E9600C48E210000188C0AD08A20E02D10103E9600138E210000189729A0D051842230509816009A011100001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000006E \ No newline at end of file diff --git a/configs/kvmd/v1-hdmi.conf b/configs/kvmd/v1-hdmi.conf new file mode 100644 index 00000000..5d184764 --- /dev/null +++ b/configs/kvmd/v1-hdmi.conf @@ -0,0 +1,89 @@ +kvmd: + server: + host: 127.0.0.1 + port: 8081 + heartbeat: 3.0 + + log: + services: + - kvmd.service + - kvmd-tc358743.service + + hid: + pinout: + reset: 4 + + device: /dev/ttyAMA0 + speed: 115200 + reset_delay: 0.1 + + atx: + pinout: + power_led: 24 + hdd_led: 22 + power_switch: 23 + reset_switch: 27 + + click_delay: 0.1 + long_click_delay: 5.5 + + state_poll: 0.1 + + msd: + pinout: + target: 12 + reset: 13 + + device: "/dev/kvmd-msd" + init_delay: 2.0 + reset_delay: 1.0 + write_meta: true + chunk_size: 65536 + + streamer: + pinout: + cap: -1 + conv: -1 + + sync_delay: 0.0 + init_delay: 1.0 + init_restart_after: 0.0 + shutdown_delay: 10.0 + + quality: 20 + + cmd: + - "/usr/bin/ustreamer" + - "--device=/dev/kvmd-streamer" + - "--device-persistent" + - "--format=uyvy" + - "--encoder=omx" + - "--quality={quality}" + - "--dv-timings" + - "--host=127.0.0.1" + - "--port=8082" + - "--drop-same-frames=30" + +logging: + version: 1 + disable_existing_loggers: false + + formatters: + console: + (): logging.Formatter + style: "{" + format: "{name:20.20} {levelname:>7} --- {message}" + + handlers: + console: + level: DEBUG + class: logging.StreamHandler + stream: ext://sys.stdout + formatter: console + + root: + level: INFO + handlers: + - console + +# vim: syntax=yaml diff --git a/configs/kvmd/v1-hdmi.yaml b/configs/kvmd/v1-hdmi.yaml deleted file mode 100644 index abb73101..00000000 --- a/configs/kvmd/v1-hdmi.yaml +++ /dev/null @@ -1,87 +0,0 @@ -kvmd: - server: - host: 127.0.0.1 - port: 8081 - heartbeat: 3.0 - - log: - services: - - kvmd.service - - kvmd-tc358743.service - - hid: - pinout: - reset: 4 - - device: /dev/ttyAMA0 - speed: 115200 - reset_delay: 0.1 - - atx: - pinout: - power_led: 24 - hdd_led: 22 - power_switch: 23 - reset_switch: 27 - - click_delay: 0.1 - long_click_delay: 5.5 - - state_poll: 0.1 - - msd: - pinout: - target: 12 - reset: 13 - - device: "/dev/kvmd-msd" - init_delay: 2.0 - reset_delay: 1.0 - write_meta: true - chunk_size: 65536 - - streamer: - pinout: - cap: -1 - conv: -1 - - sync_delay: 0.0 - init_delay: 1.0 - init_restart_after: 0.0 - shutdown_delay: 10.0 - - quality: 20 - - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-streamer" - - "--device-persistent" - - "--format=uyvy" - - "--encoder=omx" - - "--quality={quality}" - - "--dv-timings" - - "--host=127.0.0.1" - - "--port=8082" - - "--drop-same-frames=30" - -logging: - version: 1 - disable_existing_loggers: false - - formatters: - console: - (): logging.Formatter - style: "{" - format: "{name:20.20} {levelname:>7} --- {message}" - - handlers: - console: - level: DEBUG - class: logging.StreamHandler - stream: ext://sys.stdout - formatter: console - - root: - level: INFO - handlers: - - console diff --git a/configs/kvmd/v1-vga.conf b/configs/kvmd/v1-vga.conf new file mode 100644 index 00000000..221852e0 --- /dev/null +++ b/configs/kvmd/v1-vga.conf @@ -0,0 +1,91 @@ +kvmd: + server: + host: 127.0.0.1 + port: 8081 + heartbeat: 3.0 + + log: + services: + - kvmd.service + - kvmd-tc358743.service + + hid: + pinout: + reset: 4 + + device: /dev/ttyAMA0 + speed: 115200 + reset_delay: 0.1 + + atx: + pinout: + power_led: 24 + hdd_led: 22 + power_switch: 23 + reset_switch: 27 + + click_delay: 0.1 + long_click_delay: 5.5 + + state_poll: 0.1 + + msd: + pinout: + target: 12 + reset: 13 + + device: "/dev/kvmd-msd" + init_delay: 2.0 + reset_delay: 1.0 + write_meta: true + chunk_size: 65536 + + streamer: + pinout: + cap: 17 + conv: 18 + + sync_delay: 1.0 + init_delay: 1.0 + init_restart_after: 1.0 + shutdown_delay: 10.0 + + quality: 80 + + cmd: + - "/usr/bin/ustreamer" + - "--device=/dev/kvmd-streamer" + - "--tv-standard=pal" + - "--format=yuyv" + - "--encoder=cpu" + - "--quality={quality}" + - "--width=720" + - "--height=576" + - "--fake-width=800" + - "--fake-height=600" + - "--host=127.0.0.1" + - "--port=8082" + +logging: + version: 1 + disable_existing_loggers: false + + formatters: + console: + (): logging.Formatter + style: "{" + format: "{name:20.20} {levelname:>7} --- {message}" + + handlers: + console: + level: DEBUG + class: logging.StreamHandler + stream: ext://sys.stdout + formatter: console + + root: + level: INFO + handlers: + - console + +# vim: syntax=yaml diff --git a/configs/kvmd/v1-vga.yaml b/configs/kvmd/v1-vga.yaml deleted file mode 100644 index 055c8363..00000000 --- a/configs/kvmd/v1-vga.yaml +++ /dev/null @@ -1,89 +0,0 @@ -kvmd: - server: - host: 127.0.0.1 - port: 8081 - heartbeat: 3.0 - - log: - services: - - kvmd.service - - kvmd-tc358743.service - - hid: - pinout: - reset: 4 - - device: /dev/ttyAMA0 - speed: 115200 - reset_delay: 0.1 - - atx: - pinout: - power_led: 24 - hdd_led: 22 - power_switch: 23 - reset_switch: 27 - - click_delay: 0.1 - long_click_delay: 5.5 - - state_poll: 0.1 - - msd: - pinout: - target: 12 - reset: 13 - - device: "/dev/kvmd-msd" - init_delay: 2.0 - reset_delay: 1.0 - write_meta: true - chunk_size: 65536 - - streamer: - pinout: - cap: 17 - conv: 18 - - sync_delay: 1.0 - init_delay: 1.0 - init_restart_after: 1.0 - shutdown_delay: 10.0 - - quality: 80 - - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-streamer" - - "--tv-standard=pal" - - "--format=yuyv" - - "--encoder=cpu" - - "--quality={quality}" - - "--width=720" - - "--height=576" - - "--fake-width=800" - - "--fake-height=600" - - "--host=127.0.0.1" - - "--port=8082" - -logging: - version: 1 - disable_existing_loggers: false - - formatters: - console: - (): logging.Formatter - style: "{" - format: "{name:20.20} {levelname:>7} --- {message}" - - handlers: - console: - level: DEBUG - class: logging.StreamHandler - stream: ext://sys.stdout - formatter: console - - root: - level: INFO - handlers: - - console diff --git a/configs/systemd/kvmd-tc358743.service b/configs/systemd/kvmd-tc358743.service new file mode 100644 index 00000000..d1b89862 --- /dev/null +++ b/configs/systemd/kvmd-tc358743.service @@ -0,0 +1,13 @@ +[Unit] +Description=Loads EDID data to TC358743 +After=systemd-modules-load.service +Before=kvmd.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-streamer --set-edid=file=/etc/kvmd/tc358743-edid.hex --fix-edid-checksums +ExecStop=/bin/true +RemainAfterExit=true + +[Install] +WantedBy=multi-user.target diff --git a/configs/systemd/kvmd.service b/configs/systemd/kvmd.service new file mode 100644 index 00000000..765508fe --- /dev/null +++ b/configs/systemd/kvmd.service @@ -0,0 +1,14 @@ +[Unit] +Description=The main Pi-KVM daemon +After=network.target network-online.target nss-lookup.target + +[Service] +Type=simple +Restart=always +RestartSec=3 + +ExecStart=/usr/bin/kvmd --config /etc/kvmd/kvmd.conf +ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd/kvmd.conf + +[Install] +WantedBy=multi-user.target diff --git a/configs/tc358743/edid.hex b/configs/tc358743/edid.hex deleted file mode 100644 index c92292f1..00000000 --- a/configs/tc358743/edid.hex +++ /dev/null @@ -1 +0,0 @@ -00FFFFFFFFFFFF0052628888008888881C150103800000780AEE91A3544C99260F50543FCD0001000101010101010101010101010101011D007251D01E206E285500C48E2100001E8C0AD08A20E02D10103E9600138E2100001E000000FC00546F73686962612D4832430A20000000FD003B3D0F2E0F1E0A202020202020014402031D034E041303021211012021A23C3D3E1F66030C00300080E2007F8C0AD08A20E02D10103E9600C48E210000188C0AD08A20E02D10103E9600138E210000189729A0D051842230509816009A011100001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000006E \ No newline at end of file -- cgit v1.2.3