some renaming + fix spedy loop in server
44
Cargo.lock
generated
@@ -152,6 +152,16 @@ version = "1.0.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
|
||||
|
||||
[[package]]
|
||||
name = "app"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
"lib",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
version = "0.3.7"
|
||||
@@ -880,28 +890,6 @@ version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
|
||||
|
||||
[[package]]
|
||||
name = "deckapp"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
"lib",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deckui"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
"lib",
|
||||
"log",
|
||||
"slint",
|
||||
"slint-build",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derivative"
|
||||
version = "2.2.0"
|
||||
@@ -2704,6 +2692,18 @@ version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
|
||||
|
||||
[[package]]
|
||||
name = "remote"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
"lib",
|
||||
"log",
|
||||
"slint",
|
||||
"slint-build",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "resvg"
|
||||
version = "0.34.1"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[workspace]
|
||||
members = [
|
||||
'deckui',
|
||||
'deckapp',
|
||||
'remote',
|
||||
'app',
|
||||
'lib'
|
||||
]
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "deckapp"
|
||||
name = "app"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
@@ -13,7 +13,7 @@ fn main() {
|
||||
let mut i = 0;
|
||||
loop {
|
||||
i += 1;
|
||||
if i == 50 {
|
||||
if i == 35 {
|
||||
i = 0;
|
||||
sender_s
|
||||
.send(ServerMessage::NowPlaying(get_np().unwrap()))
|
||||
@@ -1,2 +0,0 @@
|
||||
cross build --release -p deckui --target=aarch64-unknown-linux-gnu && scp -i ~/.ssh/onekey ./target/aarch64-unknown-linux-gnu/release/deckui rockpro64:/home/jika/deckui2 && echo "Uploaded"
|
||||
|
||||
@@ -90,6 +90,7 @@ pub fn start_server() -> Result<(Sender<ServerMessage>, Receiver<ClientMessage>)
|
||||
|
||||
thread::spawn(move || {
|
||||
for stream_result in server.incoming() {
|
||||
thread::sleep(Duration::from_millis(500));
|
||||
match stream_result {
|
||||
Ok(stream) => {
|
||||
let reciever_s = reciever_s.clone();
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
[package]
|
||||
name = "deckui"
|
||||
name = "remote"
|
||||
version = "0.1.0"
|
||||
build = "build.rs"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[package.metadata.cross.build]
|
||||
default-target = "aarch64-unknown-linux-gnu"
|
||||
|
||||
[[bin]]
|
||||
path = "src/main.rs"
|
||||
name = "deckui"
|
||||
name = "remote"
|
||||
|
||||
[dependencies]
|
||||
lib = {path = "../lib"}
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
@@ -12,7 +12,7 @@ fn main() -> Result<(), slint::PlatformError> {
|
||||
|
||||
let mut retries = 1;
|
||||
let (sender_co, receiver_s) = loop {
|
||||
let res = start_client(IpAddr::from_str("192.168.0.101").unwrap());
|
||||
let res = start_client(IpAddr::from_str("127.0.0.1").unwrap());
|
||||
if let Ok((s, r)) = res {
|
||||
break (s, r);
|
||||
}
|
||||
2
rock64.sh
Normal file
@@ -0,0 +1,2 @@
|
||||
cross build --release -p remote --target=aarch64-unknown-linux-gnu && scp -i ~/.ssh/onekey ./target/aarch64-unknown-linux-gnu/release/remote rockpro64:/home/jika/remote2 && echo "Uploaded"
|
||||
|
||||
8
rock64.yml
Normal file
@@ -0,0 +1,8 @@
|
||||
commands:
|
||||
lib: |
|
||||
cargo watch -d 2 -w lib -x "build -p lib"
|
||||
remote: |
|
||||
cargo watch -d 2 -w remote -- sh ./buildui.sh
|
||||
app: |
|
||||
cargo watch -d 2 -w app -w lib -x "run --release -p app"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
commands:
|
||||
lib: |
|
||||
cargo watch -d 2 -w lib -x "build -p lib"
|
||||
deckui: |
|
||||
cargo watch -d 2 -w deckui -- sh ./buildui.sh
|
||||
deckapp: |
|
||||
cargo watch -d 2 -w deckapp -w lib -x "run --release -p deckapp"
|
||||
remote: |
|
||||
cargo watch -d 2 -w remote -x "run --release -p remote"
|
||||
app: |
|
||||
cargo watch -d 2 -w app -w lib -x "run --release -p app"
|
||||
|
||||
|
||||