v2 beta

3 files changed, 89 insertions, 11 deletions

diff --git a/kvmd/configs/kvmd/v1.yaml b/kvmd/configs/kvmd/v1.yaml
index 712891a0..bd763c81 100644
--- a/kvmd/configs/kvmd/v1.yaml
+++ b/kvmd/configs/kvmd/v1.yaml
@@ -36,15 +36,21 @@ kvmd:
         init_restart_after: 1.0
         shutdown_delay: 10.0
 
-        resolutions:
-            - 800x600 - 720x576
+        quality: 80
 
         cmd:
-            - "/usr/bin/mjpg_streamer"
-            - "-i"
-            - "input_uvc.so -d /dev/kvmd-streamer -e 2 -t pal -y -n -r {resolution}"
-            - "-o"
-            - "output_http.so -l localhost -p 8082"
+            - "/usr/bin/ustreamer"
+            - "--device=/dev/kvmd-streamer"
+            - "--tv-standard=pal"
+            - "--format=yuyv"
+            - "--encoder=omx"
+            - "--jpeg-quality={quality}"
+            - "--width=720"
+            - "--height=576"
+            - "--fake-width=800"
+            - "--fake-height=600"
+            - "--host=localhost"
+            - "--port=8082"
 
 logging:
     version: 1
diff --git a/kvmd/configs/kvmd/v2.yaml b/kvmd/configs/kvmd/v2.yaml
new file mode 100644
index 00000000..09c4eb33
--- /dev/null
+++ b/kvmd/configs/kvmd/v2.yaml
@@ -0,0 +1,72 @@
+kvmd:
+    server:
+        host: localhost
+        port: 8081
+        heartbeat: 3.0
+
+    hid:
+        device: /dev/ttyAMA0
+        speed: 115200
+
+    atx:
+        pinout:
+            power_led: 16
+            hdd_led: 12
+            power_switch: 26
+            reset_switch: 20
+
+        click_delay: 0.1
+        long_click_delay: 5.5
+
+        state_poll: 0.1
+
+    msd:
+        device: "/dev/kvmd-msd"
+        init_delay: 2.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: 80
+
+        cmd:
+            - "/usr/bin/ustreamer"
+            - "--device=/dev/kvmd-streamer"
+            - "--format=uyvy"
+            - "--encoder=omx"
+            - "--jpeg-quality={quality}"
+            - "--dv-timings"
+            - "--host=localhost"
+            - "--port=8082"
+
+logging:
+    version: 1
+    disable_existing_loggers: false
+
+    formatters:
+        console:
+            (): logging.Formatter
+            style: "{"
+            datefmt: "%H:%M:%S"
+            format: "[{asctime}] {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/kvmd/configs/nginx/nginx.conf b/kvmd/configs/nginx/nginx.conf
index e0744769..f0d6965b 100644
--- a/kvmd/configs/nginx/nginx.conf
+++ b/kvmd/configs/nginx/nginx.conf
@@ -31,7 +31,7 @@ http {
 		server localhost:8081 fail_timeout=0s max_fails=0;
 	}
 
-	upstream mjpg_streamer {
+	upstream ustreamer {
 		server localhost:8082 fail_timeout=0s max_fails=0;
 	}
 
@@ -112,9 +112,9 @@ http {
 			include /etc/nginx/proxy-params.conf;
 		}
 
-		location ~ ^/streamer/(snapshot|stream)(?:/(.*))?$ {
-			rewrite /streamer/?(.*)(?:/(.*))?$ /?action=$1 break;
-			proxy_pass http://mjpg_streamer;
+		location /streamer {
+			rewrite /streamer/?(.*) /$1 break;
+			proxy_pass http://ustreamer;
 			include /etc/nginx/proxy-params.conf;
 			proxy_buffering off;
 			proxy_ignore_headers X-Accel-Buffering;