when you get carried away and reorganize the whole repo for no reason

Northeastern-Electric-Racing · Dec 30, 2024 · d6ea3af · d6ea3af
1 parent a19f7f3
commit d6ea3af
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,7 @@
-[package]
-name = "calypso"
-version = "0.1.0"
-edition = "2021"
-rust-version = "1.79"
-default-run = "calypso"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [workspace]
-members = ["libs/daedalus", "libs/calypso-cangen", "calypso-simulate"]
+members = ["daedalus", "calypso-cangen", "calypso-simulate", "calypso"]
+default-members = ["calypso"]
+resolver = "2"
 
 [workspace.dependencies]
 proc-macro2 = "1.0.92"
@@ -20,24 +13,7 @@ clap = { version = "4.5.23", features = ["derive", "env"] }
 protobuf-codegen = "3.5.1"
 protobuf = "3.5.1"
 
-
-[dependencies]
-socketcan = "3.3.1"
-paho-mqtt.workspace = true
-protobuf-codegen.workspace = true
-protobuf.workspace = true
-bitstream-io = "2.6.0"
-clap.workspace = true
-phf = { version = "0.11.2", features = ["macros"] }
-calypso-cangen = { path = "./libs/calypso-cangen" }
-daedalus = { path = "./libs/daedalus" }
-
-
-[build-dependencies]
-protobuf-codegen = "3.5.1"
-calypso-cangen = { path = "./libs/calypso-cangen" }
-
 [profile.release]
 lto = true
 codegen-units = 1
-panic = "abort"
+panic = "abort"
diff --git a/libs/calypso-cangen/Cargo.toml → calypso-cangen/Cargo.toml b/libs/calypso-cangen/Cargo.toml → calypso-cangen/Cargo.toml
diff --git a/libs/calypso-cangen/src/can_gen_decode.rs → calypso-cangen/src/can_gen_decode.rs b/libs/calypso-cangen/src/can_gen_decode.rs → calypso-cangen/src/can_gen_decode.rs
diff --git a/libs/calypso-cangen/src/can_gen_encode.rs → calypso-cangen/src/can_gen_encode.rs b/libs/calypso-cangen/src/can_gen_encode.rs → calypso-cangen/src/can_gen_encode.rs
diff --git a/libs/calypso-cangen/src/can_types.rs → calypso-cangen/src/can_types.rs b/libs/calypso-cangen/src/can_types.rs → calypso-cangen/src/can_types.rs
diff --git a/libs/calypso-cangen/src/lib.rs → calypso-cangen/src/lib.rs b/libs/calypso-cangen/src/lib.rs → calypso-cangen/src/lib.rs
@@ -7,4 +7,4 @@ pub mod validate;
  *  Used by all daedalus macros
  *  Filepath is relative to project root (i.e. /Calypso)
  */
-pub const CANGEN_SPEC_PATH: &str = "./Embedded-Base/cangen/can-messages";
+pub const CANGEN_SPEC_PATH: &str = "../Embedded-Base/cangen/can-messages";
diff --git a/libs/calypso-cangen/src/validate.rs → calypso-cangen/src/validate.rs b/libs/calypso-cangen/src/validate.rs → calypso-cangen/src/validate.rs
diff --git a/calypso-simulate/Cargo.toml b/calypso-simulate/Cargo.toml
@@ -6,6 +6,10 @@ edition = "2021"
 [dependencies]
 clap.workspace = true
 rand = "0.8"
-calypso = { path = "../" }
-daedalus = { path = "../libs/daedalus" }
-protobuf.workspace = true
+calypso = { path = "../calypso" }
+daedalus = { path = "../daedalus" }
+protobuf.workspace = true
+
+[build-dependencies]
+protobuf-codegen.workspace = true
+calypso-cangen = { path = "../calypso-cangen" }
diff --git a/calypso/Cargo.toml b/calypso/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "calypso"
+version = "0.1.0"
+edition = "2021"
+rust-version = "1.79"
+default-run = "calypso"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+socketcan = "3.3.1"
+paho-mqtt.workspace = true
+protobuf-codegen.workspace = true
+protobuf.workspace = true
+bitstream-io = "2.6.0"
+clap.workspace = true
+phf = { version = "0.11.2", features = ["macros"] }
+calypso-cangen = { path = "../calypso-cangen" }
+daedalus = { path = "../daedalus" }
+
+
+[build-dependencies]
+protobuf-codegen = "3.5.1"
+calypso-cangen = { path = "../calypso-cangen" }
diff --git a/build.rs → calypso/build.rs b/build.rs → calypso/build.rs
@@ -3,17 +3,17 @@ use std::process;
 
 /* Prebuild script */
 fn main() {
-    println!("cargo:rerun-if-changed=Embedded-Base");
+    println!("cargo:rerun-if-changed=src/proto");
 
     protobuf_codegen::Codegen::new()
         .pure()
         // All inputs and imports from the inputs must reside in `includes` directories.
-        .includes(["src/proto"])
+        .includes(["../calypso/src/proto"])
         // Inputs must reside in some of include paths.
-        .input("src/proto/command_data.proto")
-        .input("src/proto/serverdata.proto")
+        .input("../calypso/src/proto/command_data.proto")
+        .input("../calypso/src/proto/serverdata.proto")
         // Specify output directory relative to Cargo output directory.
-        .out_dir("src/proto")
+        .out_dir("../calypso/src/proto")
         .run_from_script();
 
     // Validate CAN spec

diff --git a/src/data.rs → calypso/src/data.rs b/src/data.rs → calypso/src/data.rs
diff --git a/src/decode_data.rs → calypso/src/decode_data.rs b/src/decode_data.rs → calypso/src/decode_data.rs
diff --git a/src/encode_data.rs → calypso/src/encode_data.rs b/src/encode_data.rs → calypso/src/encode_data.rs
diff --git a/src/lib.rs → calypso/src/lib.rs b/src/lib.rs → calypso/src/lib.rs
diff --git a/src/main.rs → calypso/src/main.rs b/src/main.rs → calypso/src/main.rs
diff --git a/src/mqtt.rs → calypso/src/mqtt.rs b/src/mqtt.rs → calypso/src/mqtt.rs
diff --git a/src/proto/command_data.proto → calypso/src/proto/command_data.proto b/src/proto/command_data.proto → calypso/src/proto/command_data.proto
diff --git a/src/proto/serverdata.proto → calypso/src/proto/serverdata.proto b/src/proto/serverdata.proto → calypso/src/proto/serverdata.proto
diff --git a/libs/daedalus/Cargo.toml → daedalus/Cargo.toml b/libs/daedalus/Cargo.toml → daedalus/Cargo.toml
diff --git a/libs/daedalus/src/lib.rs → daedalus/src/lib.rs b/libs/daedalus/src/lib.rs → daedalus/src/lib.rs