diff --git a/Makefile b/Makefile index 93ea9b947c863537259159cc6904e34932059ed3..4b4432dc4c31e1bc0ad608f0614c1215e0f6cdc0 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,12 @@ SSH_HOST ?= remarkable all: tipa.debug screenshot.release run: server_jonny.install - #ssh $(SSH_HOST) 'kill $(/bin/pidof server_jonny.release)' + ssh $(SSH_HOST) 'kill $$(/bin/pidof server_jonny.release)' || true + scp -r frontend $(SSH_HOST): + ssh $(SSH_HOST) "RUST_MIN_STACK=10000000 ./server_jonny.release" + +justrun: + ssh $(SSH_HOST) 'kill $$(/bin/pidof server_jonny.release)' || true scp -r frontend $(SSH_HOST): ssh $(SSH_HOST) "RUST_MIN_STACK=10000000 ./server_jonny.release" diff --git a/frontend/index.html b/frontend/index.html index 05413f3d0002579a3d1a1d269b04438dc6d511fa..78319ee040d74dc8351c426daa00540723176f87 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,7 +5,7 @@ <meta charset="utf-8"> </head> <body> - <div id='main'> + <div id='main' style="width: 1874px; height: 1406px"> <div id='bg_imgs' style="width: auto; border: 1px solid #aaa; position: absolute;"> <img src="/bg.png" id="bg"></img> </div> diff --git a/frontend/index.js b/frontend/index.js index d430432c3b5ce4dd1487585d251a74d9947adb3a..6a76f0aadf3433bcc6028c149feda4b4c030f3c7 100644 --- a/frontend/index.js +++ b/frontend/index.js @@ -135,7 +135,7 @@ function logKey(e) { if (e.keyCode == 13) { // enter for rotate if (orientation == 'landscape') { main.style.transform = 'rotate(270deg)'; - main.style.transformOrigin = '1278 600'; + main.style.transformOrigin = '1278px 600px'; orientation = 'portrait'; } else { main.style.transform = 'rotate(0deg)'; diff --git a/src/screenshot.rs b/src/screenshot.rs index d1613d3a47b71ac216747e92e9d46c0a6ec378e7..8ebe80eaf4705794bff8346828fdfd79ace48ac4 100644 --- a/src/screenshot.rs +++ b/src/screenshot.rs @@ -130,7 +130,7 @@ pub struct ScreenShot { // TODO: sollen das Attribute vom ScreenShotIter werden? /// If that many pixels changed, the ScreenShotIter yields a complete new picture instead of a diff. -const KEYFRAME_THRESHOLD: usize = 45000; //45000 +const KEYFRAME_THRESHOLD: usize = 000; //45000 pub struct ScreenShotIter { /// framebuffer (/dev/fb0 or /dev/$(pidof xochitl)/mem) diff --git a/src/server_jonny.rs b/src/server_jonny.rs index 4b200242e25c7eae47698cca84c2cbacedb778bf..618f1e6d0e089de7b99d3f68f141500e29cf1311 100644 --- a/src/server_jonny.rs +++ b/src/server_jonny.rs @@ -46,7 +46,7 @@ async fn background_shooter(current_screenshot: Arc<RwLock<Vec<u8>>>, push_message(&Message::text(bg_info.to_string()), &users).await; push_message(&Message::binary(screenshot.png), &users).await; } - tokio::time::sleep(Duration::from_millis(1500)).await; + tokio::time::sleep(Duration::from_millis(500)).await; } } @@ -141,6 +141,6 @@ async fn main() { let page = warp::get().and(warp::fs::dir("frontend/")); let routes = bg.or(bg_ws).or(inp_ws).or(page); - warp::serve(routes).run((std::net::Ipv6Addr::UNSPECIFIED, 3030)).await; + warp::serve(routes).run((std::net::Ipv6Addr::UNSPECIFIED, 7221)).await; }