From e6e82bdf480b23f68749d9f4c9de940fbd436a8f Mon Sep 17 00:00:00 2001 From: apham799 Date: Wed, 25 Mar 2026 16:48:07 -0500 Subject: [PATCH 1/4] Add name for #112 --- rust_osc/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust_osc/src/main.rs b/rust_osc/src/main.rs index c533de2f..be28f879 100644 --- a/rust_osc/src/main.rs +++ b/rust_osc/src/main.rs @@ -156,7 +156,7 @@ fn return_toio_id(name: &str) -> &str{ "p50", // #109 "c9k", // #110 "N0N", // #111 - "0", // #112 + "79N", // #112 "B1m", // #113 "h7E", // #114 "c05", // #115 From b16ee835bffaaea9a5da45c7b2cdbbd46e850bd6 Mon Sep 17 00:00:00 2001 From: apham799 Date: Thu, 16 Apr 2026 18:38:11 -0500 Subject: [PATCH 2/4] Added placeholder entries for toios 193-198, and updated -a flag connection to check for old naming convention and new naming convention --- rust_osc/src/main.rs | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/rust_osc/src/main.rs b/rust_osc/src/main.rs index be28f879..809184fc 100644 --- a/rust_osc/src/main.rs +++ b/rust_osc/src/main.rs @@ -43,7 +43,7 @@ fn print_toio_connected(toio_connected: i32){ fn return_toio_id(name: &str) -> &str{ //list of toio ids - const IDARR : [&str; 193] = [ + const IDARR : [&str; 199] = [ "Individual ID", //TOIO Num "0", // #1 "j1c", // #2 @@ -106,17 +106,17 @@ fn return_toio_id(name: &str) -> &str{ "0", // #59 "0", // #60 "0", // #61 - "0", // #62 - "0", // #63 + "G42", // #62 + "446", // #63 "0", // #64 "0", // #65 "0", // #66 "0", // #67 "0", // #68 "0", // #69 - "0", // #70 + "a8h", // #70 "0", // #71 - "0", // #72 + "", // #72 "0", // #73 "0", // #74 "0", // #75 @@ -237,6 +237,12 @@ fn return_toio_id(name: &str) -> &str{ "p3E", // #190 "h6t", // #191 "n2L", // #192 + "0", // #193 + "0", // #194 + "0", // #195 + "0", // #196 + "0", // #197 + "0" // #198 ]; match name.parse::() { Ok(n) => { @@ -249,6 +255,13 @@ fn return_toio_id(name: &str) -> &str{ } } +fn toio_name_variants(id: &str) -> Vec { + vec![ + format!("toio Core Cube-{}", id), // old firmware + format!("toio-{}", id), // new firmware + ] +} + #[tokio::main] async fn main() -> Result<(), Box> { env_logger::init(); @@ -310,7 +323,8 @@ async fn main() -> Result<(), Box> { match matches.opt_str("a") { Some(names) => { for part in names.split(",") { - res.push(format!("toio Core Cube-{}", return_toio_id(part))); + //res.push(format!("toio Core Cube-{}", return_toio_id(part))); + res.extend(toio_name_variants(&return_toio_id(part))); } }, None => {} @@ -504,9 +518,10 @@ async fn main() -> Result<(), Box> { //we kave a toio cube! let tx3 = tx.clone(); if !(peripheral.is_connected().await?) { - println!("Device Connected: {}", local_name); + toio_connected += 1; print_toio_connected(toio_connected); + println!("Device Connected: {}", local_name); // Connect if we aren't already connected. if let Err(err) = peripheral.connect().await { From 2bd20f7d0e5860851bba82c19ace9e0ccffc8431 Mon Sep 17 00:00:00 2001 From: apham799 <102574033+apham799@users.noreply.github.com> Date: Wed, 8 Jul 2026 15:56:11 -0500 Subject: [PATCH 3/4] Added naming convention for new firmware as it shows on mac. --- rust_osc/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust_osc/src/main.rs b/rust_osc/src/main.rs index 809184fc..f8d70955 100644 --- a/rust_osc/src/main.rs +++ b/rust_osc/src/main.rs @@ -259,6 +259,7 @@ fn toio_name_variants(id: &str) -> Vec { vec![ format!("toio Core Cube-{}", id), // old firmware format!("toio-{}", id), // new firmware + format!("toio-{} (toio Core Cube)", id) ] } From fe64a24fadca4b18ea618374f7040a220f178720 Mon Sep 17 00:00:00 2001 From: apham799 <102574033+apham799@users.noreply.github.com> Date: Mon, 13 Jul 2026 15:03:53 -0500 Subject: [PATCH 4/4] Update ID for #93 --- rust_osc/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust_osc/src/main.rs b/rust_osc/src/main.rs index f8d70955..f5afd46e 100644 --- a/rust_osc/src/main.rs +++ b/rust_osc/src/main.rs @@ -137,7 +137,7 @@ fn return_toio_id(name: &str) -> &str{ "f3K", // #90 "13c", // #91 "e1a", // #92 - "0", // #93 + "C8T", // #93 "e6e", // #94 "07F", // #95 "m8k", // #96