Remove the Simulation dependency on linux by making it a package

.dockerignore

@@ -0,0 +1,27 @@
+# editor things
+.idea/
+.zed/
+.vscode/
+
+# misc things
+.DS_Store
+.gitignore
+*.nix
+
+# python things
+pyrightconfig.json
+__pycache__/
+
+# Added by cargo (rust things)
+/target
+build/
+dist/
+logs/
+
+# protobuf
+mod.rs
+command_data.rs
+serverdata.rs
+
+# private testing 
+/privatetest/

.github/workflows/calypso-build.yml

@@ -4,7 +4,7 @@ name: Create and publish Calypso docker image
 on:
   push:
     branches: ['Develop']
-    path:
+    paths:
         - "Dockerfile"
   workflow_dispatch:
 

.github/workflows/rust-ci.yml

@@ -22,11 +22,11 @@ jobs:
          - name: Install cargo-audit
            run: cargo install cargo-audit
          - name: Build
-           run: cargo build --verbose
+           run: cargo build --all --verbose
          - name: Test
            run: cargo test --verbose
          - name: Fmt
-           run: cargo fmt --check
+           run: cargo fmt --all --check
          - name: Clippy
            run: cargo clippy --verbose --all -- -D warnings
          - name: Audit

Cargo.toml

@@ -1,40 +1,19 @@
-[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"]
+members = ["daedalus", "calypso-cangen", "calypso-simulate", "calypso"]
+default-members = ["calypso"]
+resolver = "2"
 
 [workspace.dependencies]
 proc-macro2 = "1.0.92"
 quote = "1.0.37"
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.134"
-
-
-[dependencies]
-socketcan = "3.3.1"
 paho-mqtt = "0.12.5"
-protobuf-codegen = "3.5.1"
-protobuf = "3.5.1"
-bitstream-io = "2.6.0"
 clap = { version = "4.5.23", features = ["derive", "env"] }
-rand = "0.8"
-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" }
+protobuf = "3.5.1"
 
 [profile.release]
 lto = true
 codegen-units = 1
-panic = "abort"
+panic = "abort"

Dockerfile

@@ -5,15 +5,15 @@ COPY . .
 
 RUN git submodule update --init
 RUN apt-get update && apt-get install -y libssl-dev build-essential cmake 
-RUN cargo install --path .
+RUN cargo build --all --release
 
 FROM debian:bookworm-slim
-RUN apt update
-RUN apt install openssl -y
+RUN apt-get update
+RUN apt-get install openssl -y
 
-COPY --from=builder /usr/local/cargo/bin/calypso /usr/local/bin/calypso
-COPY --from=builder /usr/local/cargo/bin/simulate /usr/local/bin/simulate
+COPY --from=builder /usr/src/calypso/target/release/calypso /usr/local/bin/calypso
+COPY --from=builder /usr/src/calypso/target/release/calypso-simulate /usr/local/bin/calypso-simulate
 
-CMD ["simulate"]
+CMD ["calypso-simulate"]
 
 # START WITH: sudo docker run -d --rm  --network host calypso

README.md

@@ -41,29 +41,11 @@ Now view calypso interpret the can message and broadcast it on `mqttui`
 
 ### Simulation Mode
 #### Run from build
-- Same setup as above, then use the entry point `simulate` instead of `main`
-- ```cargo run --bin simulate```
-- ```cargo run --bin simulate  -- -u localhost:1883```
+- Same setup as above, then use the package `calypso-simulate` instead of the default `calypso`.
+- ```cargo run -p calypso-simulate```
+- ```cargo run -p calypso-simulate  -- -u localhost:1883```
 
 #### Run from Docker
 - ```docker pull ghcr.io/northeastern-electric-racing/calypso:Develop```
 - ```docker run -d --rm --network host ghcr.io/northeastern-electric-racing/calypso:Develop```
-- ```docker run -d --rm -e CALYPSO_SIREN_HOST_URL=127.0.0.1:1883 --network host ghcr.io/northeastern-electric-racing/calypso:Develop```
-
-
-
-### Generate Proto
-
-#### linux
-`apt-get install protobuf-compiler -y`
-
-#### mac
-`brew install protobuf` 
-
-`cargo install protobuf-codegen`
-
-`PATH="$HOME/.cargo/bin:$PATH"`
-
-`protoc --rust_out ./src ./src/proto/serverdata.proto`
-
-delete the `mod.rs` file
+- ```docker run -d --rm -e CALYPSO_SIREN_HOST_URL=127.0.0.1:1883 --network host ghcr.io/northeastern-electric-racing/calypso:Develop```

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 = concat!(env!("CARGO_MANIFEST_DIR"), "/../Embedded-Base/cangen/can-messages");