status every 2s

Cargo.lock

@@ -134,7 +134,7 @@ dependencies = [
  "log",
  "parking",
  "polling",
- "rustix 0.37.3",
+ "rustix",
  "slab",
  "socket2",
  "waker-fn",
@@ -744,17 +744,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "errno"
 version = "0.3.0"
@@ -1301,19 +1290,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "iced"
 version = "0.8.0"
@@ -1556,12 +1532,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.3.0"
@@ -1697,24 +1667,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "ndk"
 version = "0.7.0"
@@ -1906,51 +1858,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[package]]
-name = "openssl"
-version = "0.10.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "ordered-float"
 version = "3.6.0"
@@ -2338,12 +2245,10 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -2351,7 +2256,6 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-native-tls",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -2366,20 +2270,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustix"
-version = "0.36.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
-dependencies = [
- "bitflags",
- "errno 0.2.8",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.37.3"
@@ -2387,10 +2277,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2"
 dependencies = [
  "bitflags",
- "errno 0.3.0",
+ "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys 0.3.0",
+ "linux-raw-sys",
  "windows-sys 0.45.0",
 ]
 
@@ -2401,7 +2291,6 @@ dependencies = [
  "handlebars",
  "iced",
  "iced_futures",
- "iced_native",
  "reqwest",
  "serde",
  "serde_json",
@@ -2423,15 +2312,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -2456,29 +2336,6 @@ dependencies = [
  "tiny-skia",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.158"
@@ -2711,19 +2568,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
-dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall",
- "rustix 0.36.11",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -2810,16 +2654,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.7"
@@ -2987,12 +2821,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -3201,7 +3029,7 @@ dependencies = [
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "raw-window-handle 0.5.1",
  "smallvec",
  "static_assertions",
@@ -3227,7 +3055,7 @@ dependencies = [
  "fxhash",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "raw-window-handle 0.5.1",
  "smallvec",
@@ -3263,7 +3091,7 @@ dependencies = [
  "metal",
  "naga",
  "objc",
- "parking_lot 0.12.1",
+ "parking_lot 0.11.2",
  "profiling",
  "range-alloc",
  "raw-window-handle 0.5.1",

Cargo.toml

@@ -8,9 +8,8 @@ edition = "2021"
 [dependencies]
 serde = { version = "1.0.156", features = ["derive"] }
 serde_yaml = "0.9.19"
-serde_json = "1"
+serde_json = { version = "1", default-features=false, features=["alloc"] }
-iced = "0.8.0"
+iced = { version = "0.8.0" }
-iced_native = "0.9.1"
 handlebars = "4"
-iced_futures = { version = "0.6.0", features = ["async-std"] }
+iced_futures = { version = "0.6.0", default-features=false, features = ["async-std"] }
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.11", default-features=false, features = ["blocking"] }

src/config.rs

@@ -60,6 +60,7 @@ pub struct Buttons {
    pub b: String,
    pub x: String,
    pub y: String,
+   pub start: String,
    pub l: String,
    pub r: String,
 }
@@ -120,6 +121,7 @@ fn build_config_std() -> Config {
                      b: env::var("INPUT_GUI_BUTTON_B").unwrap_or(String::from("2")),
                      x: env::var("INPUT_GUI_BUTTON_X").unwrap_or(String::from("3")),
                      y: env::var("INPUT_GUI_BUTTON_Y").unwrap_or(String::from("4")),
+                     start: env::var("INPUT_GUI_BUTTON_START").unwrap_or(String::from("5")),
                      l: env::var("INPUT_GUI_BUTTON_L").unwrap_or(String::from("q")),
                      r: env::var("INPUT_GUI_BUTTON_R").unwrap_or(String::from("e")),
                   },

src/gui.rs

@@ -29,7 +29,7 @@ pub fn main(cfg: GUI, output_stream: Box<dyn OutputStream>) -> iced::Result {
       text_multithreading: def.text_multithreading,
       try_opengles_first: def.try_opengles_first,
       window: iced::window::Settings{
-         size: (300, 720),
+         size: (300, 900),
          position: iced::window::Position::Specific(0, 0),
          ..iced::window::Settings::default()
       },
@@ -63,6 +63,7 @@ struct Inputs {
    b: iced::keyboard::KeyCode,
    x: iced::keyboard::KeyCode,
    y: iced::keyboard::KeyCode,
+   start: iced::keyboard::KeyCode,
    l: iced::keyboard::KeyCode,
    r: iced::keyboard::KeyCode,
 }
@@ -76,7 +77,7 @@ struct Stick {
 
 #[derive(Debug, Clone)]
 enum Message {
-   EventOccurred(iced_native::Event),
+   EventOccurred(iced::Event),
    Tick,
    InputTextEntryUpdate(String),
    InputTextEntrySubmitSay,
@@ -89,6 +90,7 @@ enum Message {
    B,
    X,
    Y,
+   Start,
    L,
    R,
 }
@@ -115,6 +117,7 @@ impl Main {
          _ if key_code == &self.inputs.b => Some(&self.flags.cfg.buttons.b),
          _ if key_code == &self.inputs.x => Some(&self.flags.cfg.buttons.x),
          _ if key_code == &self.inputs.y => Some(&self.flags.cfg.buttons.y),
+         _ if key_code == &self.inputs.start => Some(&self.flags.cfg.buttons.start),
          _ if key_code == &self.inputs.l => Some(&self.flags.cfg.buttons.l),
          _ if key_code == &self.inputs.r => Some(&self.flags.cfg.buttons.r),
          _ => None,
@@ -142,7 +145,9 @@ impl Main {
          match self.feedback_recv_c.try_recv() {
             Ok(msg) => {
                match msg {
-                  Feedback::Heard(msg) => self.ntfy_from_server = msg,
+                  Feedback::Heard(msg) => {
+                     self.ntfy_from_server = msg;
+                  },
                   _ => break,
                };
             },
@@ -243,6 +248,7 @@ impl Application for Main {
             b: iced::keyboard::KeyCode::Key2,
             x: iced::keyboard::KeyCode::Key3,
             y: iced::keyboard::KeyCode::Key4,
+            start: iced::keyboard::KeyCode::Key5,
             l: iced::keyboard::KeyCode::Q,
             r: iced::keyboard::KeyCode::E,
          },
@@ -291,6 +297,7 @@ impl Application for Main {
                      Message::B => { self.inputs.b = key_code },
                      Message::X => { self.inputs.x = key_code },
                      Message::Y => { self.inputs.y = key_code },
+                     Message::Start => { self.inputs.start = key_code },
                      Message::L => { self.inputs.l = key_code },
                      Message::R => { self.inputs.r = key_code },
                      _ => {},
@@ -357,7 +364,7 @@ impl Application for Main {
             },
             _ => None,
          }),
-         every(std::time::Duration::from_millis(5000)).map(|_| Message::Tick),
+         every(std::time::Duration::from_millis(2000)).map(|_| Message::Tick),
       ]);
    }
 
@@ -369,16 +376,23 @@ impl Application for Main {
             column![
                text(String::from("Button Mapping")).size(24),
                text(String::from("--------------")).size(24),
-               new_cfg_button(Message::Up, self.inputs.stick.up),
+               row![
-               new_cfg_button(Message::Down, self.inputs.stick.down),
+                  column![
-               new_cfg_button(Message::Left, self.inputs.stick.left),
+                     new_cfg_button(Message::Up, self.inputs.stick.up),
-               new_cfg_button(Message::Right, self.inputs.stick.right),
+                     new_cfg_button(Message::Down, self.inputs.stick.down),
-               new_cfg_button(Message::A, self.inputs.a),
+                     new_cfg_button(Message::Left, self.inputs.stick.left),
-               new_cfg_button(Message::B, self.inputs.b),
+                     new_cfg_button(Message::Right, self.inputs.stick.right),
-               new_cfg_button(Message::X, self.inputs.x),
+                     new_cfg_button(Message::Start, self.inputs.start),
-               new_cfg_button(Message::Y, self.inputs.y),
+                  ].padding(5).align_items(Alignment::Center),
-               new_cfg_button(Message::L, self.inputs.l),
+                  column![
-               new_cfg_button(Message::R, self.inputs.r),
+                     new_cfg_button(Message::A, self.inputs.a),
+                     new_cfg_button(Message::B, self.inputs.b),
+                     new_cfg_button(Message::X, self.inputs.x),
+                     new_cfg_button(Message::Y, self.inputs.y),
+                     new_cfg_button(Message::L, self.inputs.l),
+                     new_cfg_button(Message::R, self.inputs.r),
+                  ].padding(5).align_items(Alignment::Center),
+               ].padding(5).align_items(Alignment::Center),
                text(String::from("--------------")).size(24),
                text(self.ntfy_from_client.clone()).size(18),
             ].padding(20).align_items(Alignment::Center),
@@ -392,7 +406,7 @@ impl Application for Main {
                   button(text("Say")).on_press(Message::InputTextEntrySubmitSay).padding(20),
                   button(text("Send")).on_press(Message::InputTextEntrySubmitSend).padding(20),
                ].padding(20).align_items(Alignment::Center),
-               text(self.ntfy_from_server.clone()).size(18),
+               text(self.ntfy_from_server.clone().trim()).size(18),
             ].padding(20).align_items(Alignment::Center),
          ].padding(0).align_items(Alignment::Center),
       ].padding(0).align_items(Alignment::Center).into();