re-org files

Cargo.toml

@@ -1,35 +1,2 @@
-[package]
-name = "meatnet-rs"
-version = "0.1.0"
-edition = "2021"
+workspace = { members = [ "meateatrs","meatnet", "meatweb"] }
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bitvec = "1.0.1"
-crc = "3.0.1"
-btleplug = "0.11.3"
-deku = "0.16.0"
-futures = "0.3.30"
-#leptos = { version = "0.5.4", features = ["csr", "nightly"] }
-#leptos-use = "0.9.0"
-pretty_env_logger = "0.5.0"
-rand = "0.8.5"
-#serde = "1.0.193"
-#serde-wasm-bindgen = "0.6.3"
-tokio = { version = "1", features = ["full"] }
-uuid = "1.6.1"
-roaring = "0.10.2"
-range-set-blaze = { version = "0.1.14", default-features = false, features = ["alloc"] }
-#wasm-bindgen-futures = "0.4.39"
-#web-sys = { version = "0.3.66", features = [
-#    "Navigator", 
-#    "Window", 
-#    "Bluetooth", 
-#    "RequestDeviceOptions", 
-#    "BluetoothLeScanFilterInit", 
-#    "BluetoothDevice", 
-#    "BluetoothRemoteGattServer", 
-#    "BluetoothRemoteGattService",
-#    "BluetoothRemoteGattCharacteristic",
-#]}

meateatrs/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "meateatrs"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+meatnet = { path = "../meatnet" }
+bitvec = "1.0.1"
+btleplug = "0.11.3"
+deku = "0.16.0"
+futures = "0.3.30"
+rand = "0.8.5"
+tokio = { version = "1", features = ["full"] }
+uuid = "1.6.1"
+range-set-blaze = { version = "0.1.14", default-features = false, features = ["alloc"] }

src/bin/btleplug.rs → meateatrs/src/main.rs

@@ -12,8 +12,7 @@ use deku::DekuContainerWrite;
 use range_set_blaze::RangeSetBlaze;
 use tokio::{task, time};
 
-use crate::types::uart;
-use meatnet_rs::types;
+use meatnet::{uart, ProbeSerialNumber};
 
 const PROBE_STATUS_CHARACTERISTIC_UUID: Uuid = uuid::uuid!("00000101-CAAB-3792-3D44-97AE51C1407A");
 const PROBE_STATUS_SERVICE_UUID: Uuid = uuid::uuid!("00000100-CAAB-3792-3D44-97AE51C1407A");
@@ -114,7 +113,7 @@ async fn request_log_updates(
                     let start = range.start().clone();
                     let end = range.nth(num_request_concurrent).unwrap_or(*range.end());
                     let read_logs = uart::request::RequestType::ReadLogs(uart::request::ReadLogs {
-                        probe_serial_number: types::ProbeSerialNumber { number: 0x10001DED },
+                        probe_serial_number: ProbeSerialNumber { number: 0x10001DED },
                         sequence_number_start: start,
                         sequence_number_end: end,
                     });

meatnet/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "meatnet"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bitvec = "1.0.1"
+crc = "3.0.1"
+deku = "0.16.0"
+rand = "0.8.5"
+uuid = "1.6.1"